diff --git a/.github/ISSUE_TEMPLATE/bug-report.yml b/.github/ISSUE_TEMPLATE/bug-report.yml
index 08a6df7b665..677d0ce8a8b 100644
--- a/.github/ISSUE_TEMPLATE/bug-report.yml
+++ b/.github/ISSUE_TEMPLATE/bug-report.yml
@@ -7,6 +7,8 @@ body:
         ## Guidelines
         Please make sure you are running the latest version of Skript on a supported server platform and version.
         Try to make sure there are no issues of this same problem currently open either.
+        As of the release of Skript 2.10, the oldest supported version has been raised to 1.19.4.
+        Any issues created for versions older than 1.19.4 will not be looked into or fixed unless the issue persists on supported versions.
   - type: textarea
     attributes:
       label: Skript/Server Version
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 5b930003730..16900d59a6f 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -1,5 +1,12 @@
 version: 2
 updates:
+  - package-ecosystem: "gitsubmodule"
+    target-branch: "dev/patch"
+    directory: "/"
+    schedule:
+        interval: "weekly"
+    labels:
+      - "dependencies"
   - package-ecosystem: "github-actions"
     target-branch: "dev/patch"
     directory: "/"
diff --git a/.github/workflows/github-issues/issues-labeled.yml b/.github/workflows/github-issues/issues-labeled.yml
new file mode 100644
index 00000000000..6f65129b48c
--- /dev/null
+++ b/.github/workflows/github-issues/issues-labeled.yml
@@ -0,0 +1,22 @@
+name: When labels are modified, run actions.
+
+on:
+    issues:
+        types: [labeled]
+
+jobs:
+    remove-good-first-issue-label:
+        if: ${{ github.event.label.name == 'completed' || github.event.label.name == 'PR available'}}
+        runs-on: ubuntu-latest
+        permissions:
+            issues: write
+        steps:
+            - uses: actions/github-script@v6
+                with:
+                    script: |
+                        github.rest.issues.removeLabel({
+                            issue_number: context.issue.number,
+                            owner: context.repo.owner,
+                            repo: context.repo.repo,
+                            name: ["good first issue"]
+                        })
diff --git a/.github/workflows/java-11-builds.yml b/.github/workflows/java-11-builds.yml
deleted file mode 100644
index 443aa925d0c..00000000000
--- a/.github/workflows/java-11-builds.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-name: Java 11 CI (MC 1.13-1.16)
-
-on:
-    push:
-        branches:
-            - master
-            - 'dev/**'
-    pull_request:
-
-jobs:
-    build:
-        if: "! contains(toJSON(github.event.commits.*.message), '[ci skip]')"
-        runs-on: ubuntu-latest
-        steps:
-            - uses: actions/checkout@v4
-              with:
-                  submodules: recursive
-            - name: validate gradle wrapper
-              uses: gradle/wrapper-validation-action@v2
-            - name: Set up JDK 21
-              uses: actions/setup-java@v4
-              with:
-                  java-version: '21'
-                  distribution: 'adopt'
-                  cache: gradle
-            - name: Grant execute permission for gradlew
-              run: chmod +x gradlew
-            - name: Build Skript and run test scripts
-              run: ./gradlew clean skriptTestJava11
-            - name: Upload Nightly Build
-              uses: actions/upload-artifact@v4
-              if: success()
-              with:
-                  name: skript-nightly
-                  path: build/libs/*
diff --git a/.github/workflows/java-17-builds.yml b/.github/workflows/java-17-builds.yml
index 2ca6d6bde61..43d6458c946 100644
--- a/.github/workflows/java-17-builds.yml
+++ b/.github/workflows/java-17-builds.yml
@@ -1,4 +1,4 @@
-name: Java 17 CI (MC 1.17-1.20.4)
+name: Java 17 CI (MC 1.19.4-1.20.4)
 
 on:
     push:
diff --git a/.github/workflows/junit-11-builds.yml b/.github/workflows/junit-11-builds.yml
deleted file mode 100644
index cdf75e4c43a..00000000000
--- a/.github/workflows/junit-11-builds.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-name: JUnit (MC 1.13-1.16)
-
-on:
-    push:
-        branches:
-            - master
-            - 'dev/**'
-    pull_request:
-
-jobs:
-    build:
-        if: "! contains(toJSON(github.event.commits.*.message), '[ci skip]')"
-        runs-on: ubuntu-latest
-        steps:
-            - uses: actions/checkout@v4
-              with:
-                  submodules: recursive
-            - name: validate gradle wrapper
-              uses: gradle/wrapper-validation-action@v2
-            - name: Set up JDK 21
-              uses: actions/setup-java@v4
-              with:
-                  java-version: '21'
-                  distribution: 'adopt'
-                  cache: gradle
-            - name: Grant execute permission for gradlew
-              run: chmod +x gradlew
-            - name: Build Skript and run JUnit
-              run: ./gradlew clean JUnitJava11
diff --git a/.github/workflows/junit-17-builds.yml b/.github/workflows/junit-17-builds.yml
index 238bd9b132e..7bbe8952eb3 100644
--- a/.github/workflows/junit-17-builds.yml
+++ b/.github/workflows/junit-17-builds.yml
@@ -1,4 +1,4 @@
-name: JUnit (MC 1.17-1.20.4)
+name: JUnit (MC 1.19.4-1.20.4)
 
 on:
     push:
diff --git a/.gitmodules b/.gitmodules
index 548317e15e5..015a2ca1530 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,4 @@
 [submodule "skript-aliases"]
 	path = skript-aliases
 	url = https://github.com/SkriptLang/skript-aliases
+	branch = minimized-aliases
diff --git a/README.md b/README.md
index b4ab6c4e48f..bd1e1375345 100644
--- a/README.md
+++ b/README.md
@@ -16,8 +16,8 @@ Skript requires **Spigot** to work. You heard it right, **CraftBukkit** does *no
 **Paper**, which is a fork of Spigot, is recommended; it is required for some
 parts of Skript to be available.
 
-Skript supports only the **latest** patch versions of Minecraft 1.13+.
-For example, this means that 1.16.5 is supported, but 1.16.4 is *not*.
+Skript supports only the **latest** patch versions of Minecraft 1.19 and newer.
+For example, this means that 1.19.4 is supported, but 1.19.3 is *not*.
 Testing with all old patch versions is not feasible for us.
 
 Minecraft 1.12 and earlier are not, and will not be supported. New Minecraft
@@ -77,15 +77,14 @@ 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|skriptTestJava11|skriptTestJava17|skriptTestJava21)
+./gradlew (quickTest|skriptTest|skriptTestJava17|skriptTestJava21)
 ```
 
 <code>quickTest</code> runs the test suite on newest supported server version.
 <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>skriptTestJava11</code> (1.13-1.16) runs the tests on Java 11 supported versions.
+<code>skriptTestJava17</code> (1.19.4-1.20.4) runs the tests on Java 17 supported versions.
 <code>skriptTest</code> runs the tests on all versions.
-That is, it runs skriptTestJava11, skriptTestJava17, and skriptTestJava21.
+That is, it runs skriptTestJava17, and skriptTestJava21.
 
 By running the tests, you agree to Mojang's End User License Agreement.
 
diff --git a/build.gradle b/build.gradle
index 1fa00be86b8..9d647455a6b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -30,11 +30,19 @@ dependencies {
 	shadow group: 'org.bstats', name: 'bstats-bukkit', version: '3.0.2'
 	shadow group: 'net.kyori', name: 'adventure-text-serializer-bungeecord', version: '4.3.2'
 
-	implementation group: 'io.papermc.paper', name: 'paper-api', version: '1.21.3-R0.1-SNAPSHOT'
+	implementation group: 'io.papermc.paper', name: 'paper-api', version: '1.21.4-R0.1-SNAPSHOT'
 	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'
+
+	// bundled with Minecraft 1.19.4+ for display entity transforms
+	implementation group: 'org.joml', name: 'joml', version: '1.10.5'
+
+	// Plugin hook libraries
+	implementation group: 'com.sk89q.worldguard', name: 'worldguard-legacy', version: '7.0.0-SNAPSHOT', {
+		exclude group: 'org.bukkit', module: 'bukkit'
+	}
 	implementation group: 'net.milkbowl.vault', name: 'Vault', version: '1.7.3', {
 		exclude group: 'org.bstats', module: 'bstats-bukkit'
+		exclude group: 'org.bukkit', module: 'bukkit'
 	}
 
 	implementation fileTree(dir: 'lib', include: '*.jar')
@@ -75,7 +83,7 @@ task build(overwrite: true, type: ShadowJar) {
 	from sourceSets.main.output
 }
 
-// Excludes the tests for the build task. Should be using JUnitQuick, JUnitJava21, JUnitJava17, JUnitJava11, skriptTest, quickTest.
+// Excludes the tests for the build task. Should be using JUnitQuick, JUnitJava21, JUnitJava17, skriptTest, quickTest.
 // We do not want tests to run for building. That's time consuming and annoying. Especially in development.
 test {
 	exclude '**/*'
@@ -238,11 +246,10 @@ void createTestTask(String name, String desc, String environments, int javaVersi
 
 def java21 = 21
 def java17 = 17
-def java11 = 11
 
-def latestEnv = 'java21/paper-1.21.3.json'
+def latestEnv = 'java21/paper-1.21.4.json'
 def latestJava = java21
-def oldestJava = java11
+def oldestJava = java17
 
 def latestJUnitEnv = latestEnv
 def latestJUnitJava = latestJava
@@ -265,23 +272,21 @@ int envJava = project.property('testEnvJavaVersion') == null ? latestJava : Inte
 createTestTask('quickTest', 'Runs tests on one environment being the latest supported Java and Minecraft.', environments + latestEnv, latestJava, 0)
 createTestTask('skriptTestJava21', 'Runs tests on all Java 21 environments.', environments + 'java21', java21, 0)
 createTestTask('skriptTestJava17', 'Runs tests on all Java 17 environments.', environments + 'java17', java17, 0)
-createTestTask('skriptTestJava11', 'Runs tests on all Java 11 environments.', environments + 'java11', java11, 0)
 createTestTask('skriptTestDev', 'Runs testing server and uses \'system.in\' for command input, stop server to finish.', environments + env, envJava, 0, Modifiers.DEV_MODE, Modifiers.DEBUG)
 createTestTask('skriptProfile', 'Starts the testing server with JProfiler support.', environments + latestEnv, latestJava, -1, Modifiers.PROFILE)
 createTestTask('genNightlyDocs', 'Generates the Skript documentation website html files.', environments + env, envJava, 0, Modifiers.GEN_NIGHTLY_DOCS)
 createTestTask('genReleaseDocs', 'Generates the Skript documentation website html files for a release.', environments + env, envJava, 0, Modifiers.GEN_RELEASE_DOCS)
 tasks.register('skriptTest') {
 	description = 'Runs tests on all environments.'
-	dependsOn skriptTestJava11, skriptTestJava17, skriptTestJava21
+	dependsOn skriptTestJava17, skriptTestJava21
 }
 
 createTestTask('JUnitQuick', 'Runs JUnit tests on one environment being the latest supported Java and Minecraft.', environments + latestJUnitEnv, latestJUnitJava, 0, Modifiers.JUNIT)
 createTestTask('JUnitJava21', 'Runs JUnit tests on all Java 21 environments.', environments + 'java21', java21, 0, Modifiers.JUNIT)
 createTestTask('JUnitJava17', 'Runs JUnit tests on all Java 17 environments.', environments + 'java17', java17, 0, Modifiers.JUNIT)
-createTestTask('JUnitJava11', 'Runs JUnit tests on all Java 11 environments.', environments + 'java11', java11, 0, Modifiers.JUNIT)
 tasks.register('JUnit') {
 	description = 'Runs JUnit tests on all environments.'
-	dependsOn JUnitJava11, JUnitJava17, JUnitJava21
+	dependsOn JUnitJava17, JUnitJava21
 }
 
 // Build flavor configurations
diff --git a/code-conventions.md b/code-conventions.md
index b6942221cdd..f47329495a0 100644
--- a/code-conventions.md
+++ b/code-conventions.md
@@ -195,9 +195,8 @@ Your comments should look something like these:
 ## Language Features
 
 ### Compatibility
-[//]: # (To be updated for 2.10 for Java 17)
-* Contributions should maintain Java 11 source/binary compatibility, even though compiling Skript requires Java 21
-  - Users must not need JRE newer than version 11
+* Contributions should maintain Java 17 source/binary compatibility, even though compiling Skript requires Java 21
+  - Users must not need JRE newer than version 17
 * Versions up to and including Java 21 should work too
   - Please avoid using unsafe reflection
 * It is recommended to make fields final, if they are effectively final
diff --git a/gradle.properties b/gradle.properties
index 8008d0748ff..8207c8da4ec 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -5,7 +5,7 @@ org.gradle.parallel=true
 
 groupid=ch.njol
 name=skript
-version=2.9.5
+version=2.10.0
 jarName=Skript.jar
-testEnv=java21/paper-1.21.3
+testEnv=java21/paper-1.21.4
 testEnvJavaVersion=21
diff --git a/skript-aliases b/skript-aliases
index 16949c28e0d..97212b5b809 160000
--- a/skript-aliases
+++ b/skript-aliases
@@ -1 +1 @@
-Subproject commit 16949c28e0d7bb25ea7c3479c3d6754ff3b5a3e6
+Subproject commit 97212b5b809147e16eef5c5a80dd55324662d572
diff --git a/src/main/java/ch/njol/skript/ModernSkriptBridge.java b/src/main/java/ch/njol/skript/ModernSkriptBridge.java
new file mode 100644
index 00000000000..194badaf0ac
--- /dev/null
+++ b/src/main/java/ch/njol/skript/ModernSkriptBridge.java
@@ -0,0 +1,89 @@
+package ch.njol.skript;
+
+import org.jetbrains.annotations.Unmodifiable;
+import org.skriptlang.skript.Skript;
+import org.skriptlang.skript.addon.SkriptAddon;
+import org.skriptlang.skript.localization.Localizer;
+import org.skriptlang.skript.registration.SyntaxRegistry;
+import org.skriptlang.skript.util.Registry;
+
+import java.util.Collection;
+import java.util.function.Supplier;
+
+/**
+ * Bridge for interacting with the modern API classes from {@link org.skriptlang.skript}.
+ */
+final class ModernSkriptBridge {
+
+	private ModernSkriptBridge() { }
+
+	/**
+	 * Similar to {@link Skript#unmodifiableView()}, but permits addon registration.
+	 */
+	public static final class SpecialUnmodifiableSkript implements Skript {
+
+		private final Skript skript;
+		private final Skript unmodifiableSkript;
+
+		public SpecialUnmodifiableSkript(Skript skript) {
+			this.skript = skript;
+			this.unmodifiableSkript = skript.unmodifiableView();
+		}
+
+		@Override
+		public SkriptAddon registerAddon(Class<?> source, String name) {
+			return skript.registerAddon(source, name);
+		}
+
+		@Override
+		public @Unmodifiable Collection<SkriptAddon> addons() {
+			return unmodifiableSkript.addons();
+		}
+
+		@Override
+		public Class<?> source() {
+			return unmodifiableSkript.source();
+		}
+
+		@Override
+		public String name() {
+			return unmodifiableSkript.name();
+		}
+
+		@Override
+		public <R extends Registry<?>> void storeRegistry(Class<R> registryClass, R registry) {
+			unmodifiableSkript.storeRegistry(registryClass, registry);
+		}
+
+		@Override
+		public void removeRegistry(Class<? extends Registry<?>> registryClass) {
+			unmodifiableSkript.removeRegistry(registryClass);
+		}
+
+		@Override
+		public boolean hasRegistry(Class<? extends Registry<?>> registryClass) {
+			return unmodifiableSkript.hasRegistry(registryClass);
+		}
+
+		@Override
+		public <R extends Registry<?>> R registry(Class<R> registryClass) {
+			return unmodifiableSkript.registry(registryClass);
+		}
+
+		@Override
+		public <R extends Registry<?>> R registry(Class<R> registryClass, Supplier<R> putIfAbsent) {
+			return unmodifiableSkript.registry(registryClass, putIfAbsent);
+		}
+
+		@Override
+		public SyntaxRegistry syntaxRegistry() {
+			return unmodifiableSkript.syntaxRegistry();
+		}
+
+		@Override
+		public Localizer localizer() {
+			return unmodifiableSkript.localizer();
+		}
+	}
+
+}
diff --git a/src/main/java/ch/njol/skript/PatcherTool.java b/src/main/java/ch/njol/skript/PatcherTool.java
index 6b2355fdaf9..66062ae1769 100644
--- a/src/main/java/ch/njol/skript/PatcherTool.java
+++ b/src/main/java/ch/njol/skript/PatcherTool.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript;
 
 import java.io.IOException;
diff --git a/src/main/java/ch/njol/skript/ScriptLoader.java b/src/main/java/ch/njol/skript/ScriptLoader.java
index 0e1ed6a7451..411323f9795 100644
--- a/src/main/java/ch/njol/skript/ScriptLoader.java
+++ b/src/main/java/ch/njol/skript/ScriptLoader.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript;
 
 import ch.njol.skript.config.Config;
@@ -27,28 +9,28 @@
 import ch.njol.skript.lang.SkriptParser;
 import ch.njol.skript.lang.Statement;
 import ch.njol.skript.lang.TriggerItem;
-import ch.njol.skript.lang.TriggerSection;
 import ch.njol.skript.lang.parser.ParserInstance;
 import ch.njol.skript.log.CountingLogHandler;
 import ch.njol.skript.log.LogEntry;
 import ch.njol.skript.log.RetainingLogHandler;
 import ch.njol.skript.log.SkriptLogger;
-import ch.njol.skript.sections.SecLoop;
 import ch.njol.skript.structures.StructOptions.OptionsData;
+import ch.njol.skript.test.runner.TestMode;
 import ch.njol.skript.util.ExceptionUtils;
 import ch.njol.skript.util.SkriptColor;
 import ch.njol.skript.util.Task;
 import ch.njol.skript.util.Timespan;
 import ch.njol.skript.variables.TypeHints;
-import ch.njol.util.Kleenean;
 import ch.njol.util.NonNullPair;
 import ch.njol.util.OpenCloseable;
 import ch.njol.util.StringUtils;
 import org.bukkit.Bukkit;
-import org.bukkit.event.Event;
+import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.Nullable;
 import org.skriptlang.skript.lang.script.Script;
+import org.skriptlang.skript.lang.script.ScriptWarning;
 import org.skriptlang.skript.lang.structure.Structure;
+import org.skriptlang.skript.util.event.EventRegistry;
 
 import java.io.File;
 import java.io.FileFilter;
@@ -56,21 +38,8 @@
 import java.io.InputStream;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.TreeSet;
-import java.util.concurrent.BlockingQueue;
-import java.util.concurrent.Callable;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.LinkedBlockingQueue;
-import java.util.concurrent.TimeUnit;
+import java.util.*;
+import java.util.concurrent.*;
 import java.util.function.Supplier;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
@@ -82,7 +51,7 @@ public class ScriptLoader {
 
 	public static final String DISABLED_SCRIPT_PREFIX = "-";
 	public static final int DISABLED_SCRIPT_PREFIX_LENGTH = DISABLED_SCRIPT_PREFIX.length();
-	
+
 	/**
 	 * A class for keeping track of the general content of a script:
 	 * <ul>
@@ -96,12 +65,12 @@ public static class ScriptInfo {
 		public ScriptInfo() {
 
 		}
-		
+
 		public ScriptInfo(int numFiles, int numStructures) {
 			files = numFiles;
 			structures = numStructures;
 		}
-		
+
 		/**
 		 * Copy constructor.
 		 * @param other ScriptInfo to copy from
@@ -110,30 +79,30 @@ public ScriptInfo(ScriptInfo other) {
 			files = other.files;
 			structures = other.structures;
 		}
-		
+
 		public void add(ScriptInfo other) {
 			files += other.files;
 			structures += other.structures;
 		}
-		
+
 		public void subtract(ScriptInfo other) {
 			files -= other.files;
 			structures -= other.structures;
 		}
-		
+
 		@Override
 		public String toString() {
 			return "ScriptInfo{files=" + files + ",structures=" + structures + "}";
 		}
 	}
-	
+
 	/**
 	 * @see ParserInstance#get()
 	 */
 	private static ParserInstance getParser() {
 		return ParserInstance.get();
 	}
-	
+
 	/*
 	 * Enabled/disabled script tracking
 	 */
@@ -172,7 +141,7 @@ private boolean isSubDir(File directory, File subDir) {
 			return false;
 		}
 	}));
-	
+
 	/**
 	 * Filter for loaded scripts and folders.
 	 */
@@ -232,7 +201,7 @@ public static Set<Script> getScripts(File directory) {
 		f -> f != null
 			&& (f.isDirectory() && !f.getName().startsWith(".") || !f.isDirectory() && StringUtils.endsWithIgnoreCase(f.getName(), ".sk"))
 			&& f.getName().startsWith(DISABLED_SCRIPT_PREFIX) && !f.isHidden();
-	
+
 	/**
 	 * Reevaluates {@link #disabledScripts}.
 	 * @param path the scripts folder to use for the reevaluation.
@@ -248,8 +217,8 @@ static void updateDisabledScripts(Path path) {
 			Skript.exception(e, "An error occurred while trying to update the list of disabled scripts!");
 		}
 	}
-	
-	
+
+
 	/*
 	 * Async loading
 	 */
@@ -282,7 +251,7 @@ static void updateDisabledScripts(Path path) {
 	 * This condition might be false during the execution of {@link #setAsyncLoaderSize(int)}.
 	 */
 	private static int asyncLoaderSize;
-	
+
 	/**
 	 * Checks if scripts are loaded in separate thread. If true,
 	 * following behavior should be expected:
@@ -299,7 +268,7 @@ static void updateDisabledScripts(Path path) {
 	public static boolean isAsync() {
 		return asyncLoaderSize > 0;
 	}
-	
+
 	/**
 	 * Checks if scripts are loaded in multiple threads instead of one thread.
 	 * If true, {@link #isAsync()} will also be true.
@@ -308,7 +277,7 @@ public static boolean isAsync() {
 	public static boolean isParallel() {
 		return asyncLoaderSize > 1;
 	}
-	
+
 	/**
 	 * Sets the amount of async loaders, by updating
 	 * {@link #asyncLoaderSize} and {@link #loaderThreads}.
@@ -328,7 +297,7 @@ public static void setAsyncLoaderSize(int size) throws IllegalStateException {
 				thread.cancelExecution();
 			return;
 		}
-		
+
 		// Remove threads
 		while (loaderThreads.size() > size) {
 			AsyncLoaderThread thread = loaderThreads.remove(loaderThreads.size() - 1);
@@ -338,18 +307,18 @@ public static void setAsyncLoaderSize(int size) throws IllegalStateException {
 		while (loaderThreads.size() < size) {
 			loaderThreads.add(AsyncLoaderThread.create());
 		}
-		
+
 		if (loaderThreads.size() != size)
 			throw new IllegalStateException();
 	}
-	
+
 	/**
 	 * This thread takes and executes tasks from the {@link #loadQueue}.
 	 * Instances of this class must be created with {@link AsyncLoaderThread#create()},
 	 * and created threads will always be part of the {@link #asyncLoaderThreadGroup}.
 	 */
 	private static class AsyncLoaderThread extends Thread {
-		
+
 		/**
 		 * @see AsyncLoaderThread
 		 */
@@ -358,13 +327,13 @@ public static AsyncLoaderThread create() {
 			thread.start();
 			return thread;
 		}
-		
+
 		private AsyncLoaderThread() {
 			super(asyncLoaderThreadGroup, (Runnable) null);
 		}
-		
+
 		private boolean shouldRun = true;
-		
+
 		@Override
 		public void run() {
 			while (shouldRun) {
@@ -378,7 +347,7 @@ public void run() {
 				}
 			}
 		}
-		
+
 		/**
 		 * Tell the loader it should stop taking tasks.
 		 * <br>
@@ -390,9 +359,9 @@ public void run() {
 		public void cancelExecution() {
 			shouldRun = false;
 		}
-		
+
 	}
-	
+
 	/**
 	 * Creates a {@link CompletableFuture} using a {@link Supplier} and an {@link OpenCloseable}.
 	 * <br>
@@ -425,7 +394,7 @@ private static <T> CompletableFuture<T> makeFuture(Supplier<T> supplier, OpenClo
 				} finally {
 					openCloseable.close();
 				}
-				
+
 				future.complete(t);
 			} catch (Throwable t) {
 				future.completeExceptionally(t);
@@ -433,7 +402,7 @@ private static <T> CompletableFuture<T> makeFuture(Supplier<T> supplier, OpenClo
 				Skript.exception(t);
 			}
 		};
-		
+
 		if (isAsync() && Bukkit.isPrimaryThread()) {
 			loadQueue.add(task);
 		} else {
@@ -442,8 +411,8 @@ private static <T> CompletableFuture<T> makeFuture(Supplier<T> supplier, OpenClo
 		}
 		return future;
 	}
-	
-	
+
+
 	/*
 	 * Script Loading Methods
 	 */
@@ -473,7 +442,7 @@ public static CompletableFuture<ScriptInfo> loadScripts(Set<File> files, OpenClo
 			.flatMap(List::stream)
 			.collect(Collectors.toList()), openCloseable);
 	}
-	
+
 	/**
 	 * Loads the specified scripts.
 	 *
@@ -484,12 +453,16 @@ public static CompletableFuture<ScriptInfo> loadScripts(Set<File> files, OpenClo
 	 *  and closed after the {@link Structure#postLoad()} stage.
 	 * @return Info on the loaded scripts.
 	 */
+	@SuppressWarnings("removal")
 	private static CompletableFuture<ScriptInfo> loadScripts(List<Config> configs, OpenCloseable openCloseable) {
 		if (configs.isEmpty()) // Nothing to load
 			return CompletableFuture.completedFuture(new ScriptInfo());
 
+		eventRegistry().events(ScriptPreInitEvent.class)
+				.forEach(event -> event.onPreInit(configs));
+		//noinspection deprecation - we still need to call it
 		Bukkit.getPluginManager().callEvent(new PreScriptLoadEvent(configs));
-		
+
 		ScriptInfo scriptInfo = new ScriptInfo();
 
 		List<LoadingScriptInfo> scripts = new ArrayList<>();
@@ -498,17 +471,17 @@ private static CompletableFuture<ScriptInfo> loadScripts(List<Config> configs, O
 		for (Config config : configs) {
 			if (config == null)
 				throw new NullPointerException();
-			
+
 			CompletableFuture<Void> future = makeFuture(() -> {
 				LoadingScriptInfo info = loadScript(config);
 				scripts.add(info);
 				scriptInfo.add(new ScriptInfo(1, info.structures.size()));
 				return null;
 			}, openCloseable);
-			
+
 			scriptInfoFutures.add(future);
 		}
-		
+
 		return CompletableFuture.allOf(scriptInfoFutures.toArray(new CompletableFuture[0]))
 			.thenApply(unused -> {
 				// TODO in the future this won't work when parallel loading is fixed
@@ -605,6 +578,20 @@ private static CompletableFuture<ScriptInfo> loadScripts(List<Config> configs, O
 					});
 					parser.setInactive();
 
+					// trigger events
+					scripts.forEach(loadingInfo -> {
+						Script script = loadingInfo.script;
+
+						parser.setActive(script);
+						parser.setNode(script.getConfig().getMainNode());
+
+						ScriptLoader.eventRegistry().events(ScriptLoadEvent.class)
+							.forEach(event -> event.onLoad(parser, script));
+						script.eventRegistry().events(ScriptLoadEvent.class)
+							.forEach(event -> event.onLoad(parser, script));
+					});
+					parser.setInactive();
+
 					return scriptInfo;
 				} catch (Exception e) {
 					// Something went wrong, we need to make sure the exception is printed
@@ -614,6 +601,8 @@ private static CompletableFuture<ScriptInfo> loadScripts(List<Config> configs, O
 
 					openCloseable.close();
 				}
+			}).exceptionally(t -> {
+				throw Skript.exception(t);
 			});
 	}
 
@@ -652,7 +641,7 @@ private static LoadingScriptInfo loadScript(Config config) {
 		try {
 			if (SkriptConfig.keepConfigsLoaded.value())
 				SkriptConfig.configs.add(config);
-			
+
 			try (CountingLogHandler ignored = new CountingLogHandler(SkriptLogger.SEVERE).start()) {
 				for (Node node : config.getMainNode()) {
 					if (!(node instanceof SimpleNode) && !(node instanceof SectionNode)) {
@@ -680,7 +669,7 @@ private static LoadingScriptInfo loadScript(Config config) {
 					structures.add(structure);
 					nodeMap.put(structure, node);
 				}
-				
+
 				if (Skript.logHigh()) {
 					int count = structures.size();
 					Skript.info("loaded " + count + " structure" + (count == 1 ? "" : "s") + " from '" + config.getFileName() + "'");
@@ -692,7 +681,7 @@ private static LoadingScriptInfo loadScript(Config config) {
 		} finally {
 			parser.setInactive();
 		}
-		
+
 		// In always sync task, enable stuff
 		Callable<Void> callable = () -> {
 			// Remove the script from the disabled scripts list
@@ -700,10 +689,12 @@ private static LoadingScriptInfo loadScript(Config config) {
 			assert file != null;
 			File disabledFile = new File(file.getParentFile(), DISABLED_SCRIPT_PREFIX + file.getName());
 			disabledScripts.remove(disabledFile);
-			
+
 			// Add to loaded files to use for future reloads
 			loadedScripts.add(script);
-			
+
+			ScriptLoader.eventRegistry().events(ScriptInitEvent.class)
+					.forEach(event -> event.onInit(script));
 			return null;
 		};
 		if (isAsync()) { // Need to delegate to main thread
@@ -723,7 +714,7 @@ private static LoadingScriptInfo loadScript(Config config) {
 	/*
 	 * Script Structure Loading Methods
 	 */
-	
+
 	/**
 	 * Creates a script structure for every file contained within the provided directory.
 	 * If a directory is not actually provided, the file itself will be used.
@@ -744,11 +735,11 @@ private static List<Config> loadStructures(File directory) {
 			Skript.exception(e, "An exception occurred while trying to get the canonical file of: " + directory);
 			return new ArrayList<>();
 		}
-		
+
 		File[] files = directory.listFiles(loadedScriptFilter);
 		assert files != null;
 		Arrays.sort(files);
-		
+
 		List<Config> loadedDirectories = new ArrayList<>(files.length);
 		List<Config> loadedFiles = new ArrayList<>(files.length);
 		for (File file : files) {
@@ -764,7 +755,7 @@ private static List<Config> loadStructures(File directory) {
 		loadedDirectories.addAll(loadedFiles);
 		return loadedDirectories;
 	}
-	
+
 	/**
 	 * Creates a script structure from the provided file.
 	 * This must be done before actually loading a script.
@@ -787,7 +778,7 @@ private static Config loadStructure(File file) {
 				unloadScript(script); // ... it might be good idea to unload it now
 			return null;
 		}
-		
+
 		try {
 			String name = Skript.getInstance().getDataFolder().toPath().toAbsolutePath()
 					.resolve(Skript.SCRIPTSFOLDER).relativize(file.toPath().toAbsolutePath()).toString();
@@ -795,10 +786,10 @@ private static Config loadStructure(File file) {
 		} catch (IOException e) {
 			Skript.error("Could not load " + file.getName() + ": " + ExceptionUtils.toString(e));
 		}
-		
+
 		return null;
 	}
-	
+
 	/**
 	 * Creates a script structure from the provided source.
 	 * This must be done before actually loading a script.
@@ -820,7 +811,7 @@ private static Config loadStructure(InputStream source, String name) {
 		} catch (IOException e) {
 			Skript.error("Could not load " + name + ": " + ExceptionUtils.toString(e));
 		}
-		
+
 		return null;
 	}
 
@@ -848,6 +839,13 @@ public static ScriptInfo unloadScripts(Set<Script> scripts) {
 		// initial unload stage
 		for (Script script : scripts) {
 			parser.setActive(script);
+
+			// trigger unload event before beginning
+			eventRegistry().events(ScriptUnloadEvent.class)
+					.forEach(event -> event.onUnload(parser, script));
+			script.eventRegistry().events(ScriptUnloadEvent.class)
+					.forEach(event -> event.onUnload(parser, script));
+
 			for (Structure structure : script.getStructures())
 				structure.unload();
 		}
@@ -868,6 +866,7 @@ public static ScriptInfo unloadScripts(Set<Script> scripts) {
 			parser.setInactive();
 
 			script.clearData();
+			script.invalidate();
 			loadedScripts.remove(script); // We just unloaded it, so...
 			File scriptFile = script.getConfig().getFile();
 			assert scriptFile != null;
@@ -876,7 +875,7 @@ public static ScriptInfo unloadScripts(Set<Script> scripts) {
 
 		return info;
 	}
-	
+
 	/**
 	 * Unloads the provided script.
 	 * @param script The script to unload.
@@ -885,7 +884,7 @@ public static ScriptInfo unloadScripts(Set<Script> scripts) {
 	public static ScriptInfo unloadScript(Script script) {
 		return unloadScripts(Collections.singleton(script));
 	}
-	
+
 	/*
 	 * Script Reloading Methods
 	 */
@@ -920,7 +919,7 @@ public static CompletableFuture<ScriptInfo> reloadScripts(Set<Script> scripts, O
 
 		return loadScripts(configs, openCloseable);
 	}
-	
+
 	/*
 	 * Code Loading Methods
 	 */
@@ -940,7 +939,7 @@ public static String replaceOptions(String string) {
 			return string;
 		return optionsData.replaceOptions(string);
 	}
-	
+
 	/**
 	 * Loads a section by converting it to {@link TriggerItem}s.
 	 */
@@ -949,9 +948,10 @@ public static ArrayList<TriggerItem> loadItems(SectionNode node) {
 
 		if (Skript.debug())
 			parser.setIndentation(parser.getIndentation() + "    ");
-		
+
 		ArrayList<TriggerItem> items = new ArrayList<>();
 
+		boolean executionStops = false;
 		for (Node subNode : node) {
 			parser.setNode(subNode);
 
@@ -962,12 +962,13 @@ public static ArrayList<TriggerItem> loadItems(SectionNode node) {
 			if (!SkriptParser.validateLine(expr))
 				continue;
 
+			TriggerItem item;
 			if (subNode instanceof SimpleNode) {
 				long start = System.currentTimeMillis();
-				Statement stmt = Statement.parse(expr, items, "Can't understand this condition/effect: " + expr);
-				if (stmt == null)
+				item = Statement.parse(expr, items, "Can't understand this condition/effect: " + expr);
+				if (item == null)
 					continue;
-				long requiredTime = SkriptConfig.longParseTimeWarningThreshold.value().getMilliSeconds();
+				long requiredTime = SkriptConfig.longParseTimeWarningThreshold.value().getAs(Timespan.TimePeriod.MILLISECOND);
 				if (requiredTime > 0) {
 					long timeTaken = System.currentTimeMillis() - start;
 					if (timeTaken > requiredTime)
@@ -978,37 +979,88 @@ public static ArrayList<TriggerItem> loadItems(SectionNode node) {
 				}
 
 				if (Skript.debug() || subNode.debug())
-					Skript.debug(SkriptColor.replaceColorChar(parser.getIndentation() + stmt.toString(null, true)));
+					Skript.debug(SkriptColor.replaceColorChar(parser.getIndentation() + item.toString(null, true)));
 
-				items.add(stmt);
+				items.add(item);
 			} else if (subNode instanceof SectionNode) {
 				TypeHints.enterScope(); // Begin conditional type hints
 
-				Section section = Section.parse(expr, "Can't understand this section: " + expr, (SectionNode) subNode, items);
-				if (section == null)
+				RetainingLogHandler handler = SkriptLogger.startRetainingLog();
+				find_section:
+				try {
+					item = Section.parse(expr, "Can't understand this section: " + expr, (SectionNode) subNode, items);
+					if (item != null)
+						break find_section;
+
+					// back up the failure log
+					RetainingLogHandler backup = handler.backup();
+					handler.clear();
+
+					item = Statement.parse(expr, "Can't understand this condition/effect: " + expr, (SectionNode) subNode, items);
+
+					if (item != null)
+						break find_section;
+					Collection<LogEntry> errors = handler.getErrors();
+
+					// restore the failure log
+					if (errors.isEmpty()) {
+						handler.restore(backup);
+					} else { // We specifically want these two errors in preference to the section error!
+						String firstError = errors.iterator().next().getMessage();
+						if (!firstError.contains("is a valid statement but cannot function as a section (:)")
+							&& !firstError.contains("You cannot have two section-starters in the same line"))
+							handler.restore(backup);
+					}
 					continue;
+				} finally {
+					handler.printLog();
+				}
 
 				if (Skript.debug() || subNode.debug())
-					Skript.debug(SkriptColor.replaceColorChar(parser.getIndentation() + section.toString(null, true)));
+					Skript.debug(SkriptColor.replaceColorChar(parser.getIndentation() + item.toString(null, true)));
 
-				items.add(section);
+				items.add(item);
 
 				// Destroy these conditional type hints
 				TypeHints.exitScope();
+			} else {
+				continue;
+			}
+
+			if (executionStops
+					&& !SkriptConfig.disableUnreachableCodeWarnings.value()
+					&& parser.isActive()
+					&& !parser.getCurrentScript().suppressesWarning(ScriptWarning.UNREACHABLE_CODE)) {
+				Skript.warning("Unreachable code. The previous statement stops further execution.");
 			}
+			executionStops = item.executionIntent() != null;
 		}
-		
+
 		for (int i = 0; i < items.size() - 1; i++)
 			items.get(i).setNext(items.get(i + 1));
 
 		parser.setNode(node);
-		
+
 		if (Skript.debug())
 			parser.setIndentation(parser.getIndentation().substring(0, parser.getIndentation().length() - 4));
-		
+
 		return items;
 	}
 
+	/**
+	 * Creates a Script object for a file (or resource) that may (or may not) exist.
+	 * This is used for providing handles for disabled scripts.
+	 * <br/>
+	 * This does <em>not</em> load (or parse or open or do anything to) the given file.
+	 *
+	 * @return An unlinked, empty script object with an empty backing config
+	 */
+	@ApiStatus.Internal
+	public static Script createDummyScript(String name, @Nullable File file) {
+		Config config = new Config(name, file);
+		return new Script(config, Collections.emptyList());
+	}
+
 	/*
 	 * Other Utility Methods
 	 */
@@ -1044,262 +1096,143 @@ public static FileFilter getDisabledScriptsFilter() {
 	}
 
 	/*
-	 * Deprecated stuff
-	 *
-	 * These fields / methods are from the old version of ScriptLoader,
-	 * and are merely here for backwards compatibility.
-	 *
-	 * Some methods have been replaced by ParserInstance, some
-	 * by new methods in this class.
+	 * Global Script Event API
 	 */
 
-	/**
-	 * Unloads the provided script.
-	 * @param scriptFile The file representing the script to unload.
-	 * @return Statistics for the unloaded script.
-	 * @deprecated Use {@link #unloadScript(Script)}.
-	 */
-	@Deprecated
-	public static ScriptInfo unloadScript(File scriptFile) {
-		Script script = getScript(scriptFile);
-		if (script != null)
-			return unloadScript(script);
-		return new ScriptInfo();
-	}
+	// ScriptLoader Events
 
 	/**
-	 * Unloads all scripts present in the provided folder.
-	 * @param folder The folder containing scripts to unload.
-	 * @return Combined statistics for the unloaded scripts.
-	 *         This data is calculated by using {@link ScriptInfo#add(ScriptInfo)}.
-	 * @deprecated Use {@link #unloadScripts(Set)}.
+	 * Used for listening to events involving a ScriptLoader.
+	 * @see #eventRegistry()
 	 */
-	@Deprecated
-	private static ScriptInfo unloadScripts(File folder) {
-		return unloadScripts(getScripts(folder));
-	}
+	public interface LoaderEvent extends org.skriptlang.skript.util.event.Event { }
 
 	/**
-	 * Reloads a single script.
-	 * @param scriptFile The file representing the script to reload.
-	 * @return Future of statistics of the newly loaded script.
-	 * @deprecated Use {@link #reloadScript(Script, OpenCloseable)}.
+	 * Called when {@link ScriptLoader} is preparing to load {@link Config}s into {@link Script}s.
+	 * @see #loadScripts(File, OpenCloseable)
+	 * @see #loadScripts(Set, OpenCloseable)
 	 */
-	@Deprecated
-	public static CompletableFuture<ScriptInfo> reloadScript(File scriptFile, OpenCloseable openCloseable) {
-		unloadScript(scriptFile);
-		return loadScripts(scriptFile, openCloseable);
-	}
-
-	/**
-	 * Reloads all scripts in the given folder and its subfolders.
-	 * @param folder A folder.
-	 * @return Future of statistics of newly loaded scripts.
-	 * @deprecated Use {@link #reloadScripts}.
-	 */
-	@Deprecated
-	public static CompletableFuture<ScriptInfo> reloadScripts(File folder, OpenCloseable openCloseable) {
-		unloadScripts(folder);
-		return loadScripts(folder, openCloseable);
-	}
+	@FunctionalInterface
+	public interface ScriptPreInitEvent extends LoaderEvent {
 
-	/**
-	 * @deprecated Use <b>{@link #getLoadedScripts()}.size()</b>.
-	 */
-	@Deprecated
-	public static int loadedScripts() {
-		return getLoadedScripts().size();
-	}
-
-	/**
-	 * @deprecated Use <b>{@link #getLoadedScripts()}</b> and <b>{@link Script#getStructures()}.size()</b>.
-	 * Please note that a Structure may have multiple triggers, and this is only an estimate.
-	 */
-	@Deprecated
-	public static int loadedTriggers() {
-		int loaded = 0;
-		for (Script script : getLoadedScripts())
-			loaded += script.getStructures().size();
-		return loaded;
-	}
+		/**
+		 * The method that is called when this event triggers.
+		 * Modifications to the given collection will affect what is loaded.
+		 * @param configs The Configs to be loaded.
+		 */
+		void onPreInit(Collection<Config> configs);
 
-	/**
-	 * @deprecated Use {@link #loadScripts(File, OpenCloseable)}
-	 */
-	@Deprecated
-	static void loadScripts() {
-		unloadScripts(getLoadedScripts());
-		loadScripts(Skript.getInstance().getScriptsFolder(), OpenCloseable.EMPTY).join();
 	}
 
 	/**
-	 * @deprecated Callers should not be using configs. Use {@link #loadScripts(Set, OpenCloseable)}.
+	 * Called when a {@link Script} is created and preloaded in the {@link ScriptLoader}.
+	 * The initializing script may contain {@link Structure}s that are not fully loaded.
+	 * @see #loadScripts(File, OpenCloseable)
+	 * @see #loadScripts(Set, OpenCloseable)
 	 */
-	@Deprecated
-	public static ScriptInfo loadScripts(List<Config> configs) {
-		return loadScripts(configs, OpenCloseable.EMPTY).join();
-	}
+	@FunctionalInterface
+	public interface ScriptInitEvent extends LoaderEvent {
 
-	/**
-	 * @deprecated Callers should not be using configs. Use {@link #loadScripts(Set, OpenCloseable)}.
-	 * @see RetainingLogHandler
-	 */
-	@Deprecated
-	public static ScriptInfo loadScripts(List<Config> configs, List<LogEntry> logOut) {
-		RetainingLogHandler logHandler = new RetainingLogHandler();
-		try {
-			return loadScripts(configs, logHandler).join();
-		} finally {
-			logOut.addAll(logHandler.getLog());
-		}
-	}
-
-	/**
-	 * @deprecated Callers should not be using configs. Use {@link #loadScripts(Set, OpenCloseable)}.
-	 */
-	@Deprecated
-	public static ScriptInfo loadScripts(Config... configs) {
-		return loadScripts(Arrays.asList(configs), OpenCloseable.EMPTY).join();
-	}
+		/**
+		 * The method that is called when this event triggers.
+		 * @param script The Script being initialized.
+		 */
+		void onInit(Script script);
 
-	/**
-	 * @deprecated Use {@link #reloadScript(Script, OpenCloseable)}.
-	 */
-	@Deprecated
-	public static ScriptInfo reloadScript(File script) {
-		return reloadScript(script, OpenCloseable.EMPTY).join();
 	}
 
 	/**
-	 * @deprecated Use {@link #reloadScripts(Set, OpenCloseable)}.
+	 * Called when a {@link Script} is loaded in the {@link ScriptLoader}.
+	 * This event will trigger <b>after</b> the script is completely loaded ({@link Structure} initialization finished).
+	 * @see #loadScripts(File, OpenCloseable)
+	 * @see #loadScripts(Set, OpenCloseable)
 	 */
-	@Deprecated
-	public static ScriptInfo reloadScripts(File folder) {
-		return reloadScripts(folder, OpenCloseable.EMPTY).join();
-	}
+	@FunctionalInterface
+	public interface ScriptLoadEvent extends LoaderEvent, Script.Event {
 
-	/**
-	 * @deprecated Use {@link ParserInstance#getHasDelayBefore()}.
-	 */
-	@Deprecated
-	public static Kleenean getHasDelayBefore() {
-		return getParser().getHasDelayBefore();
-	}
+		/**
+		 * The method that is called when this event triggers.
+		 * @param parser The ParserInstance handling the loading of <code>script</code>.
+		 * @param script The Script being loaded.
+		 */
+		void onLoad(ParserInstance parser, Script script);
 
-	/**
-	 * @deprecated Use {@link ParserInstance#setHasDelayBefore(Kleenean)}.
-	 */
-	@Deprecated
-	public static void setHasDelayBefore(Kleenean hasDelayBefore) {
-		getParser().setHasDelayBefore(hasDelayBefore);
 	}
 
 	/**
-	 * @deprecated Use {@link ParserInstance#getCurrentScript()}.
+	 * Called when a {@link Script} is unloaded in the {@link ScriptLoader}.
+	 * This event will trigger <b>before</b> the script is unloaded.
+	 * @see #unloadScript(Script)
 	 */
-	@Nullable
-	@Deprecated
-	public static Config getCurrentScript() {
-		ParserInstance parser = getParser();
-		return parser.isActive() ? parser.getCurrentScript().getConfig() : null;
-	}
+	@FunctionalInterface
+	public interface ScriptUnloadEvent extends LoaderEvent, Script.Event {
 
-	/**
-	 * @deprecated Addons should no longer be modifying this.
-	 */
-	@Deprecated
-	public static void setCurrentScript(@Nullable Config currentScript) {
-		getParser().setCurrentScript(currentScript);
-	}
+		/**
+		 * The method that is called when this event triggers.
+		 * @param parser The ParserInstance handling the unloading of <code>script</code>.
+		 * @param script The Script being unloaded.
+		 */
+		void onUnload(ParserInstance parser, Script script);
 
-	/**
-	 * @deprecated Use {@link ParserInstance#getCurrentSections()}.
-	 */
-	@Deprecated
-	public static List<TriggerSection> getCurrentSections() {
-		return getParser().getCurrentSections();
 	}
 
-	/**
-	 * @deprecated Use {@link ParserInstance#setCurrentSections(List)}.
-	 */
-	@Deprecated
-	public static void setCurrentSections(List<TriggerSection> currentSections) {
-		getParser().setCurrentSections(currentSections);
-	}
+	private static final EventRegistry<LoaderEvent> eventRegistry = new EventRegistry<>();
 
 	/**
-	 * @deprecated Use {@link ParserInstance#getCurrentSections(Class)}.
+	 * @return An EventRegistry for the ScriptLoader's events.
 	 */
-	@Deprecated
-	public static List<SecLoop> getCurrentLoops() {
-		return getParser().getCurrentSections(SecLoop.class);
+	public static EventRegistry<LoaderEvent> eventRegistry() {
+		return eventRegistry;
 	}
 
 	/**
-	 * @deprecated Never use this method, it has no effect.
-	 */
-	@Deprecated
-	public static void setCurrentLoops(List<SecLoop> currentLoops) { }
-
-	/**
-	 * @deprecated Use {@link ParserInstance#getCurrentEventName()}.
+	 * Gets a script's file from its name, if one exists.
+	 *
+	 * @param script The script name/path
+	 * @return The script file, if one is found
 	 */
 	@Nullable
-	@Deprecated
-	public static String getCurrentEventName() {
-		return getParser().getCurrentEventName();
-	}
-
-	/**
-	 * @deprecated Use {@link ParserInstance#setCurrentEvent(String, Class[])}.
-	 */
-	@SafeVarargs
-	@Deprecated
-	public static void setCurrentEvent(String name, @Nullable Class<? extends Event>... events) {
-		getParser().setCurrentEvent(name, events);
+	public static File getScriptFromName(String script) {
+		return getScriptFromName(script, Skript.getInstance().getScriptsFolder());
 	}
 
 	/**
-	 * @deprecated Use {@link ParserInstance#deleteCurrentEvent()}.
-	 */
-	@Deprecated
-	public static void deleteCurrentEvent() {
-		getParser().deleteCurrentEvent();
-	}
-
-	/**
-	 * @deprecated Use {@link ParserInstance#isCurrentEvent(Class)}
-	 */
-	@Deprecated
-	public static boolean isCurrentEvent(@Nullable Class<? extends Event> event) {
-		return getParser().isCurrentEvent(event);
-	}
-
-	/**
-	 * @deprecated Use {@link ParserInstance#isCurrentEvent(Class[])}.
-	 */
-	@SafeVarargs
-	@Deprecated
-	public static boolean isCurrentEvent(Class<? extends Event>... events) {
-		return getParser().isCurrentEvent(events);
-	}
-
-	/**
-	 * @deprecated Use {@link ParserInstance#getCurrentEvents()}.
+	 * Gets a script's file from its name and directory, if one exists.
+	 *
+	 * @param script The script name/path
+	 * @param directory The scripts (or testing scripts) directory
+	 * @return The script file, if one is found
 	 */
 	@Nullable
-	@Deprecated
-	public static Class<? extends Event>[] getCurrentEvents() {
-		return getParser().getCurrentEvents();
-	}
+	public static File getScriptFromName(String script, File directory) {
+		if (script.endsWith("/") || script.endsWith("\\")) { // Always allow '/' and '\' regardless of OS
+			script = script.replace('/', File.separatorChar).replace('\\', File.separatorChar);
+		} else if (!StringUtils.endsWithIgnoreCase(script, ".sk")) {
+			int dot = script.lastIndexOf('.');
+			if (dot > 0 && !script.substring(dot + 1).equals(""))
+				return null;
+			script = script + ".sk";
+		}
 
-	/**
-	 * @deprecated This method has no functionality, it just returns its input.
-	 */
-	@Deprecated
-	public static Config loadStructure(Config config) {
-		return config;
+		if (script.startsWith(ScriptLoader.DISABLED_SCRIPT_PREFIX))
+			script = script.substring(ScriptLoader.DISABLED_SCRIPT_PREFIX_LENGTH);
+
+		File scriptFile = new File(directory, script);
+		if (!scriptFile.exists()) {
+			scriptFile = new File(scriptFile.getParentFile(), ScriptLoader.DISABLED_SCRIPT_PREFIX + scriptFile.getName());
+			if (!scriptFile.exists()) {
+				return null;
+			}
+		}
+		try {
+			// Unless it's a test, check if the user is asking for a script in the scripts folder
+			// and not something outside Skript's domain.
+			if (TestMode.ENABLED || scriptFile.getCanonicalPath().startsWith(directory.getCanonicalPath() + File.separator))
+				return scriptFile.getCanonicalFile();
+			return null;
+		} catch (IOException e) {
+			throw Skript.exception(e, "An exception occurred while trying to get the script file from the string '" + script + "'");
+		}
 	}
 
 }
diff --git a/src/main/java/ch/njol/skript/ServerPlatform.java b/src/main/java/ch/njol/skript/ServerPlatform.java
index 8313476883e..97fbc66e055 100644
--- a/src/main/java/ch/njol/skript/ServerPlatform.java
+++ b/src/main/java/ch/njol/skript/ServerPlatform.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript;
 
 /**
diff --git a/src/main/java/ch/njol/skript/Skript.java b/src/main/java/ch/njol/skript/Skript.java
index b93303ec5b9..adf004c1eaf 100644
--- a/src/main/java/ch/njol/skript/Skript.java
+++ b/src/main/java/ch/njol/skript/Skript.java
@@ -3,19 +3,12 @@
 import ch.njol.skript.aliases.Aliases;
 import ch.njol.skript.bukkitutil.BurgerHelper;
 import ch.njol.skript.classes.ClassInfo;
-import ch.njol.skript.classes.data.BukkitClasses;
-import ch.njol.skript.classes.data.BukkitEventValues;
-import ch.njol.skript.classes.data.DefaultComparators;
-import ch.njol.skript.classes.data.DefaultConverters;
-import ch.njol.skript.classes.data.DefaultFunctions;
-import ch.njol.skript.classes.data.DefaultOperations;
-import ch.njol.skript.classes.data.JavaClasses;
-import ch.njol.skript.classes.data.SkriptClasses;
+import ch.njol.skript.classes.data.*;
 import ch.njol.skript.command.Commands;
 import ch.njol.skript.doc.Documentation;
 import ch.njol.skript.events.EvtSkript;
 import ch.njol.skript.hooks.Hook;
-import ch.njol.skript.lang.Condition;
+import ch.njol.skript.lang.*;
 import ch.njol.skript.lang.Effect;
 import ch.njol.skript.lang.Expression;
 import ch.njol.skript.lang.ExpressionInfo;
@@ -27,54 +20,35 @@
 import ch.njol.skript.lang.SyntaxElementInfo;
 import ch.njol.skript.lang.Trigger;
 import ch.njol.skript.lang.TriggerItem;
+import ch.njol.skript.lang.Condition.ConditionType;
 import ch.njol.skript.lang.util.SimpleExpression;
 import ch.njol.skript.localization.Language;
 import ch.njol.skript.localization.Message;
 import ch.njol.skript.localization.PluralizingArgsMessage;
-import ch.njol.skript.log.BukkitLoggerFilter;
-import ch.njol.skript.log.CountingLogHandler;
-import ch.njol.skript.log.ErrorDescLogHandler;
-import ch.njol.skript.log.ErrorQuality;
-import ch.njol.skript.log.LogEntry;
-import ch.njol.skript.log.LogHandler;
-import ch.njol.skript.log.SkriptLogger;
-import ch.njol.skript.log.Verbosity;
+import ch.njol.skript.log.*;
 import ch.njol.skript.registrations.Classes;
 import ch.njol.skript.registrations.EventValues;
 import ch.njol.skript.registrations.Feature;
-import ch.njol.skript.test.runner.EffObjectives;
-import ch.njol.skript.test.runner.SkriptJUnitTest;
-import ch.njol.skript.test.runner.SkriptTestEvent;
-import ch.njol.skript.test.runner.TestMode;
-import ch.njol.skript.test.runner.TestTracker;
+import ch.njol.skript.test.runner.*;
 import ch.njol.skript.timings.SkriptTimings;
 import ch.njol.skript.update.ReleaseManifest;
 import ch.njol.skript.update.ReleaseStatus;
 import ch.njol.skript.update.UpdateManifest;
 import ch.njol.skript.util.Date;
-import ch.njol.skript.util.EmptyStacktraceException;
-import ch.njol.skript.util.ExceptionUtils;
-import ch.njol.skript.util.FileUtils;
-import ch.njol.skript.util.Getter;
-import ch.njol.skript.util.Task;
-import ch.njol.skript.util.Utils;
-import ch.njol.skript.util.Version;
+import ch.njol.skript.util.*;
 import ch.njol.skript.util.chat.BungeeConverter;
 import ch.njol.skript.util.chat.ChatMessages;
 import ch.njol.skript.variables.Variables;
 import ch.njol.util.Closeable;
 import ch.njol.util.Kleenean;
-import ch.njol.util.NullableChecker;
 import ch.njol.util.StringUtils;
 import ch.njol.util.coll.iterator.CheckedIterator;
 import ch.njol.util.coll.iterator.EnumerationIterable;
 import com.google.common.collect.Lists;
 import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
 import org.bstats.bukkit.Metrics;
-import org.bukkit.Bukkit;
-import org.bukkit.ChatColor;
-import org.bukkit.Material;
-import org.bukkit.Server;
+import org.bukkit.*;
 import org.bukkit.command.CommandSender;
 import org.bukkit.command.PluginCommand;
 import org.bukkit.entity.Player;
@@ -85,15 +59,29 @@
 import org.bukkit.event.player.PlayerJoinEvent;
 import org.bukkit.event.server.PluginDisableEvent;
 import org.bukkit.event.server.ServerCommandEvent;
+import org.bukkit.event.server.ServerLoadEvent;
 import org.bukkit.plugin.Plugin;
 import org.bukkit.plugin.PluginDescriptionFile;
 import org.bukkit.plugin.java.JavaPlugin;
+import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.annotations.UnknownNullability;
+import org.jetbrains.annotations.Unmodifiable;
 import org.junit.After;
 import org.junit.runner.JUnitCore;
 import org.junit.runner.Result;
+import org.junit.runner.notification.Failure;
 import org.skriptlang.skript.bukkit.SkriptMetrics;
+import org.skriptlang.skript.bukkit.breeding.BreedingModule;
+import org.skriptlang.skript.bukkit.displays.DisplayModule;
+import org.skriptlang.skript.bukkit.fishing.FishingModule;
+import org.skriptlang.skript.bukkit.furnace.FurnaceModule;
+import org.skriptlang.skript.bukkit.input.InputModule;
+import org.skriptlang.skript.bukkit.log.runtime.BukkitRuntimeErrorConsumer;
+import org.skriptlang.skript.bukkit.loottables.LootTableModule;
+import org.skriptlang.skript.bukkit.registration.BukkitRegistryKeys;
+import org.skriptlang.skript.bukkit.registration.BukkitSyntaxInfos;
+import org.skriptlang.skript.bukkit.tags.TagModule;
 import org.skriptlang.skript.lang.comparator.Comparator;
 import org.skriptlang.skript.lang.comparator.Comparators;
 import org.skriptlang.skript.lang.converter.Converter;
@@ -103,6 +91,11 @@
 import org.skriptlang.skript.lang.script.Script;
 import org.skriptlang.skript.lang.structure.Structure;
 import org.skriptlang.skript.lang.structure.StructureInfo;
+import org.skriptlang.skript.log.runtime.RuntimeErrorManager;
+import org.skriptlang.skript.registration.SyntaxInfo;
+import org.skriptlang.skript.registration.SyntaxOrigin;
+import org.skriptlang.skript.registration.SyntaxRegistry;
+import org.skriptlang.skript.util.ClassLoader;
 
 import java.io.File;
 import java.io.IOException;
@@ -117,23 +110,17 @@
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.nio.file.StandardOpenOption;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
+import java.util.*;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.atomic.AtomicLong;
 import java.util.jar.JarEntry;
 import java.util.jar.JarFile;
 import java.util.logging.Filter;
 import java.util.logging.Level;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import java.util.stream.Collectors;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipException;
 import java.util.zip.ZipFile;
@@ -160,7 +147,7 @@
  * @see #registerEffect(Class, String...)
  * @see #registerExpression(Class, Class, ExpressionType, String...)
  * @see #registerEvent(String, Class, Class, String...)
- * @see EventValues#registerEventValue(Class, Class, Getter, int)
+ * @see EventValues#registerEventValue(Class, Class, Converter, int)
  * @see Classes#registerClass(ClassInfo)
  * @see Comparators#registerComparator(Class, Class, Comparator)
  * @see Converters#registerConverter(Class, Class, Converter)
@@ -172,14 +159,24 @@ public final class Skript extends JavaPlugin implements Listener {
 	@Nullable
 	private static Skript instance = null;
 
+	private static org.skriptlang.skript.@UnknownNullability Skript skript = null;
+	private static org.skriptlang.skript.@UnknownNullability Skript unmodifiableSkript = null;
+
 	private static boolean disabled = false;
 	private static boolean partDisabled = false;
 
 	public static Skript getInstance() {
-		final Skript i = instance;
-		if (i == null)
+		if (instance == null)
 			throw new IllegalStateException();
-		return i;
+		return instance;
+	}
+
+	@ApiStatus.Experimental
+	public static org.skriptlang.skript.Skript instance() {
+		if (unmodifiableSkript == null) {
+			throw new SkriptAPIException("Skript is still initializing");
+		}
+		return unmodifiableSkript;
 	}
 
 	/**
@@ -200,7 +197,6 @@ public Skript() throws IllegalStateException {
 	/**
 	 * Check minecraft version and assign it to minecraftVersion field
 	 * This method is created to update MC version before onEnable method
-	 * To fix {@link Utils#HEX_SUPPORTED} being assigned before minecraftVersion is properly assigned
 	 */
 	public static void updateMinecraftVersion() {
 		String bukkitV = Bukkit.getBukkitVersion();
@@ -231,6 +227,17 @@ public static Version getVersion() {
 		m_no_scripts = new Message("skript.no scripts");
 	private static final PluralizingArgsMessage m_scripts_loaded = new PluralizingArgsMessage("skript.scripts loaded");
 
+	private static final Message WARNING_MESSAGE = new Message("skript.warning message");
+	private static final Message RESTART_MESSAGE = new Message("skript.restart message");
+
+	public static String getWarningMessage() {
+		return WARNING_MESSAGE.getValueOrDefault("It appears that /reload or another plugin reloaded Skript. This is not supported behaviour and may cause issues.");
+	}
+
+	public static String getRestartMessage() {
+		return RESTART_MESSAGE.getValueOrDefault("Please consider restarting the server instead.");
+	}
+
 	public static ServerPlatform getServerPlatform() {
 		if (classExists("net.glowstone.GlowServer")) {
 			return ServerPlatform.BUKKIT_GLOWSTONE; // Glowstone has timings too, so must check for it first
@@ -246,17 +253,6 @@ public static ServerPlatform getServerPlatform() {
 		}
 	}
 
-	/**
-	 * Returns true if the underlying installed Java/JVM is 32-bit, false otherwise.
-	 * Note that this depends on a internal system property and these can always be overridden by user using -D JVM options,
-	 * more specifically, this method will return false on non OracleJDK/OpenJDK based JVMs, that don't include bit information in java.vm.name system property.
-	 * @return Whether the installed Java/JVM is 32-bit or not.
-	 */
-	private static boolean using32BitJava() {
-		// Property returned should either be "Java HotSpot(TM) 32-Bit Server VM" or "OpenJDK 32-Bit Server VM" if 32-bit and using OracleJDK/OpenJDK
-		return System.getProperty("java.vm.name").contains("32");
-	}
-
 	/**
 	 * Checks if server software and Minecraft version are supported.
 	 * Prints errors or warnings to console if something is wrong.
@@ -365,6 +361,13 @@ public File getScriptsFolder() {
 		return scriptsFolder;
 	}
 
+
+	// ================ RUNTIME ERRORS ================
+	public static RuntimeErrorManager getRuntimeErrorManager() {
+		return RuntimeErrorManager.getInstance();
+	}
+	// =================================================
+
 	@Override
 	public void onEnable() {
 		Bukkit.getPluginManager().registerEvents(this, this);
@@ -385,8 +388,6 @@ public void onEnable() {
 		} catch (Exception e) {
 			Skript.exception(e, "Update checker could not be initialized.");
 		}
-		experimentRegistry = new ExperimentRegistry(this);
-		Feature.registerAll(getAddonInstance(), experimentRegistry);
 
 		if (!getDataFolder().isDirectory())
 			getDataFolder().mkdirs();
@@ -461,9 +462,17 @@ public void onEnable() {
 			}
 		}
 
-		// initialize the Skript addon instance
+		// initialize the modern Skript instance
+		skript = org.skriptlang.skript.Skript.of(getClass(), getName());
+		unmodifiableSkript = new ModernSkriptBridge.SpecialUnmodifiableSkript(skript);
+		skript.localizer().setSourceDirectories("lang",
+				getDataFolder().getAbsolutePath() + "lang");
+		// initialize the old Skript SkriptAddon instance
 		getAddonInstance();
 
+		experimentRegistry = new ExperimentRegistry(this);
+		Feature.registerAll(getAddonInstance(), experimentRegistry);
+
 		// Load classes which are always safe to use
 		new JavaClasses(); // These may be needed in configuration
 
@@ -483,10 +492,28 @@ public void onEnable() {
 			classLoadError = e;
 		}
 
+		// Warn about pausing
+		if (Skript.methodExists(Server.class, "getPauseWhenEmptyTime")) {
+			int pauseThreshold = getServer().getPauseWhenEmptyTime();
+			if (pauseThreshold > -1) {
+				Skript.warning("Minecraft server pausing is enabled!");
+				Skript.warning("Scripts that interact with the world or entities may not work as intended when the server is paused and may crash your server.");
+				Skript.warning("Consider setting 'pause-when-empty-seconds' to -1 in server.properties to make sure you don't encounter any issues.");
+			}
+		}
+
+
 		// Config must be loaded after Java and Skript classes are parseable
 		// ... but also before platform check, because there is a config option to ignore some errors
 		SkriptConfig.load();
 
+		// Register the runtime error refresh after loading, so we can do the first instantiation manually.
+		SkriptConfig.eventRegistry().register(SkriptConfig.ReloadEvent.class, RuntimeErrorManager::refresh);
+
+		// init runtime error manager and add bukkit consumer.
+		RuntimeErrorManager.refresh();
+		getRuntimeErrorManager().addConsumer(new BukkitRuntimeErrorConsumer());
+
 		// Now override the verbosity if test mode is enabled
 		if (TestMode.VERBOSITY != null)
 			SkriptLogger.setVerbosity(Verbosity.valueOf(TestMode.VERBOSITY));
@@ -499,20 +526,6 @@ public void onEnable() {
 			updater.updateCheck(console);
 		}
 
-		try {
-			Aliases.load(); // Loaded before anything that might use them
-		} catch (StackOverflowError e) {
-			if (using32BitJava()) {
-				Skript.error("");
-				Skript.error("There was a StackOverflowError that occured while loading aliases.");
-				Skript.error("As you are currently using 32-bit Java, please update to 64-bit Java to resolve the error.");
-				Skript.error("Please report this issue to our GitHub only if updating to 64-bit Java does not fix the issue.");
-				Skript.error("");
-			} else {
-				throw e; // Uh oh, this shouldn't happen. Re-throw the error.
-			}
-		}
-
 		// If loading can continue (platform ok), check for potentially thrown error
 		if (classLoadError != null) {
 			exception(classLoadError);
@@ -538,12 +551,24 @@ public void onEnable() {
 		try {
 			getAddonInstance().loadClasses("ch.njol.skript",
 				"conditions", "effects", "events", "expressions", "entity", "sections", "structures");
+			getAddonInstance().loadClasses("org.skriptlang.skript.bukkit", "misc");
+			// todo: become proper module once registry api is merged
+			FishingModule.load();
+			BreedingModule.load();
+			DisplayModule.load();
+			InputModule.load();
+			TagModule.load();
+			FurnaceModule.load();
+			LootTableModule.load();
 		} catch (final Exception e) {
 			exception(e, "Could not load required .class files: " + e.getLocalizedMessage());
 			setEnabled(false);
 			return;
 		}
 
+		// todo: remove completely 2.11 or 2.12
+		CompletableFuture<Boolean> aliases = Aliases.loadAsync();
+
 		Commands.registerListeners();
 
 		if (logNormal())
@@ -584,6 +609,12 @@ public void run() {
 				}
 				finishedLoadingHooks = true;
 
+				try {
+					aliases.get(); // wait for aliases to load
+				} catch (InterruptedException | ExecutionException e) {
+					exception(e, "Could not load aliases concurrently");
+				}
+
 				if (TestMode.ENABLED) {
 					info("Preparing Skript for testing...");
 					tainted = true;
@@ -599,7 +630,6 @@ public void run() {
 
 				stopAcceptingRegistrations();
 
-
 				Documentation.generate(); // TODO move to test classes?
 
 				// Variable loading
@@ -650,126 +680,11 @@ protected void afterErrors() {
 				debug("Early init done");
 
 				if (TestMode.ENABLED) {
-					Bukkit.getScheduler().runTaskLater(Skript.this, () -> info("Skript testing environment enabled, starting soon..."), 1);
-					// Ignore late init (scripts, etc.) in test mode
-					Bukkit.getScheduler().runTaskLater(Skript.this, () -> {
-						// Delay is in Minecraft ticks.
-						long shutdownDelay = 0;
-						if (TestMode.GEN_DOCS) {
-							Bukkit.dispatchCommand(Bukkit.getConsoleSender(), "skript gen-docs");
-						} else if (TestMode.DEV_MODE) { // Developer controlled environment.
-							info("Test development mode enabled. Test scripts are at " + TestMode.TEST_DIR);
-							return;
-						} else {
-							info("Loading all tests from " + TestMode.TEST_DIR);
-
-							// Treat parse errors as fatal testing failure
-							CountingLogHandler errorCounter = new CountingLogHandler(Level.SEVERE);
-							try {
-								errorCounter.start();
-								File testDir = TestMode.TEST_DIR.toFile();
-								assert testDir != null;
-								ScriptLoader.loadScripts(testDir, errorCounter);
-							} finally {
-								errorCounter.stop();
-							}
-
-							Bukkit.getPluginManager().callEvent(new SkriptTestEvent());
-							if (errorCounter.getCount() > 0) {
-								TestTracker.testStarted("parse scripts");
-								TestTracker.testFailed(errorCounter.getCount() + " error(s) found");
-							}
-							if (errored) { // Check for exceptions thrown while script was executing
-								TestTracker.testStarted("run scripts");
-								TestTracker.testFailed("exception was thrown during execution");
-							}
-							if (TestMode.JUNIT) {
-								info("Running all JUnit tests...");
-								long milliseconds = 0, tests = 0, fails = 0, ignored = 0, size = 0;
-								try {
-									List<Class<?>> classes = Lists.newArrayList(Utils.getClasses(Skript.getInstance(), "org.skriptlang.skript.test", "tests"));
-									// Don't attempt to run inner/anonymous classes as tests
-									classes.removeIf(Class::isAnonymousClass);
-									classes.removeIf(Class::isLocalClass);
-									// Test that requires package access. This is only present when compiling with src/test.
-									classes.add(Class.forName("ch.njol.skript.variables.FlatFileStorageTest"));
-									size = classes.size();
-									for (Class<?> clazz : classes) {
-										// Reset class SkriptJUnitTest which stores test requirements.
-										String test = clazz.getName();
-										SkriptJUnitTest.setCurrentJUnitTest(test);
-										SkriptJUnitTest.setShutdownDelay(0);
-
-										info("Running JUnit test '" + test + "'");
-										Result junit = JUnitCore.runClasses(clazz);
-										TestTracker.testStarted("JUnit: '" + test + "'");
-
-										/**
-										 * Usage of @After is pointless if the JUnit class requires delay. As the @After will happen instantly.
-										 * The JUnit must override the 'cleanup' method to avoid Skript automatically cleaning up the test data.
-										 */
-										boolean overrides = false;
-										for (Method method : clazz.getDeclaredMethods()) {
-											if (!method.isAnnotationPresent(After.class))
-												continue;
-											if (SkriptJUnitTest.getShutdownDelay() > 1)
-												warning("Using @After in JUnit classes, happens instantaneously, and JUnit class '" + test + "' requires a delay. Do your test cleanup in the script junit file or 'cleanup' method.");
-											if (method.getName().equals("cleanup"))
-												overrides = true;
-										}
-										if (SkriptJUnitTest.getShutdownDelay() > 1 && !overrides)
-											error("The JUnit class '" + test + "' does not override the method 'cleanup' thus the test data will instantly be cleaned up. " +
-													"This JUnit test requires longer shutdown time: " + SkriptJUnitTest.getShutdownDelay());
-
-										// Collect all data from the current JUnit test.
-										shutdownDelay = Math.max(shutdownDelay, SkriptJUnitTest.getShutdownDelay());
-										tests += junit.getRunCount();
-										milliseconds += junit.getRunTime();
-										ignored += junit.getIgnoreCount();
-										fails += junit.getFailureCount();
-
-										// If JUnit failures are present, add them to the TestTracker.
-										junit.getFailures().forEach(failure -> {
-											String message = failure.getMessage() == null ? "" : " " + failure.getMessage();
-											TestTracker.JUnitTestFailed(test, message);
-											Skript.exception(failure.getException(), "JUnit test '" + failure.getTestHeader() + " failed.");
-										});
-										if (SkriptJUnitTest.class.isAssignableFrom(clazz))
-											((SkriptJUnitTest) clazz.getConstructor().newInstance()).cleanup();
-										SkriptJUnitTest.clearJUnitTest();
-									}
-								} catch (IOException e) {
-									Skript.exception(e, "Failed to execute JUnit runtime tests.");
-								} catch (ClassNotFoundException e) {
-									// Should be the Skript test jar gradle task.
-									assert false : "Class 'ch.njol.skript.variables.FlatFileStorageTest' was not found.";
-								} catch (InstantiationException | IllegalAccessException | IllegalArgumentException | InvocationTargetException | NoSuchMethodException | SecurityException e) {
-									Skript.exception(e, "Failed to initalize test JUnit classes.");
-								}
-								if (ignored > 0)
-									Skript.warning("There were " + ignored + " ignored test cases! This can mean they are not properly setup in order in that class!");
-
-								info("Completed " + tests + " JUnit tests in " + size + " classes with " + fails + " failures in " + milliseconds + " milliseconds.");
-							}
-						}
-						double display = shutdownDelay / 20;
-						info("Testing done, shutting down the server in " + display + " second" + (display <= 1D ? "" : "s") + "...");
-						// 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())
-								EffObjectives.fail();
-
-							info("Collecting results to " + TestMode.RESULTS_FILE);
-							String results = new Gson().toJson(TestTracker.collectResults());
-							try {
-								Files.write(TestMode.RESULTS_FILE, results.getBytes(StandardCharsets.UTF_8));
-							} catch (IOException e) {
-								Skript.exception(e, "Failed to write test results.");
-							}
-
-							Bukkit.getServer().shutdown();
-						}, shutdownDelay);
-					}, 100);
+					if (TestMode.DEV_MODE) {
+						runTests(); // Dev mode doesn't need a delay
+					} else {
+						Bukkit.getWorlds().get(0).getChunkAtAsync(100, 100).thenRun(() -> runTests());
+					}
 				}
 
 				Skript.metrics = new Metrics(Skript.getInstance(), 722); // 722 is our bStats plugin ID
@@ -829,35 +744,240 @@ protected void afterErrors() {
 			}
 		});
 
-		Bukkit.getPluginManager().registerEvents(new Listener() {
-			@EventHandler
-			public void onJoin(final PlayerJoinEvent e) {
-				if (e.getPlayer().hasPermission("skript.admin")) {
-					new Task(Skript.this, 0) {
-						@Override
-						public void run() {
-							Player p = e.getPlayer();
-							SkriptUpdater updater = getUpdater();
-							if (updater == null)
-								return;
+		if (!TestMode.ENABLED) {
+			Bukkit.getPluginManager().registerEvents(new JoinUpdateNotificationListener(), this);
+		}
 
-							// Don't actually check for updates to avoid breaking Github rate limit
-							if (updater.getReleaseStatus() == ReleaseStatus.OUTDATED) {
-								// Last check indicated that an update is available
-								UpdateManifest update = updater.getUpdateManifest();
-								assert update != null; // Because we just checked that one is available
-								Skript.info(p, "" + SkriptUpdater.m_update_available.toString(update.id, Skript.getVersion()));
-								p.spigot().sendMessage(BungeeConverter.convert(ChatMessages.parseToArray(
-										"Download it at: <aqua><u><link:" + update.downloadUrl + ">" + update.downloadUrl)));
-							}
+		// Send a warning to console when the plugin is reloaded
+		Bukkit.getPluginManager().registerEvents(new ServerReloadListener(), this);
+
+		// Tell Timings that we are here!
+		SkriptTimings.setSkript(this);
+	}
+
+	private static class ServerReloadListener implements Listener {
+
+		@EventHandler
+		public void onServerReload(ServerLoadEvent event) {
+			if ((event.getType() != ServerLoadEvent.LoadType.RELOAD))
+				return;
+
+			for (OfflinePlayer player : Bukkit.getOperators()) {
+				if (player.isOnline()) {
+					player.getPlayer().sendMessage(ChatColor.YELLOW + getWarningMessage());
+					player.getPlayer().sendMessage(ChatColor.YELLOW + getRestartMessage());
+				}
+			}
+
+			Skript.warning(getWarningMessage());
+			Skript.warning(getRestartMessage());
+		}
+	}
+
+	private class JoinUpdateNotificationListener implements Listener {
+
+		@EventHandler
+		public void onJoin(PlayerJoinEvent event) {
+			if (!event.getPlayer().hasPermission("skript.admin"))
+				return;
+
+			new Task(Skript.this, 0) {
+				@Override
+				public void run() {
+					Player player = event.getPlayer();
+					SkriptUpdater updater = getUpdater();
+
+					// Don't actually check for updates to avoid breaking GitHub rate limit
+					if (updater == null || updater.getReleaseStatus() != ReleaseStatus.OUTDATED)
+						return;
+
+					// Last check indicated that an update is available
+					UpdateManifest update = updater.getUpdateManifest();
+
+					if (update == null)
+						return;
+
+					Skript.info(player, SkriptUpdater.m_update_available.toString(update.id, Skript.getVersion()));
+					player.spigot().sendMessage(BungeeConverter.convert(ChatMessages.parseToArray(
+						"Download it at: <aqua><u><link:" + update.downloadUrl + ">" + update.downloadUrl)));
+				}
+			};
+		}
+  	}
+
+	private void runTests() {
+		info("Skript testing environment enabled, starting...");
+
+		// Delay is in Minecraft ticks.
+		AtomicLong shutdownDelay = new AtomicLong(0);
+		List<Class<?>> asyncTests = new ArrayList<>();
+		CompletableFuture<Void> onAsyncComplete = CompletableFuture.completedFuture(null);
+
+		if (TestMode.GEN_DOCS) {
+			Bukkit.dispatchCommand(Bukkit.getConsoleSender(), "skript gen-docs");
+		} else if (TestMode.DEV_MODE) { // Developer controlled environment.
+			info("Test development mode enabled. Test scripts are at " + TestMode.TEST_DIR);
+			return;
+		} else {
+			info("Loading all tests from " + TestMode.TEST_DIR);
+
+			// Treat parse errors as fatal testing failure
+			TestingLogHandler errorCounter = new TestingLogHandler(Level.SEVERE);
+			try {
+				errorCounter.start();
+
+				// load example scripts (cleanup after)
+				ScriptLoader.loadScripts(new File(getScriptsFolder(), "-examples" + File.separator), errorCounter);
+				// unload these as to not interfere with the tests
+				ScriptLoader.unloadScripts(ScriptLoader.getLoadedScripts());
+
+				// load test directory scripts
+				ScriptLoader.loadScripts(TestMode.TEST_DIR.toFile(), errorCounter);
+			} finally {
+				errorCounter.stop();
+			}
+
+			Bukkit.getPluginManager().callEvent(new SkriptTestEvent());
+			if (errorCounter.getCount() > 0) {
+				TestTracker.testStarted("parse scripts");
+				TestTracker.testFailed(errorCounter.getCount() + " error(s) found");
+			}
+			if (errored) { // Check for exceptions thrown while script was executing
+				TestTracker.testStarted("run scripts");
+				TestTracker.testFailed("exception was thrown during execution");
+			}
+			if (TestMode.JUNIT) {
+				AtomicLong milliseconds = new AtomicLong(0),
+					tests = new AtomicLong(0), fails = new AtomicLong(0),
+					ignored = new AtomicLong(0), size = new AtomicLong(0);
+
+				info("Running sync JUnit tests...");
+				try {
+					// Search for all test classes
+					Set<Class<?>> classes = new HashSet<>();
+					ClassLoader.builder()
+						.addSubPackages("org.skriptlang.skript", "ch.njol.skript")
+						.filter(fqn -> fqn.endsWith("Test"))
+						.initialize(true)
+						.deep(true)
+						.forEachClass(clazz -> {
+							if (clazz.isAnonymousClass() || clazz.isLocalClass())
+								return;
+							classes.add(clazz);
+						})
+						.build()
+						.loadClasses(Skript.class, getFile());
+					// remove some known non-tests that get picked up
+					classes.remove(SkriptJUnitTest.class);
+					classes.remove(SkriptAsyncJUnitTest.class);
+
+					size.set(classes.size());
+					for (Class<?> clazz : classes) {
+						if (SkriptAsyncJUnitTest.class.isAssignableFrom(clazz)) {
+							asyncTests.add(clazz); // do these later, all together
+							continue;
 						}
-					};
+
+						runTest(clazz, shutdownDelay, tests, milliseconds, ignored, fails);
+					}
+				} catch (InstantiationException | IllegalAccessException | IllegalArgumentException |
+						 InvocationTargetException | NoSuchMethodException | SecurityException e) {
+					Skript.exception(e, "Failed to initalize test JUnit classes.");
 				}
+				if (ignored.get() > 0)
+					Skript.warning("There were " + ignored + " ignored test cases! This can mean they are not properly setup in order in that class!");
+
+				onAsyncComplete = CompletableFuture.runAsync(() -> {
+					info("Running async JUnit tests...");
+					try {
+						for (Class<?> clazz : asyncTests) {
+							runTest(clazz, shutdownDelay, tests, milliseconds, ignored, fails);
+						}
+					} catch (InstantiationException | IllegalAccessException | IllegalArgumentException |
+							 InvocationTargetException | NoSuchMethodException | SecurityException e) {
+						Skript.exception(e, "Failed to initalize test JUnit classes.");
+					}
+					if (ignored.get() > 0)
+						Skript.warning("There were " + ignored + " ignored test cases! " +
+							"This can mean they are not properly setup in order in that class!");
+
+					info("Completed " + tests + " JUnit tests in " + size + " classes with " + fails +
+						" failures in " + milliseconds + " milliseconds.");
+				});
 			}
-		}, this);
+		}
 
-		// Tell Timings that we are here!
-		SkriptTimings.setSkript(this);
+		onAsyncComplete.thenRun(() -> {
+			double display = shutdownDelay.get() / 20.0;
+			info("Testing done, shutting down the server in " + display + " second" + (display == 1 ? "" : "s") + "...");
+
+			// 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, () -> {
+				info("Shutting down server.");
+				if (TestMode.JUNIT && !EffObjectives.isJUnitComplete())
+					EffObjectives.fail();
+
+				info("Collecting results to " + TestMode.RESULTS_FILE);
+				String results = new GsonBuilder()
+					.setPrettyPrinting() // Easier to read lines
+					.disableHtmlEscaping() // Fixes issue with "'" character in test strings going unicode
+					.create().toJson(TestTracker.collectResults());
+				try {
+					Files.write(TestMode.RESULTS_FILE, results.getBytes(StandardCharsets.UTF_8));
+				} catch (IOException e) {
+					Skript.exception(e, "Failed to write test results.");
+				}
+
+				Bukkit.getServer().shutdown();
+			}, shutdownDelay.get());
+		});
+	}
+
+	private void runTest(Class<?> clazz, AtomicLong shutdownDelay, AtomicLong tests,
+						 AtomicLong milliseconds, AtomicLong ignored, AtomicLong fails)
+		throws NoSuchMethodException, InvocationTargetException, InstantiationException, IllegalAccessException {
+		String test = clazz.getName();
+		SkriptJUnitTest.setCurrentJUnitTest(test);
+		SkriptJUnitTest.setShutdownDelay(0);
+
+		info("Running JUnit test '" + test + "'");
+		Result result = JUnitCore.runClasses(clazz);
+		TestTracker.testStarted("JUnit: '" + test + "'");
+
+		/*
+		 * Usage of @After is pointless if the JUnit class requires delay. As the @After will happen instantly.
+		 * The JUnit must override the 'cleanup' method to avoid Skript automatically cleaning up the test data.
+		 */
+		boolean overrides = false;
+		for (Method method : clazz.getDeclaredMethods()) {
+			if (!method.isAnnotationPresent(After.class))
+				continue;
+			if (SkriptJUnitTest.getShutdownDelay() > 1)
+				warning("Methods annotated with @After in happen instantaneously, and '" + test + "' requires a delay. Do test cleanup in the junit script file or 'cleanup' method.");
+			if (method.getName().equals("cleanup"))
+				overrides = true;
+		}
+		if (SkriptJUnitTest.getShutdownDelay() > 1 && !overrides)
+			error("The JUnit class '" + test + "' does not override the method 'cleanup', thus the test data will instantly be cleaned up " +
+				"despite requiring a longer shutdown time: " + SkriptJUnitTest.getShutdownDelay());
+
+		shutdownDelay.set(Math.max(shutdownDelay.get(), SkriptJUnitTest.getShutdownDelay()));
+		tests.getAndAdd(result.getRunCount());
+		milliseconds.getAndAdd(result.getRunTime());
+		ignored.getAndAdd(result.getIgnoreCount());
+		fails.getAndAdd(result.getFailureCount());
+
+		// If JUnit failures are present, add them to the TestTracker.
+		for (Failure failure : result.getFailures()) {
+			String message = failure.getMessage() == null ? "" : " " + failure.getMessage();
+			TestTracker.JUnitTestFailed(test, message);
+			Skript.exception(failure.getException(), "JUnit test '" + failure.getTestHeader() + " failed.");
+		}
+
+		if (SkriptJUnitTest.class.isAssignableFrom(clazz) &&
+			!SkriptAsyncJUnitTest.class.isAssignableFrom(clazz)) // can't access blocks, entities async
+			((SkriptJUnitTest) clazz.getConstructor().newInstance()).cleanup();
+		SkriptJUnitTest.clearJUnitTest();
 	}
 
 	/**
@@ -1051,7 +1171,7 @@ public static Metrics getMetrics() {
 		return metrics;
 	}
 
-	@SuppressWarnings("null")
+	@SuppressWarnings({"null", "removal"})
 	private final static Collection<Closeable> closeOnDisable = Collections.synchronizedCollection(new ArrayList<Closeable>());
 
 	/**
@@ -1061,6 +1181,7 @@ public static Metrics getMetrics() {
 	 *
 	 * @param closeable
 	 */
+	@SuppressWarnings("removal")
 	public static void closeOnDisable(final Closeable closeable) {
 		closeOnDisable.add(closeable);
 	}
@@ -1140,11 +1261,11 @@ private boolean isServerRunning() {
 	private void beforeDisable() {
 		partDisabled = true;
 		EvtSkript.onSkriptStop(); // TODO [code style] warn user about delays in Skript stop events
-
 		ScriptLoader.unloadScripts(ScriptLoader.getLoadedScripts());
 	}
 
 	@Override
+	@SuppressWarnings("removal")
 	public void onDisable() {
 		if (disabled)
 			return;
@@ -1252,178 +1373,242 @@ public static void checkAcceptRegistrations() {
 
 	private static void stopAcceptingRegistrations() {
 		Converters.createChainedConverters();
-
 		acceptRegistrations = false;
-
 		Classes.onRegistrationsStop();
 	}
 
 	// ================ ADDONS ================
 
-	private final static HashMap<String, SkriptAddon> addons = new HashMap<>();
+	@Deprecated
+	private static final Set<SkriptAddon> addons = new HashSet<>();
 
 	/**
 	 * Registers an addon to Skript. This is currently not required for addons to work, but the returned {@link SkriptAddon} provides useful methods for registering syntax elements
 	 * and adding new strings to Skript's localization system (e.g. the required "types.[type]" strings for registered classes).
 	 *
-	 * @param p The plugin
+	 * @param plugin The plugin
 	 */
-	public static SkriptAddon registerAddon(final JavaPlugin p) {
+	public static SkriptAddon registerAddon(JavaPlugin plugin) {
 		checkAcceptRegistrations();
-		if (addons.containsKey(p.getName()))
-			throw new IllegalArgumentException("The plugin " + p.getName() + " is already registered");
-		final SkriptAddon addon = new SkriptAddon(p);
-		addons.put(p.getName(), addon);
+		SkriptAddon addon = new SkriptAddon(plugin);
+		addons.add(addon);
 		return addon;
 	}
 
-	@Nullable
-	public static SkriptAddon getAddon(final JavaPlugin p) {
-		return addons.get(p.getName());
+	public static @Nullable SkriptAddon getAddon(JavaPlugin plugin) {
+		if (plugin == Skript.getInstance()) {
+			return Skript.getAddonInstance();
+		}
+		for (SkriptAddon addon : getAddons()) {
+			if (addon.plugin == plugin) {
+				return addon;
+			}
+		}
+		return null;
 	}
 
-	@Nullable
-	public static SkriptAddon getAddon(final String name) {
-		return addons.get(name);
+	public static @Nullable SkriptAddon getAddon(String name) {
+		if (name.equals(Skript.getInstance().getName())) {
+			return Skript.getAddonInstance();
+		}
+		for (SkriptAddon addon : getAddons()) {
+			if (addon.getName().equals(name)) {
+				return addon;
+			}
+		}
+		return null;
 	}
 
-	@SuppressWarnings("null")
-	public static Collection<SkriptAddon> getAddons() {
-		return Collections.unmodifiableCollection(addons.values());
+	public static @Unmodifiable Collection<SkriptAddon> getAddons() {
+		Set<SkriptAddon> addons = new HashSet<>(Skript.addons);
+		addons.addAll(instance().addons().stream()
+			.filter(addon -> addons.stream().noneMatch(oldAddon -> oldAddon.name().equals(addon.name())))
+			.map(SkriptAddon::fromModern)
+			.collect(Collectors.toSet())
+		);
+		return Collections.unmodifiableCollection(addons);
 	}
 
-	@Nullable
-	private static SkriptAddon addon;
+	@Deprecated
+	private static @Nullable SkriptAddon addon;
 
 	/**
 	 * @return A {@link SkriptAddon} representing Skript.
 	 */
 	public static SkriptAddon getAddonInstance() {
 		if (addon == null) {
-			addon = new SkriptAddon(Skript.getInstance());
-			addon.setLanguageFileDirectory("lang");
+			addon = SkriptAddon.fromModern(instance());
 		}
 		return addon;
 	}
 
 	// ================ CONDITIONS & EFFECTS & SECTIONS ================
 
-	private static final Collection<SyntaxElementInfo<? extends Condition>> conditions = new ArrayList<>(50);
-	private static final Collection<SyntaxElementInfo<? extends Effect>> effects = new ArrayList<>(50);
-	private static final Collection<SyntaxElementInfo<? extends Statement>> statements = new ArrayList<>(100);
-	private static final Collection<SyntaxElementInfo<? extends Section>> sections = new ArrayList<>(50);
+	private static final class BukkitOrigin implements SyntaxOrigin {
+
+		private final String name;
+
+		private BukkitOrigin(Plugin plugin) {
+			this.name = plugin.getName();
+		}
+
+		@Override
+		public String name() {
+			return name;
+		}
+
+	}
+
+	/**
+	 * Attempts to create a SyntaxOrigin from a provided class.
+	 */
+	@ApiStatus.Internal
+	@ApiStatus.Experimental
+	public static SyntaxOrigin getSyntaxOrigin(Class<?> source) {
+		JavaPlugin plugin;
+		try {
+			plugin = JavaPlugin.getProvidingPlugin(source);
+		} catch (IllegalArgumentException e) { // Occurs when the method fails to determine the providing plugin
+			return () -> source.getName();
+		}
+		SkriptAddon addon = getAddon(plugin);
+		if (addon != null) {
+			return SyntaxOrigin.of(addon);
+		}
+		return new BukkitOrigin(plugin);
+	}
+
+	/**
+	 * Registers a {@link Condition}.
+	 *
+	 * @param conditionClass The condition's class
+	 * @param patterns Skript patterns to match this condition
+	 */
+	public static <E extends Condition> void registerCondition(Class<E> conditionClass, String... patterns) throws IllegalArgumentException {
+		registerCondition(conditionClass, ConditionType.COMBINED, patterns);
+	}
 
 	/**
-	 * registers a {@link Condition}.
+	 * Registers a {@link Condition}.
 	 *
-	 * @param condition The condition's class
+	 * @param conditionClass The condition's class
+	 * @param type The type of condition which affects its priority in the parsing search
 	 * @param patterns Skript patterns to match this condition
 	 */
-	public static <E extends Condition> void registerCondition(final Class<E> condition, final String... patterns) throws IllegalArgumentException {
+	public static <E extends Condition> void registerCondition(Class<E> conditionClass, ConditionType type, String... patterns) throws IllegalArgumentException {
 		checkAcceptRegistrations();
-		String originClassPath = Thread.currentThread().getStackTrace()[2].getClassName();
-		final SyntaxElementInfo<E> info = new SyntaxElementInfo<>(patterns, condition, originClassPath);
-		conditions.add(info);
-		statements.add(info);
+		skript.syntaxRegistry().register(SyntaxRegistry.CONDITION, SyntaxInfo.builder(conditionClass)
+				.priority(type.priority())
+				.origin(getSyntaxOrigin(conditionClass))
+				.addPatterns(patterns)
+				.build()
+		);
 	}
 
 	/**
 	 * Registers an {@link Effect}.
 	 *
-	 * @param effect The effect's class
+	 * @param effectClass The effect's class
 	 * @param patterns Skript patterns to match this effect
 	 */
-	public static <E extends Effect> void registerEffect(final Class<E> effect, final String... patterns) throws IllegalArgumentException {
+	public static <E extends Effect> void registerEffect(Class<E> effectClass, String... patterns) throws IllegalArgumentException {
 		checkAcceptRegistrations();
-		String originClassPath = Thread.currentThread().getStackTrace()[2].getClassName();
-		final SyntaxElementInfo<E> info = new SyntaxElementInfo<>(patterns, effect, originClassPath);
-		effects.add(info);
-		statements.add(info);
+		skript.syntaxRegistry().register(SyntaxRegistry.EFFECT, SyntaxInfo.builder(effectClass)
+				.origin(getSyntaxOrigin(effectClass))
+				.addPatterns(patterns)
+				.build()
+		);
 	}
 
 	/**
 	 * Registers a {@link Section}.
 	 *
-	 * @param section The section's class
+	 * @param sectionClass The section's class
 	 * @param patterns Skript patterns to match this section
 	 * @see Section
 	 */
-	public static <E extends Section> void registerSection(Class<E> section, String... patterns) throws IllegalArgumentException {
+	public static <E extends Section> void registerSection(Class<E> sectionClass, String... patterns) throws IllegalArgumentException {
 		checkAcceptRegistrations();
-		String originClassPath = Thread.currentThread().getStackTrace()[2].getClassName();
-		SyntaxElementInfo<E> info = new SyntaxElementInfo<>(patterns, section, originClassPath);
-		sections.add(info);
+		skript.syntaxRegistry().register(SyntaxRegistry.SECTION, SyntaxInfo.builder(sectionClass)
+				.origin(getSyntaxOrigin(sectionClass))
+				.addPatterns(patterns)
+				.build()
+		);
 	}
 
-	public static Collection<SyntaxElementInfo<? extends Statement>> getStatements() {
-		return statements;
+	public static @Unmodifiable Collection<SyntaxElementInfo<? extends Statement>> getStatements() {
+		return instance().syntaxRegistry()
+				.syntaxes(SyntaxRegistry.STATEMENT).stream()
+				.map(SyntaxElementInfo::<SyntaxElementInfo<Statement>, Statement>fromModern)
+				.collect(Collectors.toUnmodifiableList());
 	}
 
-	public static Collection<SyntaxElementInfo<? extends Condition>> getConditions() {
-		return conditions;
+	public static @Unmodifiable Collection<SyntaxElementInfo<? extends Condition>> getConditions() {
+		return instance().syntaxRegistry()
+				.syntaxes(SyntaxRegistry.CONDITION).stream()
+				.map(SyntaxElementInfo::<SyntaxElementInfo<Condition>, Condition>fromModern)
+				.collect(Collectors.toUnmodifiableList());
 	}
 
-	public static Collection<SyntaxElementInfo<? extends Effect>> getEffects() {
-		return effects;
+	public static @Unmodifiable Collection<SyntaxElementInfo<? extends Effect>> getEffects() {
+		return instance().syntaxRegistry()
+				.syntaxes(SyntaxRegistry.EFFECT).stream()
+				.map(SyntaxElementInfo::<SyntaxElementInfo<Effect>, Effect>fromModern)
+				.collect(Collectors.toUnmodifiableList());
 	}
 
-	public static Collection<SyntaxElementInfo<? extends Section>> getSections() {
-		return sections;
+	public static @Unmodifiable Collection<SyntaxElementInfo<? extends Section>> getSections() {
+		return instance().syntaxRegistry()
+				.syntaxes(SyntaxRegistry.SECTION).stream()
+				.map(SyntaxElementInfo::<SyntaxElementInfo<Section>, Section>fromModern)
+				.collect(Collectors.toUnmodifiableList());
 	}
 
 	// ================ EXPRESSIONS ================
 
-	private final static List<ExpressionInfo<?, ?>> expressions = new ArrayList<>(100);
-
-	private final static int[] expressionTypesStartIndices = new int[ExpressionType.values().length];
-
 	/**
 	 * Registers an expression.
 	 *
-	 * @param c The expression's class
+	 * @param expressionType The expression's class
 	 * @param returnType The superclass of all values returned by the expression
 	 * @param type The expression's {@link ExpressionType type}. This is used to determine in which order to try to parse expressions.
 	 * @param patterns Skript patterns that match this expression
 	 * @throws IllegalArgumentException if returnType is not a normal class
 	 */
-	public static <E extends Expression<T>, T> void registerExpression(final Class<E> c, final Class<T> returnType, final ExpressionType type, final String... patterns) throws IllegalArgumentException {
+	public static <E extends Expression<T>, T> void registerExpression(
+		Class<E> expressionType, Class<T> returnType, ExpressionType type, String... patterns
+	) throws IllegalArgumentException {
 		checkAcceptRegistrations();
-		if (returnType.isAnnotation() || returnType.isArray() || returnType.isPrimitive())
-			throw new IllegalArgumentException("returnType must be a normal type");
-		String originClassPath = Thread.currentThread().getStackTrace()[2].getClassName();
-		final ExpressionInfo<E, T> info = new ExpressionInfo<>(patterns, returnType, c, originClassPath, type);
-		expressions.add(expressionTypesStartIndices[type.ordinal()], info);
-		for (int i = type.ordinal(); i < ExpressionType.values().length; i++) {
-			expressionTypesStartIndices[i]++;
-		}
+		skript.syntaxRegistry().register(SyntaxRegistry.EXPRESSION, SyntaxInfo.Expression.builder(expressionType, returnType)
+				.priority(type.priority())
+				.origin(getSyntaxOrigin(expressionType))
+				.addPatterns(patterns)
+				.build()
+		);
 	}
 
-	@SuppressWarnings("null")
 	public static Iterator<ExpressionInfo<?, ?>> getExpressions() {
-		return expressions.iterator();
-	}
-
-	public static Iterator<ExpressionInfo<?, ?>> getExpressions(final Class<?>... returnTypes) {
-		return new CheckedIterator<>(getExpressions(), new NullableChecker<ExpressionInfo<?, ?>>() {
-			@Override
-			public boolean check(final @Nullable ExpressionInfo<?, ?> i) {
-				if (i == null || i.returnType == Object.class)
+		List<ExpressionInfo<?, ?>> list = new ArrayList<>();
+		for (SyntaxInfo.Expression<?, ?> info : instance().syntaxRegistry().syntaxes(SyntaxRegistry.EXPRESSION))
+			list.add((ExpressionInfo<?, ?>) SyntaxElementInfo.fromModern(info));
+		return list.iterator();
+	}
+
+	public static Iterator<ExpressionInfo<?, ?>> getExpressions(Class<?>... returnTypes) {
+		return new CheckedIterator<>(getExpressions(), info -> {
+			if (info == null || info.returnType == Object.class)
+				return true;
+			for (Class<?> returnType : returnTypes) {
+				assert returnType != null;
+				if (Converters.converterExists(info.returnType, returnType))
 					return true;
-				for (final Class<?> returnType : returnTypes) {
-					assert returnType != null;
-					if (Converters.converterExists(i.returnType, returnType))
-						return true;
-				}
-				return false;
 			}
+			return false;
 		});
 	}
 
 	// ================ EVENTS ================
 
-	private static final List<SkriptEventInfo<?>> events = new ArrayList<>(50);
-	private static final List<StructureInfo<? extends Structure>> structures = new ArrayList<>(10);
-
 	/**
 	 * Registers an event.
 	 *
@@ -1443,51 +1628,66 @@ public static <E extends SkriptEvent> SkriptEventInfo<E> registerEvent(String na
 	 * Registers an event.
 	 *
 	 * @param name The name of the event, used for error messages
-	 * @param c The event's class
+	 * @param eventClass The event's class
 	 * @param events The Bukkit events this event applies to
 	 * @param patterns Skript patterns to match this event
 	 * @return A SkriptEventInfo representing the registered event. Used to generate Skript's documentation.
 	 */
-	public static <E extends SkriptEvent> SkriptEventInfo<E> registerEvent(String name, Class<E> c, Class<? extends Event>[] events, String... patterns) {
+	@SuppressWarnings("ConstantConditions") // caused by bad array annotations
+	public static <E extends SkriptEvent> SkriptEventInfo<E> registerEvent(
+		String name, Class<E> eventClass, Class<? extends Event>[] events, String... patterns
+	) {
 		checkAcceptRegistrations();
-		String originClassPath = Thread.currentThread().getStackTrace()[2].getClassName();
-
-		String[] transformedPatterns = new String[patterns.length];
 		for (int i = 0; i < patterns.length; i++)
-			transformedPatterns[i] = SkriptEvent.fixPattern(patterns[i]);
-
-		SkriptEventInfo<E> r = new SkriptEventInfo<>(name, transformedPatterns, c, originClassPath, events);
-		Skript.events.add(r);
-		return r;
+			patterns[i] = BukkitSyntaxInfos.fixPattern(patterns[i]);
+		var legacy = new SkriptEventInfo.ModernSkriptEventInfo<>(name, patterns, eventClass, "", events);
+		skript.syntaxRegistry().register(BukkitRegistryKeys.EVENT, legacy);
+		return legacy;
 	}
 
-	public static <E extends Structure> void registerStructure(Class<E> c, String... patterns) {
+	public static <E extends Structure> void registerStructure(Class<E> structureClass, String... patterns) {
 		checkAcceptRegistrations();
-		String originClassPath = Thread.currentThread().getStackTrace()[2].getClassName();
-		StructureInfo<E> structureInfo = new StructureInfo<>(patterns, c, originClassPath);
-		structures.add(structureInfo);
+		skript.syntaxRegistry().register(SyntaxRegistry.STRUCTURE, SyntaxInfo.Structure.builder(structureClass)
+				.origin(getSyntaxOrigin(structureClass))
+				.addPatterns(patterns)
+				.build()
+		);
 	}
 
-	public static <E extends Structure> void registerSimpleStructure(Class<E> c, String... patterns) {
+	public static <E extends Structure> void registerSimpleStructure(Class<E> structureClass, String... patterns) {
 		checkAcceptRegistrations();
-		String originClassPath = Thread.currentThread().getStackTrace()[2].getClassName();
-		StructureInfo<E> structureInfo = new StructureInfo<>(patterns, c, originClassPath, true);
-		structures.add(structureInfo);
+		skript.syntaxRegistry().register(SyntaxRegistry.STRUCTURE, SyntaxInfo.Structure.builder(structureClass)
+			.origin(getSyntaxOrigin(structureClass))
+			.addPatterns(patterns)
+			.nodeType(SyntaxInfo.Structure.NodeType.SIMPLE)
+			.build()
+		);
 	}
 
-	public static <E extends Structure> void registerStructure(Class<E> c, EntryValidator entryValidator, String... patterns) {
+	public static <E extends Structure> void registerStructure(
+		Class<E> structureClass, EntryValidator entryValidator, String... patterns
+	) {
 		checkAcceptRegistrations();
-		String originClassPath = Thread.currentThread().getStackTrace()[2].getClassName();
-		StructureInfo<E> structureInfo = new StructureInfo<>(patterns, c, originClassPath, entryValidator);
-		structures.add(structureInfo);
+		skript.syntaxRegistry().register(SyntaxRegistry.STRUCTURE, SyntaxInfo.Structure.builder(structureClass)
+				.origin(getSyntaxOrigin(structureClass))
+				.addPatterns(patterns)
+				.entryValidator(entryValidator)
+				.build()
+		);
 	}
 
-	public static Collection<SkriptEventInfo<?>> getEvents() {
-		return events;
+	public static @Unmodifiable Collection<SkriptEventInfo<?>> getEvents() {
+		return instance().syntaxRegistry()
+				.syntaxes(BukkitRegistryKeys.EVENT).stream()
+				.map(SyntaxElementInfo::<SkriptEventInfo<SkriptEvent>, SkriptEvent>fromModern)
+				.collect(Collectors.toUnmodifiableList());
 	}
 
-	public static List<StructureInfo<? extends Structure>> getStructures() {
-		return structures;
+	public static @Unmodifiable List<StructureInfo<? extends Structure>> getStructures() {
+		return instance().syntaxRegistry()
+				.syntaxes(SyntaxRegistry.STRUCTURE).stream()
+				.map(SyntaxElementInfo::<StructureInfo<Structure>, Structure>fromModern)
+				.collect(Collectors.toUnmodifiableList());
 	}
 
 	// ================ COMMANDS ================
@@ -1552,6 +1752,17 @@ public static void debug(final String info) {
 		SkriptLogger.log(SkriptLogger.DEBUG, info);
 	}
 
+	/**
+	 * Sends a debug message with formatted objects if {@link #debug()} returns true.
+	 *
+	 * @param message The message to send
+	 * @param objects The objects to format the message with
+	 * @see String#formatted(Object...)
+	 */
+	public static void debug(String message, Object... objects) {
+		debug(message.formatted(objects));
+	}
+
 	/**
 	 * @see SkriptLogger#log(Level, String)
 	 */
@@ -1644,161 +1855,164 @@ public static void markErrored() {
 	 * @param info Description of the error and additional information
 	 * @return an EmptyStacktraceException to throw if code execution should terminate.
 	 */
-	public static EmptyStacktraceException exception(@Nullable Throwable cause, final @Nullable Thread thread, final @Nullable TriggerItem item, final String... info) {
+	public static EmptyStacktraceException exception(@Nullable Throwable cause, @Nullable Thread thread, @Nullable TriggerItem item, String... info) {
 		errored = true;
 
-		// Don't send full exception message again, when caught exception (likely) comes from this method
+		// Avoid re-throwing the same exception
 		if (cause instanceof EmptyStacktraceException) {
 			return new EmptyStacktraceException();
 		}
 
 		// First error: gather plugin package information
 		if (!checkedPlugins) {
-			for (Plugin plugin : Bukkit.getPluginManager().getPlugins()) {
-				if (plugin.getName().equals("Skript")) // Don't track myself!
-					continue;
-
-				PluginDescriptionFile desc = plugin.getDescription();
-				if (desc.getDepend().contains("Skript") || desc.getSoftDepend().contains("Skript")) {
-					// Take actual main class out from the qualified name
-					String[] parts = desc.getMain().split("\\."); // . is special in regexes...
-					StringBuilder name = new StringBuilder(desc.getMain().length());
-					for (int i = 0; i < parts.length - 1; i++) {
-						name.append(parts[i]).append('.');
-					}
+			initializePluginPackages();
+			checkedPlugins = true; // No need to do this next time
+		}
+
+		logErrorDetails(cause, info, thread, item);
+		return new EmptyStacktraceException();
+	}
+
+	private static void initializePluginPackages() {
+		for (Plugin plugin : Bukkit.getPluginManager().getPlugins()) {
+			if (plugin.getName().equals("Skript")) // Skip self
+				continue;
 
-					// Put this to map
-					pluginPackages.put(name.toString(), desc);
-					if (Skript.debug())
-						Skript.info("Identified potential addon: " + desc.getFullName() + " (" + name.toString() + ")");
+			PluginDescriptionFile desc = plugin.getDescription();
+			if (desc.getDepend().contains("Skript") || desc.getSoftDepend().contains("Skript")) {
+				String mainClassPackage = getPackageName(desc.getMain());
+				pluginPackages.put(mainClassPackage, desc);
+				if (Skript.debug()) {
+					Skript.info("Identified potential addon: " + desc.getFullName() + " (" + mainClassPackage + ")");
 				}
 			}
-
-			checkedPlugins = true; // No need to do this next time
 		}
+	}
 
+	private static String getPackageName(String qualifiedClassName) {
+		int lastDotIndex = qualifiedClassName.lastIndexOf('.');
+		return (lastDotIndex == -1) ? "" : qualifiedClassName.substring(0, lastDotIndex);
+	}
+
+	private static void logErrorDetails(@Nullable Throwable cause, String[] info, @Nullable Thread thread, @Nullable TriggerItem item) {
 		String issuesUrl = "https://github.com/SkriptLang/Skript/issues";
+		String downloadUrl = "https://github.com/SkriptLang/Skript/releases/latest"; //TODO grab this from the update checker
 
 		logEx();
 		logEx("[Skript] Severe Error:");
 		logEx(info);
 		logEx();
 
-		// Parse something useful out of the stack trace
-		StackTraceElement[] stackTrace = Thread.currentThread().getStackTrace();
+		Set<PluginDescriptionFile> stackPlugins = identifyPluginsInStackTrace(Thread.currentThread().getStackTrace());
+
+		logPlatformSupportInfo(issuesUrl, downloadUrl, stackPlugins);
+
+		logEx();
+		logEx("Stack trace:");
+		logStackTrace(cause);
+
+		logEx();
+		logVersionInfo();
+		logEx();
+		logCurrentState(thread, item);
+		logEx("End of Error.");
+		logEx();
+	}
+
+	private static Set<PluginDescriptionFile> identifyPluginsInStackTrace(StackTraceElement[] stackTrace) {
 		Set<PluginDescriptionFile> stackPlugins = new HashSet<>();
-		for (StackTraceElement s : stackTrace) { // Look through stack trace
-			for (Entry<String,PluginDescriptionFile> e : pluginPackages.entrySet()) { // Look through plugins
-				if (s.getClassName().contains(e.getKey())) // Hey, is this plugin in that stack trace?
-					stackPlugins.add(e.getValue()); // Yes? Add it to list
-			}
+		for (StackTraceElement element : stackTrace) {
+			pluginPackages.entrySet().stream()
+				.filter(entry -> element.getClassName().startsWith(entry.getKey()))
+				.forEach(entry -> stackPlugins.add(entry.getValue()));
 		}
+		return stackPlugins;
+	}
 
+
+	private static void logPlatformSupportInfo(String issuesUrl, String downloadUrl, Set<PluginDescriptionFile> stackPlugins) {
 		SkriptUpdater updater = Skript.getInstance().getUpdater();
 
-		// Check if server platform is supported
 		if (tainted) {
-			logEx("Skript is running with developer command-line options.");
-			logEx("If you are not a developer, consider disabling them.");
+			logEx("Skript is running with developer command-line options. Consider disabling them if not a developer.");
 		} else if (getInstance().getDescription().getVersion().contains("nightly")) {
-			logEx("You're running a (buggy) nightly version of Skript.");
-			logEx("If this is not a test server, switch to a more stable release NOW!");
-			logEx("Your players are unlikely to appreciate crashes and/or data loss due to Skript bugs.");
-			logEx("");
-			logEx("Just testing things? Good. Please report this bug, so that we can fix it before a stable release.");
-			logEx("Issue tracker: " + issuesUrl);
-		} else if (!isRunningMinecraft(1, 9)) {
-			logEx("You are running an outdated Minecraft version not supported by Skript.");
-			logEx("Please update to Minecraft 1.9.4 or later or fix this yourself and send us a pull request.");
-			logEx("Alternatively, use an older Skript version; do note that those are also unsupported by us.");
-			logEx("");
-			logEx("Again, we do not support Minecraft versions this old.");
-		} else if (!serverPlatform.supported){
-			logEx("Your server platform appears to be unsupported by Skript. It might not work reliably.");
-			logEx("You can report this at " + issuesUrl + ". However, we may be unable to fix the issue.");
-			logEx("It is recommended that you switch to Paper or Spigot, should you encounter more problems.");
+			logEx("You're running a (buggy) nightly version of Skript. If this is not a test server, switch to a stable release.");
+			logEx("Please report this bug to: " + issuesUrl);
+		} else if (!serverPlatform.supported) {
+			String supportedPlatforms = getSupportedPlatforms();
+			logEx("Your server platform appears to be unsupported by Skript. Consider switching to one of the supported platforms (" + supportedPlatforms + ") for better compatibility.");
 		} else if (updater != null && updater.getReleaseStatus() == ReleaseStatus.OUTDATED) {
-			logEx("You're running outdated version of Skript! Please try updating it NOW; it might fix this.");
-			logEx("Run /sk update check to get a download link to latest Skript!");
-			logEx("You will be given instructions how to report this error if it persists after update.");
+			logEx("You're running an outdated version of Skript! Update to the latest version here: " + downloadUrl);
 		} else {
-			logEx("Something went horribly wrong with Skript.");
-			logEx("This issue is NOT your fault! You probably can't fix it yourself, either.");
-			if (pluginPackages.isEmpty()) {
-				logEx("You should report it at " + issuesUrl + ". Please copy paste this report there (or use paste service).");
-				logEx("This ensures that your issue is noticed and will be fixed as soon as possible.");
-			} else {
-				logEx("It looks like you are using some plugin(s) that alter how Skript works (addons).");
-				if (stackPlugins.isEmpty()) {
-					logEx("Here is full list of them:");
-					StringBuilder pluginsMessage = new StringBuilder();
-					for (PluginDescriptionFile desc : pluginPackages.values()) {
-						pluginsMessage.append(desc.getFullName());
-						String website = desc.getWebsite();
-						if (website != null && !website.isEmpty()) // Add website if found
-							pluginsMessage.append(" (").append(desc.getWebsite()).append(")");
-
-						pluginsMessage.append(" ");
-					}
-					logEx(pluginsMessage.toString());
-					logEx("We could not identify which of those are specially related, so this might also be Skript issue.");
-				} else {
-					logEx("Following plugins are probably related to this error in some way:");
-					StringBuilder pluginsMessage = new StringBuilder();
-					for (PluginDescriptionFile desc : stackPlugins) {
-						pluginsMessage.append(desc.getName());
-						String website = desc.getWebsite();
-						if (website != null && !website.isEmpty()) // Add website if found
-							pluginsMessage.append(" (").append(desc.getWebsite()).append(")");
-
-						pluginsMessage.append(" ");
-					}
-					logEx(pluginsMessage.toString());
-				}
+			logEx("An unexpected error occurred with Skript. This issue is likely not your fault.");
+			logExAddonInfo(issuesUrl, stackPlugins);
+		}
+	}
+
+	private static String getSupportedPlatforms() {
+		return Arrays.stream(ServerPlatform.values())
+			.filter(platform -> platform.supported)
+			.map(ServerPlatform::name)
+			.collect(Collectors.joining(", "));
+	}
 
-				logEx("You should try disabling those plugins one by one, trying to find which one causes it.");
-				logEx("If the error doesn't disappear even after disabling all listed plugins, it is probably Skript issue.");
-				logEx("In that case, you will be given instruction on how should you report it.");
-				logEx("On the other hand, if the error disappears when disabling some plugin, report it to author of that plugin.");
-				logEx("Only if the author tells you to do so, report it to Skript's issue tracker.");
+	private static void logExAddonInfo(String issuesUrl, Set<PluginDescriptionFile> stackPlugins) {
+		if (pluginPackages.isEmpty()) {
+			logEx("Report the issue: " + issuesUrl);
+		} else {
+			logEx("You are using some plugins that alter how Skript works (addons).");
+			if (stackPlugins.isEmpty()) {
+				logEx("Full list of addons:");
+				pluginPackages.values().forEach(desc -> logEx(getPluginDescription(desc)));
+				logEx("We could not identify related addons, it might also be a Skript issue.");
+			} else {
+				logEx("The following plugins are likely related to this error:");
+				stackPlugins.forEach(desc -> logEx(getPluginDescription(desc)));
 			}
+			logEx("Try temporarily removing the listed plugins one by one to identify the cause.");
+			logEx("If removing a plugin resolves the issue, please report the problem to the plugin developer.");
 		}
+	}
 
-		logEx();
-		logEx("Stack trace:");
+	private static String getPluginDescription(PluginDescriptionFile desc) {
+		String website = desc.getWebsite();
+		return desc.getFullName() + (website != null && !website.isEmpty() ? " (" + website + ")" : "");
+	}
+
+	private static void logStackTrace(@Nullable Throwable cause) {
 		if (cause == null || cause.getStackTrace().length == 0) {
-			logEx("  warning: no/empty exception given, dumping current stack trace instead");
-			cause = new Exception(cause);
+			logEx("Warning: no/empty exception given, dumping current stack trace instead");
+			cause = new Exception("EmptyStacktraceException cause");
 		}
-		boolean first = true;
 		while (cause != null) {
-			logEx((first ? "" : "Caused by: ") + cause.toString());
-			for (final StackTraceElement e : cause.getStackTrace())
-				logEx("    at " + e.toString());
+			logEx((cause == null ? "" : "Caused by: ") + cause.toString());
+			for (StackTraceElement element : cause.getStackTrace()) {
+				logEx("    at " + element.toString());
+			}
 			cause = cause.getCause();
-			first = false;
 		}
+	}
 
-		logEx();
-		logEx("Version Information:");
+	private static void logVersionInfo() {
+		SkriptUpdater updater = Skript.getInstance().getUpdater();
 		if (updater != null) {
 			ReleaseStatus status = updater.getReleaseStatus();
-			logEx("  Skript: " + getVersion() + (status == ReleaseStatus.LATEST ? " (latest)"
-					: status == ReleaseStatus.OUTDATED ? " (OUTDATED)"
-					: status == ReleaseStatus.CUSTOM ? " (custom version)" : ""));
+			logEx("Skript: " + getVersion() + " (" + status.toString() + ")");
 			ReleaseManifest current = updater.getCurrentRelease();
 			logEx("    Flavor: " + current.flavor);
 			logEx("    Date: " + current.date);
 		} else {
-			logEx("  Skript: " + getVersion() + " (unknown; likely custom)");
+			logEx("Skript: " + getVersion() + " (unknown; likely custom)");
 		}
-		logEx("  Bukkit: " + Bukkit.getBukkitVersion());
-		logEx("  Minecraft: " + getMinecraftVersion());
-		logEx("  Java: " + System.getProperty("java.version") + " (" + System.getProperty("java.vm.name") + " " + System.getProperty("java.vm.version") + ")");
-		logEx("  OS: " + System.getProperty("os.name") + " " + System.getProperty("os.arch") + " " + System.getProperty("os.version"));
+		logEx("Bukkit: " + Bukkit.getBukkitVersion());
+		logEx("Minecraft: " + getMinecraftVersion());
+		logEx("Java: " + System.getProperty("java.version") + " (" + System.getProperty("java.vm.name") + " " + System.getProperty("java.vm.version") + ")");
+		logEx("OS: " + System.getProperty("os.name") + " " + System.getProperty("os.arch") + " " + System.getProperty("os.version"));
 		logEx();
 		logEx("Server platform: " + serverPlatform.name + (serverPlatform.supported ? "" : " (unsupported)"));
-		logEx();
+	}
+
+	private static void logCurrentState(@Nullable Thread thread, @Nullable TriggerItem item) {
 		logEx("Current node: " + SkriptLogger.getNode());
 		logEx("Current item: " + (item == null ? "null" : item.toString(null, true)));
 		if (item != null && item.getTrigger() != null) {
@@ -1806,16 +2020,9 @@ public static EmptyStacktraceException exception(@Nullable Throwable cause, fina
 			Script script = trigger.getScript();
 			logEx("Current trigger: " + trigger.toString(null, true) + " (" + (script == null ? "null" : script.getConfig().getFileName()) + ", line " + trigger.getLineNumber() + ")");
 		}
-		logEx();
 		logEx("Thread: " + (thread == null ? Thread.currentThread() : thread).getName());
-		logEx();
 		logEx("Language: " + Language.getName());
 		logEx("Link parse mode: " + ChatMessages.linkParseMode);
-		logEx();
-		logEx("End of Error.");
-		logEx();
-
-		return new EmptyStacktraceException();
 	}
 
 	static void logEx() {
diff --git a/src/main/java/ch/njol/skript/SkriptAPIException.java b/src/main/java/ch/njol/skript/SkriptAPIException.java
index a9cf43afc1c..25230f55fb6 100644
--- a/src/main/java/ch/njol/skript/SkriptAPIException.java
+++ b/src/main/java/ch/njol/skript/SkriptAPIException.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript;
 
 /**
diff --git a/src/main/java/ch/njol/skript/SkriptAddon.java b/src/main/java/ch/njol/skript/SkriptAddon.java
index 3a1cf894d35..af381ff3049 100644
--- a/src/main/java/ch/njol/skript/SkriptAddon.java
+++ b/src/main/java/ch/njol/skript/SkriptAddon.java
@@ -1,68 +1,61 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript;
 
 import java.io.File;
 import java.io.IOException;
+import java.util.function.Supplier;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import org.bukkit.Bukkit;
+import org.bukkit.plugin.Plugin;
 import org.bukkit.plugin.java.JavaPlugin;
 import org.jetbrains.annotations.Nullable;
 
-import ch.njol.skript.localization.Language;
 import ch.njol.skript.util.Utils;
 import ch.njol.skript.util.Version;
+import org.jetbrains.annotations.ApiStatus;
+import org.skriptlang.skript.localization.Localizer;
+import org.skriptlang.skript.registration.SyntaxRegistry;
+import org.skriptlang.skript.util.Registry;
 
 /**
  * Utility class for Skript addons. Use {@link Skript#registerAddon(JavaPlugin)} to create a SkriptAddon instance for your plugin.
  */
-public final class SkriptAddon {
+public final class SkriptAddon implements org.skriptlang.skript.addon.SkriptAddon {
 
 	public final JavaPlugin plugin;
 	public final Version version;
 	private final String name;
 
+	private final org.skriptlang.skript.addon.SkriptAddon addon;
+
 	/**
 	 * Package-private constructor. Use {@link Skript#registerAddon(JavaPlugin)} to get a SkriptAddon for your plugin.
-	 * 
-	 * @param p
 	 */
-	SkriptAddon(final JavaPlugin p) {
-		plugin = p;
-		name = "" + p.getName();
-		Version v;
+	SkriptAddon(JavaPlugin plugin) {
+		this(plugin, Skript.instance().registerAddon(plugin.getClass(), plugin.getName()));
+	}
+
+	SkriptAddon(JavaPlugin plugin, org.skriptlang.skript.addon.SkriptAddon addon) {
+		this.addon = addon;
+		this.plugin = plugin;
+		this.name = plugin.getName();
+		Version version;
 		try {
-			v = new Version("" + p.getDescription().getVersion());
-		} catch (final IllegalArgumentException e) {
-			final Matcher m = Pattern.compile("(\\d+)(?:\\.(\\d+)(?:\\.(\\d+))?)?").matcher(p.getDescription().getVersion());
+			version = new Version(plugin.getDescription().getVersion());
+		} catch (IllegalArgumentException e) {
+			final Matcher m = Pattern.compile("(\\d+)(?:\\.(\\d+)(?:\\.(\\d+))?)?").matcher(plugin.getDescription().getVersion());
 			if (!m.find())
-				throw new IllegalArgumentException("The version of the plugin " + p.getName() + " does not contain any numbers: " + p.getDescription().getVersion());
-			v = new Version(Utils.parseInt("" + m.group(1)), m.group(2) == null ? 0 : Utils.parseInt("" + m.group(2)), m.group(3) == null ? 0 : Utils.parseInt("" + m.group(3)));
-			Skript.warning("The plugin " + p.getName() + " uses a non-standard version syntax: '" + p.getDescription().getVersion() + "'. Skript will use " + v + " instead.");
+				throw new IllegalArgumentException("The version of the plugin " + name + " does not contain any numbers: " + plugin.getDescription().getVersion());
+			version = new Version(Utils.parseInt(m.group(1)), m.group(2) == null ? 0 : Utils.parseInt(m.group(2)), m.group(3) == null ? 0 : Utils.parseInt(m.group(3)));
+			Skript.warning("The plugin " + name + " uses a non-standard version syntax: '" + plugin.getDescription().getVersion() + "'. Skript will use " + version + " instead.");
 		}
-		version = v;
+		this.version = version;
 	}
 
 	@Override
 	public final String toString() {
-		return name;
+		return getName();
 	}
 
 	public String getName() {
@@ -83,9 +76,6 @@ public SkriptAddon loadClasses(String basePackage, String... subPackages) throws
 		return this;
 	}
 
-	@Nullable
-	private String languageFileDirectory = null;
-
 	/**
 	 * Makes Skript load language files from the specified directory, e.g. "lang" or "skript lang" if you have a lang folder yourself. Localised files will be read from the
 	 * plugin's jar and the plugin's data folder, but the default English file is only taken from the jar and <b>must</b> exist!
@@ -94,19 +84,13 @@ public SkriptAddon loadClasses(String basePackage, String... subPackages) throws
 	 * @return This SkriptAddon
 	 */
 	public SkriptAddon setLanguageFileDirectory(String directory) {
-		if (languageFileDirectory != null)
-			throw new IllegalStateException();
-		directory = "" + directory.replace('\\', '/');
-		if (directory.endsWith("/"))
-			directory = "" + directory.substring(0, directory.length() - 1);
-		languageFileDirectory = directory;
-		Language.loadDefault(this);
+		localizer().setSourceDirectories(directory, plugin.getDataFolder().getAbsolutePath() + directory);
 		return this;
 	}
 
 	@Nullable
 	public String getLanguageFileDirectory() {
-		return languageFileDirectory;
+		return localizer().languageFileDirectory();
 	}
 
 	@Nullable
@@ -126,4 +110,67 @@ public File getFile() {
 		return file;
 	}
 
+	//
+	// Modern SkriptAddon Compatibility
+	//
+
+	@ApiStatus.Experimental
+	static SkriptAddon fromModern(org.skriptlang.skript.addon.SkriptAddon addon) {
+		return new SkriptAddon(JavaPlugin.getProvidingPlugin(addon.source()), addon);
+	}
+
+	@Override
+	@ApiStatus.Experimental
+	public Class<?> source() {
+		return addon.source();
+	}
+
+	@Override
+	@ApiStatus.Experimental
+	public String name() {
+		return addon.name();
+	}
+
+	@Override
+	@ApiStatus.Experimental
+	public <R extends Registry<?>> void storeRegistry(Class<R> registryClass, R registry) {
+		addon.storeRegistry(registryClass, registry);
+	}
+
+	@Override
+	@ApiStatus.Experimental
+	public void removeRegistry(Class<? extends Registry<?>> registryClass) {
+		addon.removeRegistry(registryClass);
+	}
+
+	@Override
+	@ApiStatus.Experimental
+	public boolean hasRegistry(Class<? extends Registry<?>> registryClass) {
+		return addon.hasRegistry(registryClass);
+	}
+
+	@Override
+	@ApiStatus.Experimental
+	public <R extends Registry<?>> R registry(Class<R> registryClass) {
+		return addon.registry(registryClass);
+	}
+
+	@Override
+	@ApiStatus.Experimental
+	public <R extends Registry<?>> R registry(Class<R> registryClass, Supplier<R> putIfAbsent) {
+		return addon.registry(registryClass, putIfAbsent);
+	}
+
+	@Override
+	@ApiStatus.Experimental
+	public SyntaxRegistry syntaxRegistry() {
+		return addon.syntaxRegistry();
+	}
+
+	@Override
+	@ApiStatus.Experimental
+	public Localizer localizer() {
+		return addon.localizer();
+	}
+
 }
diff --git a/src/main/java/ch/njol/skript/SkriptCommand.java b/src/main/java/ch/njol/skript/SkriptCommand.java
index 447c589ead6..e59cff1111c 100644
--- a/src/main/java/ch/njol/skript/SkriptCommand.java
+++ b/src/main/java/ch/njol/skript/SkriptCommand.java
@@ -1,40 +1,28 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript;
 
 import ch.njol.skript.aliases.Aliases;
 import ch.njol.skript.command.CommandHelp;
 import ch.njol.skript.doc.Documentation;
 import ch.njol.skript.doc.HTMLGenerator;
+import ch.njol.skript.doc.JSONGenerator;
 import ch.njol.skript.localization.ArgsMessage;
 import ch.njol.skript.localization.Language;
 import ch.njol.skript.localization.PluralizingArgsMessage;
+import ch.njol.skript.log.LogEntry;
 import ch.njol.skript.log.RedirectingLogHandler;
+import ch.njol.skript.log.TestingLogHandler;
 import ch.njol.skript.log.TimingLogHandler;
 import ch.njol.skript.test.runner.SkriptTestEvent;
 import ch.njol.skript.test.runner.TestMode;
 import ch.njol.skript.test.runner.TestTracker;
+import ch.njol.skript.test.utils.TestResults;
 import ch.njol.skript.util.ExceptionUtils;
 import ch.njol.skript.util.FileUtils;
 import ch.njol.skript.util.SkriptColor;
+import ch.njol.skript.util.Utils;
 import ch.njol.util.OpenCloseable;
 import ch.njol.util.StringUtils;
+import com.google.gson.GsonBuilder;
 import org.bukkit.Bukkit;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
@@ -47,39 +35,39 @@
 import java.io.File;
 import java.io.FileFilter;
 import java.io.IOException;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
+import java.nio.file.Files;
+import java.util.*;
+import java.util.logging.Level;
 import java.util.stream.Collectors;
 
+
 public class SkriptCommand implements CommandExecutor {
-	
+
 	private static final String CONFIG_NODE = "skript command";
 	private static final ArgsMessage m_reloading = new ArgsMessage(CONFIG_NODE + ".reload.reloading");
 
-	// TODO /skript scripts show/list - lists all enabled and/or disabled scripts in the scripts folder and/or subfolders (maybe add a pattern [using * and **])
 	// TODO document this command on the website
 	private static final CommandHelp SKRIPT_COMMAND_HELP = new CommandHelp("<gray>/<gold>skript", SkriptColor.LIGHT_CYAN, CONFIG_NODE + ".help")
-		.add(new CommandHelp("reload", SkriptColor.DARK_CYAN)
-			.add("all")
-			.add("config")
-			.add("aliases")
-			.add("scripts")
-			.add("<script>")
-		).add(new CommandHelp("enable", SkriptColor.DARK_CYAN)
-			.add("all")
-			.add("<script>")
-		).add(new CommandHelp("disable", SkriptColor.DARK_CYAN)
-			.add("all")
-			.add("<script>")
-		).add(new CommandHelp("update", SkriptColor.DARK_CYAN)
-			.add("check")
-			.add("changes")
-			.add("download")
-		).add("info"
-		).add("help");
+			.add(new CommandHelp("reload", SkriptColor.DARK_RED)
+				.add("all")
+				.add("config")
+				.add("aliases")
+				.add("scripts")
+				.add("<script>")
+			).add(new CommandHelp("enable", SkriptColor.DARK_RED)
+				.add("all")
+				.add("<script>")
+			).add(new CommandHelp("disable", SkriptColor.DARK_RED)
+				.add("all")
+				.add("<script>")
+			).add(new CommandHelp("update", SkriptColor.DARK_RED)
+				.add("check")
+				.add("changes")
+			)
+			.add("list")
+			.add("show")
+			.add("info")
+			.add("help");
 
 	static {
 		// Add command to generate documentation
@@ -90,30 +78,39 @@ public class SkriptCommand implements CommandExecutor {
 		if (TestMode.DEV_MODE)
 			SKRIPT_COMMAND_HELP.add("test");
 	}
-	
-	private static void reloading(CommandSender sender, String what, Object... args) {
+
+	private static void reloading(CommandSender sender, String what, RedirectingLogHandler logHandler, Object... args) {
 		what = args.length == 0 ? Language.get(CONFIG_NODE + ".reload." + what) : Language.format(CONFIG_NODE + ".reload." + what, args);
-		Skript.info(sender, StringUtils.fixCapitalization(m_reloading.toString(what)));
+		String message = StringUtils.fixCapitalization(m_reloading.toString(what));
+		Skript.info(sender, message);
+
+		// Log reloading message
+		String text = Language.format(CONFIG_NODE + ".reload." + "player reload", sender.getName(), what);
+		logHandler.log(new LogEntry(Level.INFO, Utils.replaceEnglishChatStyles(text)), sender);
 	}
-	
+
 	private static final ArgsMessage m_reloaded = new ArgsMessage(CONFIG_NODE + ".reload.reloaded");
 	private static final ArgsMessage m_reload_error = new ArgsMessage(CONFIG_NODE + ".reload.error");
-	
-	private static void reloaded(CommandSender sender, RedirectingLogHandler r, TimingLogHandler timingLogHandler, String what, Object... args) {
-		what = args.length == 0 ? Language.get(CONFIG_NODE + ".reload." + what) : PluralizingArgsMessage.format(Language.format(CONFIG_NODE + ".reload." + what, args));
-		String timeTaken  = String.valueOf(timingLogHandler.getTimeTaken());
 
-		if (r.numErrors() == 0)
-			Skript.info(sender, StringUtils.fixCapitalization(PluralizingArgsMessage.format(m_reloaded.toString(what, timeTaken))));
-		else
-			Skript.error(sender, StringUtils.fixCapitalization(PluralizingArgsMessage.format(m_reload_error.toString(what, r.numErrors(), timeTaken))));
+	private static void reloaded(CommandSender sender, RedirectingLogHandler logHandler, TimingLogHandler timingLogHandler, String what, Object... args) {
+		what = args.length == 0 ? Language.get(CONFIG_NODE + ".reload." + what) : PluralizingArgsMessage.format(Language.format(CONFIG_NODE + ".reload." + what, args));
+		String timeTaken = String.valueOf(timingLogHandler.getTimeTaken());
+
+		String message;
+		if (logHandler.numErrors() == 0) {
+			message = StringUtils.fixCapitalization(PluralizingArgsMessage.format(m_reloaded.toString(what, timeTaken)));
+			logHandler.log(new LogEntry(Level.INFO, Utils.replaceEnglishChatStyles(message)));
+		} else {
+			message = StringUtils.fixCapitalization(PluralizingArgsMessage.format(m_reload_error.toString(what, logHandler.numErrors(), timeTaken)));
+			logHandler.log(new LogEntry(Level.SEVERE, Utils.replaceEnglishChatStyles(message)));
+		}
 	}
-	
+
 	private static void info(CommandSender sender, String what, Object... args) {
 		what = args.length == 0 ? Language.get(CONFIG_NODE + "." + what) : PluralizingArgsMessage.format(Language.format(CONFIG_NODE + "." + what, args));
 		Skript.info(sender, StringUtils.fixCapitalization(what));
 	}
-	
+
 	private static void error(CommandSender sender, String what, Object... args) {
 		what = args.length == 0 ? Language.get(CONFIG_NODE + "." + what) : PluralizingArgsMessage.format(Language.format(CONFIG_NODE + "." + what, args));
 		Skript.error(sender, StringUtils.fixCapitalization(what));
@@ -124,30 +121,37 @@ public boolean onCommand(CommandSender sender, Command command, String label, St
 		if (!SKRIPT_COMMAND_HELP.test(sender, args))
 			return true;
 
+		Set<CommandSender> recipients = new HashSet<>();
+		recipients.add(sender);
+
+		if (args[0].equalsIgnoreCase("reload")) {
+			recipients.addAll(Bukkit.getOnlinePlayers().stream()
+				.filter(player -> player.hasPermission("skript.reloadnotify"))
+				.collect(Collectors.toSet()));
+		}
+
 		try (
-			RedirectingLogHandler logHandler = new RedirectingLogHandler(sender, "").start();
+			RedirectingLogHandler logHandler = new RedirectingLogHandler(recipients, "").start();
 			TimingLogHandler timingLogHandler = new TimingLogHandler().start()
 		) {
 
 			if (args[0].equalsIgnoreCase("reload")) {
 
 				if (args[1].equalsIgnoreCase("all")) {
-					reloading(sender, "config, aliases and scripts");
+					reloading(sender, "config, aliases and scripts", logHandler);
 					SkriptConfig.load();
 					Aliases.clear();
-					Aliases.load();
-
-					ScriptLoader.unloadScripts(ScriptLoader.getLoadedScripts());
-					ScriptLoader.loadScripts(Skript.getInstance().getScriptsFolder(), OpenCloseable.combine(logHandler, timingLogHandler))
-						.thenAccept(info -> {
-							if (info.files == 0)
-								Skript.warning(Skript.m_no_scripts.toString());
-							reloaded(sender, logHandler, timingLogHandler, "config, aliases and scripts");
-						});
-				}
-
-				else if (args[1].equalsIgnoreCase("scripts")) {
-					reloading(sender, "scripts");
+					Aliases.loadAsync().thenRun(() -> {
+						ScriptLoader.unloadScripts(ScriptLoader.getLoadedScripts());
+						ScriptLoader.loadScripts(Skript.getInstance().getScriptsFolder(), OpenCloseable.combine(logHandler, timingLogHandler))
+							.thenAccept(info -> {
+								if (info.files == 0)
+									Skript.warning(Skript.m_no_scripts.toString());
+								reloaded(sender, logHandler, timingLogHandler, "config, aliases and scripts");
+							});
+					});
+				} else if (args[1].equalsIgnoreCase("scripts")) {
+					reloading(sender, "scripts", logHandler);
 
 					ScriptLoader.unloadScripts(ScriptLoader.getLoadedScripts());
 					ScriptLoader.loadScripts(Skript.getInstance().getScriptsFolder(), OpenCloseable.combine(logHandler, timingLogHandler))
@@ -156,22 +160,15 @@ else if (args[1].equalsIgnoreCase("scripts")) {
 								Skript.warning(Skript.m_no_scripts.toString());
 							reloaded(sender, logHandler, timingLogHandler, "scripts");
 						});
-				}
-
-				else if (args[1].equalsIgnoreCase("config")) {
-					reloading(sender, "main config");
+				} else if (args[1].equalsIgnoreCase("config")) {
+					reloading(sender, "main config", logHandler);
 					SkriptConfig.load();
 					reloaded(sender, logHandler, timingLogHandler, "main config");
-				}
-
-				else if (args[1].equalsIgnoreCase("aliases")) {
-					reloading(sender, "aliases");
+				} else if (args[1].equalsIgnoreCase("aliases")) {
+					reloading(sender, "aliases", logHandler);
 					Aliases.clear();
-					Aliases.load();
-					reloaded(sender, logHandler, timingLogHandler, "aliases");
-				}
-
-				else { // Reloading an individual Script or folder
+					Aliases.loadAsync().thenRun(() -> reloaded(sender, logHandler, timingLogHandler, "aliases"));
+				} else { // Reloading an individual Script or folder
 					File scriptFile = getScriptFromArgs(sender, args);
 					if (scriptFile == null)
 						return true;
@@ -182,7 +179,7 @@ else if (args[1].equalsIgnoreCase("aliases")) {
 							return true;
 						}
 
-						reloading(sender, "script", scriptFile.getName());
+						reloading(sender, "script", logHandler, scriptFile.getName());
 
 						Script script = ScriptLoader.getScript(scriptFile);
 						if (script != null)
@@ -193,7 +190,7 @@ else if (args[1].equalsIgnoreCase("aliases")) {
 							);
 					} else {
 						final String fileName = scriptFile.getName();
-						reloading(sender, "scripts in folder", fileName);
+						reloading(sender, "scripts in folder", logHandler, fileName);
 						ScriptLoader.unloadScripts(ScriptLoader.getScripts(scriptFile));
 						ScriptLoader.loadScripts(scriptFile, OpenCloseable.combine(logHandler, timingLogHandler))
 							.thenAccept(scriptInfo -> {
@@ -210,9 +207,7 @@ else if (args[1].equalsIgnoreCase("aliases")) {
 					}
 				}
 
-			}
-
-			else if (args[0].equalsIgnoreCase("enable")) {
+			} else if (args[0].equalsIgnoreCase("enable")) {
 
 				if (args[1].equalsIgnoreCase("all")) {
 					try {
@@ -228,9 +223,7 @@ else if (args[0].equalsIgnoreCase("enable")) {
 					} catch (IOException e) {
 						error(sender, "enable.all.io error", ExceptionUtils.toString(e));
 					}
-				}
-
-				else {
+				} else {
 					File scriptFile = getScriptFromArgs(sender, args);
 					if (scriptFile == null)
 						return true;
@@ -285,9 +278,7 @@ else if (args[0].equalsIgnoreCase("enable")) {
 					}
 				}
 
-			}
-
-			else if (args[0].equalsIgnoreCase("disable")) {
+			} else if (args[0].equalsIgnoreCase("disable")) {
 
 				if (args[1].equalsIgnoreCase("all")) {
 					ScriptLoader.unloadScripts(ScriptLoader.getLoadedScripts());
@@ -297,9 +288,7 @@ else if (args[0].equalsIgnoreCase("disable")) {
 					} catch (IOException e) {
 						error(sender, "disable.all.io error", ExceptionUtils.toString(e));
 					}
-				}
-
-				else {
+				} else {
 					File scriptFile = getScriptFromArgs(sender, args);
 					if (scriptFile == null) // TODO allow disabling deleted/renamed scripts
 						return true;
@@ -343,9 +332,7 @@ else if (args[0].equalsIgnoreCase("disable")) {
 					}
 				}
 
-			}
-
-			else if (args[0].equalsIgnoreCase("update")) {
+			} else if (args[0].equalsIgnoreCase("update")) {
 				SkriptUpdater updater = Skript.getInstance().getUpdater();
 				if (updater == null) { // Oh. That is bad
 					Skript.info(sender, "" + SkriptUpdater.m_internal_error);
@@ -355,12 +342,8 @@ else if (args[0].equalsIgnoreCase("update")) {
 					updater.updateCheck(sender);
 				} else if (args[1].equalsIgnoreCase("changes")) {
 					updater.changesCheck(sender);
-				} else if (args[1].equalsIgnoreCase("download")) {
-					updater.updateCheck(sender);
 				}
-			}
-
-			else if (args[0].equalsIgnoreCase("info")) {
+			} else if (args[0].equalsIgnoreCase("info")) {
 				info(sender, "info.aliases");
 				info(sender, "info.documentation");
 				info(sender, "info.tutorials");
@@ -397,9 +380,7 @@ else if (args[0].equalsIgnoreCase("info")) {
 				if (!dependenciesFound)
 					info(sender, "info.dependencies", "None");
 
-			}
-
-			else if (args[0].equalsIgnoreCase("gen-docs")) {
+			} else if (args[0].equalsIgnoreCase("gen-docs")) {
 				File templateDir = Documentation.getDocsTemplateDirectory();
 				if (!templateDir.exists()) {
 					Skript.error(sender, "Cannot generate docs! Documentation templates not found at '" + Documentation.getDocsTemplateDirectory().getPath() + "'");
@@ -408,13 +389,13 @@ else if (args[0].equalsIgnoreCase("gen-docs")) {
 				}
 				File outputDir = Documentation.getDocsOutputDirectory();
 				outputDir.mkdirs();
-				HTMLGenerator generator = new HTMLGenerator(templateDir, outputDir);
+				HTMLGenerator htmlGenerator = new HTMLGenerator(templateDir, outputDir);
+				JSONGenerator jsonGenerator = new JSONGenerator(templateDir, outputDir);
 				Skript.info(sender, "Generating docs...");
-				generator.generate(); // Try to generate docs... hopefully
+				htmlGenerator.generate(); // Try to generate docs... hopefully
+				jsonGenerator.generate();
 				Skript.info(sender, "Documentation generated!");
-			}
-
-			else if (args[0].equalsIgnoreCase("test") && TestMode.DEV_MODE) {
+			} else if (args[0].equalsIgnoreCase("test") && TestMode.DEV_MODE) {
 				File scriptFile;
 				if (args.length == 1) {
 					scriptFile = TestMode.lastTestFile;
@@ -423,18 +404,26 @@ else if (args[0].equalsIgnoreCase("test") && TestMode.DEV_MODE) {
 						return true;
 					}
 				} else {
-					scriptFile = TestMode.TEST_DIR.resolve(
-						Arrays.stream(args).skip(1).collect(Collectors.joining(" ")) + ".sk"
-					).toFile();
-					TestMode.lastTestFile = scriptFile;
+					if (args[1].equalsIgnoreCase("all")) {
+						scriptFile = TestMode.TEST_DIR.toFile();
+					} else {
+						scriptFile = getScriptFromArgs(sender, args, TestMode.TEST_DIR.toFile());
+						TestMode.lastTestFile = scriptFile;
+					}
 				}
 
-				if (!scriptFile.exists()) {
+				if (scriptFile == null || !scriptFile.exists()) {
 					Skript.error(sender, "Test script doesn't exist!");
 					return true;
 				}
 
-				ScriptLoader.loadScripts(scriptFile, logHandler)
+				// Close previous loggers before we create a new one
+				// This prevents closing logger errors
+				timingLogHandler.close();
+				logHandler.close();
+
+				TestingLogHandler errorCounter = new TestingLogHandler(Level.SEVERE).start();
+				ScriptLoader.loadScripts(scriptFile, errorCounter)
 					.thenAccept(scriptInfo ->
 						// Code should run on server thread
 						Bukkit.getScheduler().scheduleSyncDelayedTask(Skript.getInstance(), () -> {
@@ -442,15 +431,42 @@ else if (args[0].equalsIgnoreCase("test") && TestMode.DEV_MODE) {
 							ScriptLoader.unloadScripts(ScriptLoader.getLoadedScripts());
 
 							// Get results and show them
-							String[] lines = TestTracker.collectResults().createReport().split("\n");
+							TestResults testResults = TestTracker.collectResults();
+							String[] lines = testResults.createReport().split("\n");
 							for (String line : lines) {
 								Skript.info(sender, line);
 							}
+
+							// Log results to file
+							Skript.info(sender, "Collecting results to " + TestMode.RESULTS_FILE);
+							String results = new GsonBuilder()
+								.setPrettyPrinting() // Easier to read lines
+								.disableHtmlEscaping() // Fixes issue with "'" character in test strings going unicode
+								.create().toJson(testResults);
+							try {
+								Files.writeString(TestMode.RESULTS_FILE, results);
+							} catch (IOException e) {
+								Skript.exception(e, "Failed to write test results.");
+							}
 						})
 					);
-			}
-
-			else if (args[0].equalsIgnoreCase("help")) {
+			} else if (args[0].equalsIgnoreCase("list") || args[0].equalsIgnoreCase("show")) {
+				info(sender, "list.enabled.header");
+				ScriptLoader.getLoadedScripts().stream()
+						.map(script -> script.getConfig().getFileName())
+						.forEach(name -> info(sender, "list.enabled.element", name));
+				info(sender, "list.disabled.header");
+				ScriptLoader.getDisabledScripts().stream()
+						.flatMap(file -> {
+							if (file.isDirectory()) {
+								return getSubFiles(file).stream();
+							}
+							return Arrays.stream(new File[]{file});
+						})
+						.map(File::getPath)
+						.map(path -> path.substring(Skript.getInstance().getScriptsFolder().getPath().length() + 1))
+						.forEach(path -> info(sender, "list.disabled.element", path));
+			} else if (args[0].equalsIgnoreCase("help")) {
 				SKRIPT_COMMAND_HELP.showHelp(sender);
 			}
 
@@ -461,14 +477,31 @@ else if (args[0].equalsIgnoreCase("help")) {
 
 		return true;
 	}
-	
+
 	private static final ArgsMessage m_invalid_script = new ArgsMessage(CONFIG_NODE + ".invalid script");
 	private static final ArgsMessage m_invalid_folder = new ArgsMessage(CONFIG_NODE + ".invalid folder");
-	
-	@Nullable
-	private static File getScriptFromArgs(CommandSender sender, String[] args) {
+
+	private static List<File> getSubFiles(File file) {
+		List<File> files = new ArrayList<>();
+		if (file.isDirectory()) {
+			for (File listFile : file.listFiles(f -> !f.isHidden())) {
+				if (listFile.isDirectory()) {
+					files.addAll(getSubFiles(listFile));
+				} else if (listFile.getName().endsWith(".sk")) {
+					files.add(listFile);
+				}
+			}
+		}
+		return files;
+	}
+
+	private static @Nullable File getScriptFromArgs(CommandSender sender, String[] args) {
+		return getScriptFromArgs(sender, args, Skript.getInstance().getScriptsFolder());
+	}
+
+	private static @Nullable File getScriptFromArgs(CommandSender sender, String[] args, File directoryFile) {
 		String script = StringUtils.join(args, " ", 1, args.length);
-		File f = getScriptFromName(script);
+		File f = ScriptLoader.getScriptFromName(script, directoryFile);
 		if (f == null) {
 			// Always allow '/' and '\' regardless of OS
 			boolean directory = script.endsWith("/") || script.endsWith("\\") || script.endsWith(File.separator);
@@ -477,33 +510,14 @@ private static File getScriptFromArgs(CommandSender sender, String[] args) {
 		}
 		return f;
 	}
-	
+
+	/**
+	 * Moved to {@link ScriptLoader#getScriptFromName(String)}
+	 */
 	@Nullable
+	@Deprecated(forRemoval = true)
 	public static File getScriptFromName(String script) {
-		if (script.endsWith("/") || script.endsWith("\\")) { // Always allow '/' and '\' regardless of OS
-			script = script.replace('/', File.separatorChar).replace('\\', File.separatorChar);
-		} else if (!StringUtils.endsWithIgnoreCase(script, ".sk")) {
-			int dot = script.lastIndexOf('.');
-			if (dot > 0 && !script.substring(dot + 1).equals(""))
-				return null;
-			script = script + ".sk";
-		}
-
-		if (script.startsWith(ScriptLoader.DISABLED_SCRIPT_PREFIX))
-			script = script.substring(ScriptLoader.DISABLED_SCRIPT_PREFIX_LENGTH);
-
-		File scriptFile = new File(Skript.getInstance().getScriptsFolder(), script);
-		if (!scriptFile.exists()) {
-			scriptFile = new File(scriptFile.getParentFile(), ScriptLoader.DISABLED_SCRIPT_PREFIX + scriptFile.getName());
-			if (!scriptFile.exists()) {
-				return null;
-			}
-		}
-		try {
-			return scriptFile.getCanonicalFile();
-		} catch (IOException e) {
-			throw Skript.exception(e, "An exception occurred while trying to get the script file from the string '" + script + "'");
-		}
+		return ScriptLoader.getScriptFromName(script);
 	}
 
 	private static File toggleFile(File file, boolean enable) throws IOException {
@@ -519,7 +533,7 @@ private static File toggleFile(File file, boolean enable) throws IOException {
 			false
 		);
 	}
-	
+
 	private static Set<File> toggleFiles(File folder, boolean enable) throws IOException {
 		FileFilter filter = enable ? ScriptLoader.getDisabledScriptsFilter() : ScriptLoader.getLoadedScriptsFilter();
 
@@ -541,5 +555,5 @@ private static Set<File> toggleFiles(File folder, boolean enable) throws IOExcep
 
 		return changed;
 	}
-	
+
 }
diff --git a/src/main/java/ch/njol/skript/SkriptCommandTabCompleter.java b/src/main/java/ch/njol/skript/SkriptCommandTabCompleter.java
index 4cd9c445173..c73da8e9f02 100644
--- a/src/main/java/ch/njol/skript/SkriptCommandTabCompleter.java
+++ b/src/main/java/ch/njol/skript/SkriptCommandTabCompleter.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript;
 
 import ch.njol.skript.doc.Documentation;
@@ -46,9 +28,9 @@ public List<String> onTabComplete(CommandSender sender, Command command, String
 		if (args[0].equalsIgnoreCase("update") && args.length == 2) {
 			options.add("check");
 			options.add("changes");
-			options.add("download");
-		} else if (args[0].matches("(?i)(reload|disable|enable)") && args.length >= 2) {
-			File scripts = Skript.getInstance().getScriptsFolder();
+		} else if (args[0].matches("(?i)(reload|disable|enable|test)") && args.length >= 2) {
+			boolean useTestDirectory = args[0].equalsIgnoreCase("test") && TestMode.DEV_MODE;
+			File scripts = useTestDirectory ? TestMode.TEST_DIR.toFile() : Skript.getInstance().getScriptsFolder();
 			String scriptsPathString = scripts.toPath().toString();
 			int scriptsPathLength = scriptsPathString.length();
 
@@ -116,6 +98,8 @@ public List<String> onTabComplete(CommandSender sender, Command command, String
 			options.add("enable");
 			options.add("disable");
 			options.add("update");
+			options.add("list");
+			options.add("show");
 			options.add("info");
 			if (Documentation.getDocsTemplateDirectory().exists())
 				options.add("gen-docs");
diff --git a/src/main/java/ch/njol/skript/SkriptConfig.java b/src/main/java/ch/njol/skript/SkriptConfig.java
index 436331d1fc6..279c6242485 100644
--- a/src/main/java/ch/njol/skript/SkriptConfig.java
+++ b/src/main/java/ch/njol/skript/SkriptConfig.java
@@ -4,7 +4,6 @@
 import ch.njol.skript.config.EnumParser;
 import ch.njol.skript.config.Option;
 import ch.njol.skript.config.OptionSection;
-import ch.njol.skript.config.SectionNode;
 import ch.njol.skript.hooks.Hook;
 import ch.njol.skript.hooks.VaultHook;
 import ch.njol.skript.hooks.regions.GriefPreventionHook;
@@ -26,6 +25,7 @@
 import co.aikar.timings.Timings;
 import org.bukkit.event.EventPriority;
 import org.jetbrains.annotations.Nullable;
+import org.skriptlang.skript.util.event.EventRegistry;
 
 import java.io.File;
 import java.io.IOException;
@@ -40,19 +40,50 @@
 
 /**
  * Important: don't save values from the config, a '/skript reload config/configs/all' won't work correctly otherwise!
- * 
+ *
  * @author Peter Güttinger
  */
 @SuppressWarnings("unused")
 public class SkriptConfig {
 
+	//<editor-fold desc="SkriptConfig events">
+	/**
+	 * Used for listening to events involving Skript's configuration.
+	 * @see #eventRegistry()
+	 */
+	public interface Event extends org.skriptlang.skript.util.event.Event { }
+
+	/**
+	 * Called when Skript's configuration is successfully reloaded.
+	 * This occurs when the reload process has finished, meaning the config is safe to reference.
+	 */
+	@FunctionalInterface
+	public interface ReloadEvent extends Event {
+
+		/**
+		 * The method that is called when this event triggers.
+		 */
+		void onReload();
+
+	}
+
+	private static final EventRegistry<Event> eventRegistry = new EventRegistry<>();
+
+	/**
+	 * @return An event registry for the configuration's events.
+	 */
+	public static EventRegistry<Event> eventRegistry() {
+		return eventRegistry;
+	}
+	//</editor-fold>
+
 	@Nullable
 	static Config mainConfig;
 	static Collection<Config> configs = new ArrayList<>();
-	
+
 	static final Option<String> version = new Option<>("version", Skript.getVersion().toString())
 			.optional(true);
-	
+
 	public static final Option<String> language = new Option<>("language", "english")
 			.optional(true)
 			.setter(s -> {
@@ -60,7 +91,7 @@ public class SkriptConfig {
 					Skript.error("No language file found for '" + s + "'!");
 				}
 			});
-	
+
 	public static final Option<Boolean> checkForNewVersion = new Option<>("check for new version", false)
 			.setter(t -> {
 				SkriptUpdater updater = Skript.getInstance().getUpdater();
@@ -71,7 +102,7 @@ public class SkriptConfig {
 			.setter(t -> {
 				SkriptUpdater updater = Skript.getInstance().getUpdater();
 				if (updater != null)
-					updater.setCheckFrequency(t.getTicks());
+					updater.setCheckFrequency(t.getAs(Timespan.TimePeriod.TICK));
 			});
 	static final Option<Integer> updaterDownloadTries = new Option<>("updater download tries", 7)
 			.optional(true);
@@ -107,19 +138,14 @@ public class SkriptConfig {
 	public static final Option<String> effectCommandToken = new Option<>("effect command token", "!");
 	public static final Option<Boolean> allowOpsToUseEffectCommands = new Option<>("allow ops to use effect commands", false);
 
-	/*
-	 * @deprecated Will be removed in 2.8.0. Use {@link #logEffectCommands} instead.
-	 */
-	@Deprecated
-	public static final Option<Boolean> logPlayerCommands = new Option<>("log player commands", false).optional(true);
 	public static final Option<Boolean> logEffectCommands = new Option<>("log effect commands", false);
 
 	// everything handled by Variables
 	public static final OptionSection databases = new OptionSection("databases");
-	
+
 	public static final Option<Boolean> usePlayerUUIDsInVariableNames = new Option<>("use player UUIDs in variable names", false); // TODO change to true later (as well as in the default config)
 	public static final Option<Boolean> enablePlayerVariableFix = new Option<>("player variable fix", true);
-	
+
 	@SuppressWarnings("null")
 	private static final DateFormat shortDateFormat = DateFormat.getDateTimeInstance(DateFormat.SHORT, DateFormat.SHORT);
 	public static final Option<DateFormat> dateFormat = new Option<>("date format", shortDateFormat, s -> {
@@ -132,17 +158,17 @@ public class SkriptConfig {
 		}
 		return null;
 	});
-	
+
 	public static String formatDate(final long timestamp) {
 		final DateFormat f = dateFormat.value();
 		synchronized (f) {
 			return "" + f.format(timestamp);
 		}
 	}
-	
+
 	public static final Option<Verbosity> verbosity = new Option<>("verbosity", Verbosity.NORMAL, new EnumParser<>(Verbosity.class, "verbosity"))
 			.setter(SkriptLogger::setVerbosity);
-	
+
 	public static final Option<EventPriority> defaultEventPriority = new Option<>("plugin priority", EventPriority.NORMAL, s -> {
 		try {
 			return EventPriority.valueOf(s.toUpperCase(Locale.ENGLISH));
@@ -158,14 +184,14 @@ public static String formatDate(final long timestamp) {
 	public static final Option<Boolean> listenCancelledByDefault = new Option<>("listen to cancelled events by default", false)
 			.optional(true);
 
-	
+
 	/**
 	 * Maximum number of digits to display after the period for floats and doubles
 	 */
 	public static final Option<Integer> numberAccuracy = new Option<>("number accuracy", 2);
-	
+
 	public static final Option<Integer> maxTargetBlockDistance = new Option<>("maximum target block distance", 100);
-	
+
 	public static final Option<Boolean> caseSensitive = new Option<>("case sensitive", false);
 	public static final Option<Boolean> allowFunctionsBeforeDefs = new Option<>("allow function calls before definations", false)
 			.optional(true);
@@ -174,19 +200,21 @@ public static String formatDate(final long timestamp) {
 	public static final Option<Boolean> disableMissingAndOrWarnings = new Option<>("disable variable missing and/or warnings", false);
 	public static final Option<Boolean> disableVariableStartingWithExpressionWarnings =
 		new Option<>("disable starting a variable's name with an expression warnings", false);
-	
+	public static final Option<Boolean> disableUnreachableCodeWarnings = new Option<>("disable unreachable code warnings", false);
+
 	@Deprecated
 	public static final Option<Boolean> enableScriptCaching = new Option<>("enable script caching", false)
 			.optional(true);
-	
+
 	public static final Option<Boolean> keepConfigsLoaded = new Option<>("keep configs loaded", false)
 			.optional(true);
-	
+
 	public static final Option<Boolean> addonSafetyChecks = new Option<>("addon safety checks", false)
 			.optional(true);
-	
+
 	public static final Option<Boolean> apiSoftExceptions = new Option<>("soft api exceptions", false);
-	
+
+	@SuppressWarnings("removal")
 	public static final Option<Boolean> enableTimings = new Option<>("enable timings", false)
 			.setter(t -> {
 				if (!Skript.classExists("co.aikar.timings.Timings")) { // Check for Timings
@@ -206,7 +234,7 @@ public static String formatDate(final long timestamp) {
 					Skript.info("Timings support enabled!");
 				SkriptTimings.setEnabled(t); // Config option will be used
 			});
-	
+
 	public static final Option<String> parseLinks = new Option<>("parse links in chat messages", "disabled")
 			.setter(t -> {
 				try {
@@ -236,7 +264,7 @@ public static String formatDate(final long timestamp) {
 
 	public static final Option<Boolean> caseInsensitiveCommands = new Option<>("case-insensitive commands", false)
 		.optional(true);
-	
+
 	public static final Option<Boolean> colorResetCodes = new Option<>("color codes reset formatting", true)
 			.setter(t -> {
 				try {
@@ -249,7 +277,7 @@ public static String formatDate(final long timestamp) {
 	public static final Option<String> scriptLoaderThreadSize = new Option<>("script loader thread size", "0")
 			.setter(s -> {
 				int asyncLoaderSize;
-				
+
 				if (s.equalsIgnoreCase("processor count")) {
 					asyncLoaderSize = Runtime.getRuntime().availableProcessors();
 				} else {
@@ -260,17 +288,17 @@ public static String formatDate(final long timestamp) {
 						return;
 					}
 				}
-				
+
 				ScriptLoader.setAsyncLoaderSize(asyncLoaderSize);
 			})
 			.optional(true);
-	
+
 	public static final Option<Boolean> allowUnsafePlatforms = new Option<>("allow unsafe platforms", false)
 			.optional(true);
 
 	public static final Option<Boolean> keepLastUsageDates = new Option<>("keep command last usage dates", false)
 			.optional(true);
-	
+
 	public static final Option<Boolean> loadDefaultAliases = new Option<>("load default aliases", true)
 			.optional(true);
 
@@ -328,114 +356,93 @@ private static void userDisableHooks(Class<? extends Hook<?>> hookClass, boolean
 
 	public static final Option<Timespan> longParseTimeWarningThreshold = new Option<>("long parse time warning threshold", new Timespan(0));
 
+
+	public static final Option<Timespan> runtimeErrorFrameDuration = new Option<>("runtime errors.frame duration", new Timespan(Timespan.TimePeriod.SECOND, 1));
+
+	public static final Option<Integer> runtimeErrorLimitTotal = new Option<>("runtime errors.total errors per frame", 8);
+	public static final Option<Integer> runtimeWarningLimitTotal = new Option<>("runtime errors.total warnings per frame", 8);
+
+	public static final Option<Integer> runtimeErrorLimitLine = new Option<>("runtime errors.errors from one line per frame", 2);
+	public static final Option<Integer> runtimeWarningLimitLine = new Option<>("runtime errors.warnings from one line per frame", 2);
+
+	public static final Option<Integer> runtimeErrorLimitLineTimeout = new Option<>("runtime errors.error spam timeout limit", 4);
+	public static final Option<Integer> runtimeWarningLimitLineTimeout = new Option<>("runtime errors.warning spam timeout limit", 4);
+
+	public static final Option<Integer> runtimeErrorTimeoutDuration = new Option<>("runtime errors.error timeout length", 10);
+	public static final Option<Integer> runtimeWarningTimeoutDuration = new Option<>("runtime errors.warning timeout length", 10);
+
 	/**
 	 * This should only be used in special cases
 	 */
-	@Nullable
-	public static Config getConfig() {
+	public static @Nullable Config getConfig() {
 		return mainConfig;
 	}
-	
+
 	// also used for reloading
-	static boolean load() {
+	static void load() {
+		if (mainConfig != null)
+			mainConfig.invalidate(); // todo
 		try {
-			final File oldConfigFile = new File(Skript.getInstance().getDataFolder(), "config.cfg");
-			final File configFile = new File(Skript.getInstance().getDataFolder(), "config.sk");
-			if (oldConfigFile.exists()) {
-				if (!configFile.exists()) {
-					oldConfigFile.renameTo(configFile);
-					Skript.info("[1.3] Renamed your 'config.cfg' to 'config.sk' to match the new format");
-				} else {
-					Skript.error("Found both a new and an old config, ignoring the old one");
-				}
-			}
+			File configFile = new File(Skript.getInstance().getDataFolder(), "config.sk");
+
 			if (!configFile.exists()) {
 				Skript.error("Config file 'config.sk' does not exist!");
-				return false;
+				return;
 			}
 			if (!configFile.canRead()) {
 				Skript.error("Config file 'config.sk' cannot be read!");
-				return false;
+				return;
 			}
-			
-			Config mc;
+
+			Config mainConfig;
 			try {
-				mc = new Config(configFile, false, false, ":");
-			} catch (final IOException e) {
-				Skript.error("Could not load the main config: " + e.getLocalizedMessage());
-				return false;
+				mainConfig = new Config(configFile, false, false, ":");
+			} catch (IOException ex) {
+				Skript.exception(ex, "Could not load the main config");
+				return;
 			}
-			mainConfig = mc;
+			SkriptConfig.mainConfig = mainConfig;
 
-			String configVersion = mc.get(version.key);
+			String configVersion = mainConfig.getValue(version.key);
 			if (configVersion == null || Skript.getVersion().compareTo(new Version(configVersion)) != 0) {
-				try {
-					final InputStream in = Skript.getInstance().getResource("config.sk");
-					if (in == null) {
+				if (!mainConfig.getMainNode().isValid()) {
+					Skript.error("Your config is outdated, but cannot be updated because it contains errors.");
+					return;
+				}
+
+				try (InputStream stream = Skript.getInstance().getResource("config.sk")) {
+					if (stream == null) {
 						Skript.error("Your config is outdated, but Skript couldn't find the newest config in its jar.");
-						return false;
-					}
-					final Config newConfig = new Config(in, "Skript.jar/config.sk", false, false, ":");
-					in.close();
-					
-					boolean forceUpdate = false;
-					
-					if (mc.getMainNode().get("database") != null) { // old database layout
-						forceUpdate = true;
-						try {
-							final SectionNode oldDB = (SectionNode) mc.getMainNode().get("database");
-							assert oldDB != null;
-							final SectionNode newDBs = (SectionNode) newConfig.getMainNode().get(databases.key);
-							assert newDBs != null;
-							final SectionNode newDB = (SectionNode) newDBs.get("database 1");
-							assert newDB != null;
-							
-							newDB.setValues(oldDB);
-							
-							// '.db' was dynamically added before
-							final String file = newDB.getValue("file");
-							assert file != null;
-							if (!file.endsWith(".db"))
-								newDB.set("file", file + ".db");
-							
-							final SectionNode def = (SectionNode) newDBs.get("default");
-							assert def != null;
-							def.set("backup interval", "" + mc.get("variables backup interval"));
-						} catch (final Exception e) {
-							Skript.error("An error occurred while trying to update the config's database section.");
-							Skript.error("You'll have to update the config yourself:");
-							Skript.error("Open the new config.sk as well as the created backup, and move the 'database' section from the backup to the start of the 'databases' section");
-							Skript.error("of the new config (i.e. the line 'databases:' should be directly above 'database:'), and add a tab in front of every line that you just copied.");
-							return false;
-						}
+						return;
 					}
-					
-					if (newConfig.setValues(mc, version.key, databases.key) || forceUpdate) { // new config is different
-						final File bu = FileUtils.backup(configFile);
-						newConfig.getMainNode().set(version.key, Skript.getVersion().toString());
-						if (mc.getMainNode().get(databases.key) != null)
-							newConfig.getMainNode().set(databases.key, mc.getMainNode().get(databases.key));
-						mc = mainConfig = newConfig;
-						mc.save(configFile);
-						Skript.info("Your configuration has been updated to the latest version. A backup of your old config file has been created as " + bu.getName());
-					} else { // only the version changed
-						mc.getMainNode().set(version.key, Skript.getVersion().toString());
-						mc.save(configFile);
+					Config newConfig = new Config(stream, "Skript.jar/config.sk", false, false, ":");
+
+					File backup = FileUtils.backup(configFile);
+					boolean updated = mainConfig.updateNodes(newConfig);
+					mainConfig.getMainNode().set(version.key, Skript.getVersion().toString());
+					mainConfig.save(configFile);
+					SkriptConfig.mainConfig = mainConfig;
+
+					if (updated) {
+						Skript.info("Your configuration has been updated to the latest version. " +
+							"A backup of your old config file has been created as " + backup.getName());
+					} else {
+						Skript.info("Your configuration is outdated, but no changes were performed. " +
+							"A backup of your config file has been created as " + backup.getName());
 					}
-				} catch (final IOException e) {
-					Skript.error("Could not load the new config from the jar file: " + e.getLocalizedMessage());
+				} catch (IOException ex) {
+					Skript.exception(ex, "Could not update the main config");
+					return;
 				}
 			}
-			
-			mc.load(SkriptConfig.class);
-			
-//			if (!keepConfigsLoaded.value())
-//				mainConfig = null;
-		} catch (final RuntimeException e) {
-			Skript.exception(e, "An error occurred while loading the config");
-			return false;
+
+			mainConfig.load(SkriptConfig.class);
+		} catch (RuntimeException ex) {
+			Skript.exception(ex, "An error occurred while loading the config");
 		}
-		return true;
+
+		// trigger reload event handlers
+		eventRegistry().events(ReloadEvent.class).forEach(ReloadEvent::onReload);
 	}
 
 }
diff --git a/src/main/java/ch/njol/skript/SkriptEventHandler.java b/src/main/java/ch/njol/skript/SkriptEventHandler.java
index 7b9947e8486..00901afa9c2 100644
--- a/src/main/java/ch/njol/skript/SkriptEventHandler.java
+++ b/src/main/java/ch/njol/skript/SkriptEventHandler.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript;
 
 import ch.njol.skript.lang.SkriptEvent;
diff --git a/src/main/java/ch/njol/skript/SkriptUpdater.java b/src/main/java/ch/njol/skript/SkriptUpdater.java
index 51500f52c93..97c87ba2fd3 100644
--- a/src/main/java/ch/njol/skript/SkriptUpdater.java
+++ b/src/main/java/ch/njol/skript/SkriptUpdater.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript;
 
 import java.io.IOException;
diff --git a/src/main/java/ch/njol/skript/aliases/Aliases.java b/src/main/java/ch/njol/skript/aliases/Aliases.java
index 3e67971698a..c89775bae36 100644
--- a/src/main/java/ch/njol/skript/aliases/Aliases.java
+++ b/src/main/java/ch/njol/skript/aliases/Aliases.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.aliases;
 
 import ch.njol.skript.Skript;
@@ -25,45 +7,68 @@
 import ch.njol.skript.config.Node;
 import ch.njol.skript.config.SectionNode;
 import ch.njol.skript.entity.EntityData;
-import org.bukkit.entity.EntityType;
-import org.skriptlang.skript.lang.script.Script;
 import ch.njol.skript.lang.parser.ParserInstance;
-import ch.njol.skript.localization.ArgsMessage;
-import ch.njol.skript.localization.Language;
-import ch.njol.skript.localization.Message;
-import ch.njol.skript.localization.Noun;
-import ch.njol.skript.localization.RegexMessage;
+import ch.njol.skript.localization.*;
 import ch.njol.skript.log.BlockingLogHandler;
 import ch.njol.skript.util.EnchantmentType;
 import ch.njol.skript.util.Utils;
 import ch.njol.skript.util.Version;
+import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.Material;
 import org.bukkit.NamespacedKey;
 import org.jetbrains.annotations.Nullable;
+import org.skriptlang.skript.lang.script.Script;
 
 import java.io.IOException;
 import java.io.UncheckedIOException;
 import java.net.URI;
 import java.net.URISyntaxException;
-import java.nio.file.FileSystem;
-import java.nio.file.FileSystems;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
+import java.nio.file.*;
 import java.util.HashMap;
 import java.util.Locale;
 import java.util.Map;
+import java.util.concurrent.CompletableFuture;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 public abstract class Aliases {
-
 	static final boolean USING_ITEM_COMPONENTS = Skript.isRunningMinecraft(1, 20, 5);
 
 	private static final AliasesProvider provider = createProvider(10000, null);
 	private static final AliasesParser parser = createParser(provider);
-	
+	// this is not an alias!
+	private final static ItemType everything = new ItemType();
+	private final static Message m_empty_string = new Message("aliases.empty string");
+	private final static ArgsMessage m_invalid_item_type = new ArgsMessage("aliases.invalid item type");
+	private final static Message m_outside_section = new Message("aliases.outside section");
+	private final static RegexMessage p_any = new RegexMessage("aliases.any", "", " (.+)", Pattern.CASE_INSENSITIVE);
+	private final static RegexMessage p_every = new RegexMessage("aliases.every", "", " (.+)", Pattern.CASE_INSENSITIVE);
+	private final static RegexMessage p_of_every = new RegexMessage("aliases.of every", "(\\d+) ", " (.+)", Pattern.CASE_INSENSITIVE);
+	private final static RegexMessage p_of = new RegexMessage("aliases.of", "(\\d+) (?:", " )?(.+)", Pattern.CASE_INSENSITIVE);
+
+	/**
+	 * Go through these whenever aliases are reloaded, and update them.
+	 */
+	private static final Map<String, ItemType> trackedTypes = new HashMap<>();
+
+	/**
+	 * If user had an obscure config option set, don't crash due to missing
+	 * Java item types.
+	 */
+	private static final boolean noHardExceptions = SkriptConfig.apiSoftExceptions.value();
+	static String itemSingular = "item";
+	static String itemPlural = "items";
+	static String blockSingular = "block";
+	static String blockPlural = "blocks";
+
+	static {
+		everything.setAll(true);
+		ItemData all = new ItemData(Material.AIR);
+		all.isAnything = true;
+		everything.add(all);
+	}
+
 	@Nullable
 	private static ItemType getAlias_i(final String s) {
 		// Check script aliases first
@@ -71,10 +76,10 @@ private static ItemType getAlias_i(final String s) {
 		if (aliases != null) {
 			return aliases.provider.getAlias(s); // Delegates to global provider if needed
 		}
-			
+
 		return provider.getAlias(s);
 	}
-	
+
 	/**
 	 * Creates an aliases provider with Skript's default configuration.
 	 * @param expectedCount Expected alias count.
@@ -84,14 +89,14 @@ private static ItemType getAlias_i(final String s) {
 	private static AliasesProvider createProvider(int expectedCount, @Nullable AliasesProvider parent) {
 		return new AliasesProvider(expectedCount, parent);
 	}
-	
+
 	/**
 	 * Creates an aliases parser with Skript's default configuration.
 	 * @return Aliases parser.
 	 */
 	private static AliasesParser createParser(AliasesProvider provider) {
 		AliasesParser parser = new AliasesParser(provider);
-		
+
 		// Register standard conditions
 		parser.registerCondition("minecraft version", (str) -> {
 			int orNewer = str.indexOf("or newer"); // For example: 1.12 or newer
@@ -100,14 +105,14 @@ private static AliasesParser createParser(AliasesProvider provider) {
 				Version ver = new Version(str.substring(0, orNewer - 1));
 				return Skript.getMinecraftVersion().compareTo(ver) >= 0;
 			}
-			
+
 			int orOlder = str.indexOf("or older"); // For example: 1.11 or older
 			if (orOlder != -1) {
 				@SuppressWarnings("null")
 				Version ver = new Version(str.substring(0, orOlder - 1));
 				return Skript.getMinecraftVersion().compareTo(ver) <= 0;
 			}
-			
+
 			int to = str.indexOf("to"); // For example: 1.11 to 1.12
 			if (to != -1) {
 				@SuppressWarnings("null")
@@ -117,39 +122,17 @@ private static AliasesParser createParser(AliasesProvider provider) {
 				Version current = Skript.getMinecraftVersion();
 				return current.compareTo(first) >= 0 && current.compareTo(second) <= 0;
 			}
-			
+
 			return Skript.getMinecraftVersion().equals(new Version(str));
 		});
-		
+
 		return parser;
 	}
 
-	static String itemSingular = "item";
-	static String itemPlural = "items";
-	@Nullable
-	static String itemGender = null;
-	static String blockSingular = "block";
-	static String blockPlural = "blocks";
-	@Nullable
-	static String blockGender = null;
-	
-	// this is not an alias!
-	private final static ItemType everything = new ItemType();
-	static {
-		everything.setAll(true);
-		ItemData all = new ItemData(Material.AIR);
-		all.isAnything = true;
-		everything.add(all);
-	}
-	
-	private final static Message m_empty_string = new Message("aliases.empty string");
-	private final static ArgsMessage m_invalid_item_type = new ArgsMessage("aliases.invalid item type");
-	private final static Message m_outside_section = new Message("aliases.outside section");
-	
 	/**
 	 * Concatenates parts of an alias's name. This currently 'lowercases' the first character of any part if there's no space in front of it. It also replaces double spaces with a
 	 * single one and trims the resulting string.
-	 * 
+	 *
 	 * @param parts
 	 */
 	static String concatenate(final String... parts) {
@@ -171,7 +154,7 @@ static String concatenate(final String... parts) {
 		}
 		return "" + b.toString().replace("  ", " ").trim();
 	}
-	
+
 	@Nullable
 	private static MaterialName getMaterialNameData(ItemData type) {
 		// Check script aliases first
@@ -179,11 +162,11 @@ private static MaterialName getMaterialNameData(ItemData type) {
 		if (aliases != null) {
 			return aliases.provider.getMaterialName(type);
 		}
-		
+
 		// Then global aliases
 		return provider.getMaterialName(type);
 	}
-	
+
 	public static String getMaterialName(ItemData type, boolean plural) {
 		MaterialName name = getMaterialNameData(type);
 		if (name == null) {
@@ -191,7 +174,7 @@ public static String getMaterialName(ItemData type, boolean plural) {
 		}
 		return name.toString(plural);
 	}
-	
+
 	/**
 	 * @return The item's gender or -1 if no name is found
 	 */
@@ -201,10 +184,10 @@ public static int getGender(ItemData item) {
 			return n.gender;
 		return -1;
 	}
-	
+
 	/**
 	 * Parses an ItemType to be used as an alias, i.e. it doesn't parse 'all'/'every' and the amount.
-	 * 
+	 *
 	 * @param s mixed case string
 	 * @return A new ItemType representing the given value
 	 */
@@ -216,28 +199,23 @@ public static ItemType parseAlias(final String s) {
 		}
 		if (s.equals("*"))
 			return everything;
-		
+
 		final ItemType t = new ItemType();
-		
+
 		final String[] types = s.split("\\s*,\\s*");
 		for (final String type : types) {
 			if (type == null || parseType(type, t, true) == null)
 				return null;
 		}
-		
+
 		return t;
 	}
-	
-	private final static RegexMessage p_any = new RegexMessage("aliases.any", "", " (.+)", Pattern.CASE_INSENSITIVE);
-	private final static RegexMessage p_every = new RegexMessage("aliases.every", "", " (.+)", Pattern.CASE_INSENSITIVE);
-	private final static RegexMessage p_of_every = new RegexMessage("aliases.of every", "(\\d+) ", " (.+)", Pattern.CASE_INSENSITIVE);
-	private final static RegexMessage p_of = new RegexMessage("aliases.of", "(\\d+) (?:", " )?(.+)", Pattern.CASE_INSENSITIVE);
-	
+
 	/**
 	 * Parses an ItemType.
 	 * <p>
 	 * Prints errors.
-	 * 
+	 *
 	 * @param s
 	 * @return The parsed ItemType or null if the input is invalid.
 	 */
@@ -245,10 +223,10 @@ public static ItemType parseAlias(final String s) {
 	public static ItemType parseItemType(String s) {
 		if (s.isEmpty())
 			return null;
-		s = "" + s.trim();
-		
+		s = s.trim();
+
 		final ItemType t = new ItemType();
-		
+
 		Matcher m;
 		if ((m = p_of_every.matcher(s)).matches()) {
 			t.setAmount(Utils.parseInt("" + m.group(1)));
@@ -266,11 +244,12 @@ public static ItemType parseItemType(String s) {
 			if (s.length() != l) // had indefinite article
 				t.setAmount(1);
 		}
-		
+
 		String lc = s.toLowerCase(Locale.ENGLISH);
 		String of = Language.getSpaced("of").toLowerCase();
 		int c = -1;
-		outer: while ((c = lc.indexOf(of, c + 1)) != -1) {
+		outer:
+		while ((c = lc.indexOf(of, c + 1)) != -1) {
 			ItemType t2 = t.clone();
 			try (BlockingLogHandler ignored = new BlockingLogHandler().start()) {
 				if (parseType("" + s.substring(0, c), t2, false) == null)
@@ -287,19 +266,19 @@ public static ItemType parseItemType(String s) {
 			}
 			return t2;
 		}
-		
+
 		if (parseType(s, t, false) == null)
 			return null;
-		
+
 		if (t.numTypes() == 0)
 			return null;
-		
+
 		return t;
 	}
-	
+
 	/**
 	 * Prints errors.
-	 * 
+	 *
 	 * @param s The string holding the type, can be either a number or an alias, plus an optional data part. Case does not matter.
 	 * @param t The ItemType to add the parsed ItemData(s) to (i.e. this ItemType will be modified)
 	 * @param isAlias Whether this type is parsed for an alias.
@@ -323,67 +302,76 @@ private static ItemType parseType(final String s, final ItemType t, final boolea
 			Skript.error(m_invalid_item_type.toString(s));
 		return null;
 	}
-	
+
 	/**
 	 * Gets an alias from the aliases defined in the config.
-	 * 
-	 * @param s The alias to get, case does not matter
+	 *
+	 * @param rawInput The alias to get, case does not matter
 	 * @return A copy of the ItemType represented by the given alias or null if no such alias exists.
 	 */
 	@Nullable
-	private static ItemType getAlias(final String s) {
-		ItemType i;
-		String lc = "" + s.toLowerCase(Locale.ENGLISH);
-		final Matcher m = p_any.matcher(lc);
-		if (m.matches()) {
-			lc = "" + m.group(m.groupCount());
-		}
-		if ((i = getAlias_i(lc)) != null)
-			return i.clone();
-		boolean b;
-		if ((b = lc.endsWith(" " + blockSingular)) || lc.endsWith(" " + blockPlural)) {
-			if ((i = getAlias_i("" + s.substring(0, s.length() - (b ? blockSingular.length() : blockPlural.length()) - 1))) != null) {
-				i = i.clone();
-				for (int j = 0; j < i.numTypes(); j++) {
-					final ItemData d = i.getTypes().get(j);
-					if (d.getType().isBlock()) {
-						i.remove(d);
+	private static ItemType getAlias(final String rawInput) {
+		String input = rawInput.toLowerCase(Locale.ENGLISH).trim();
+		ItemType itemType = getAlias_i(input);
+		if (itemType != null)
+			return itemType.clone();
+
+		// try to parse `ACTUALNAME block` as ACTUALNAME
+		if (input.endsWith(" " + blockSingular) || input.endsWith(" " + blockPlural)) {
+			String stripped = input.substring(0, input.lastIndexOf(" "));
+			itemType = getAlias_i(stripped);
+			if (itemType != null) {
+				itemType = itemType.clone();
+				// remove all non-block datas and types that already end with "block"
+				for (int j = 0; j < itemType.numTypes(); j++) {
+					ItemData d = itemType.getTypes().get(j);
+					if (!d.getType().isBlock() || d.getType().getKey().getKey().endsWith(blockSingular)) {
+						itemType.remove(d);
 						j--;
 					}
 				}
-				if (i.getTypes().isEmpty())
+				// if no block itemdatas were found, return null
+				if (itemType.getTypes().isEmpty())
 					return null;
-				return i;
+				return itemType;
 			}
-		} else if ((b = lc.endsWith(" " + itemSingular)) || lc.endsWith(" " + itemPlural)) {
-			if ((i = getAlias_i("" + s.substring(0, s.length() - (b ? itemSingular.length() : itemPlural.length()) - 1))) != null) {
-				i = i.clone();
-				for (int j = 0; j < i.numTypes(); j++) {
-					final ItemData d = i.getTypes().get(j);
-					if (!d.isAnything && d.getType().isBlock()) {
-						i.remove(d);
-						j--;
+		// do the same for items
+		} else if (input.endsWith(" " + itemSingular) || input.endsWith(" " + itemPlural)) {
+			String stripped = input.substring(0, input.lastIndexOf(" "));
+			itemType = getAlias_i(stripped);
+			if (itemType != null) {
+				itemType = itemType.clone();
+				// remove all non-item datas
+				for (int j = 0; j < itemType.numTypes(); j++) {
+					ItemData data = itemType.getTypes().get(j);
+					if (!data.isAnything && !data.getType().isItem()) {
+						itemType.remove(data);
+						--j;
 					}
 				}
-				if (i.getTypes().isEmpty())
+				// if no item itemdatas were found, return null
+				if (itemType.getTypes().isEmpty())
 					return null;
-				return i;
+				return itemType;
 			}
 		}
 		return null;
 	}
-	
+
 	/**
 	 * Clears aliases. Make sure to load them after this!
 	 */
 	public static void clear() {
 		provider.clearAliases();
 	}
-	
+
 	/**
 	 * Loads aliases from Skript's standard locations.
 	 * Exceptions will be logged, but not thrown.
+	 *
+	 * @deprecated Freezes server on call. Use {@link #loadAsync()} instead.
 	 */
+	@Deprecated
 	public static void load() {
 		try {
 			long start = System.currentTimeMillis();
@@ -394,25 +382,80 @@ public static void load() {
 		}
 	}
 
+	/**
+	 * Loads aliases from Skript's standard locations asynchronously.
+	 * Exceptions will be logged, but not thrown.
+	 *
+	 * @return A future that completes when the aliases are loaded.
+	 * The returned value is true if the loading was successful, false otherwise.
+	 */
+	public static CompletableFuture<Boolean> loadAsync() {
+		return CompletableFuture.supplyAsync(() -> {
+			try {
+				long start = System.currentTimeMillis();
+				loadInternal();
+				Skript.info("Loaded " + provider.getAliasCount() + " aliases in " + (System.currentTimeMillis() - start) + "ms");
+				return true;
+			} catch (StackOverflowError e) {
+				/*
+				 * Returns true if the underlying installed Java/JVM is 32-bit, false otherwise.
+				 * Note that this depends on a internal system property and these can always be overridden by user using -D JVM options,
+				 * more specifically, this method will return false on non OracleJDK/OpenJDK based JVMs, that don't include bit information in java.vm.name system property
+				 */
+				if (System.getProperty("java.vm.name").contains("32")) {
+					Skript.error("");
+					Skript.error("There was a StackOverflowError that occurred while loading aliases.");
+					Skript.error("As you are currently using 32-bit Java, please update to 64-bit Java to resolve the error.");
+					Skript.error("Please report this issue to our GitHub only if updating to 64-bit Java does not fix the issue.");
+					Skript.error("");
+				} else {
+					Skript.exception(e);
+					Bukkit.getPluginManager().disablePlugin(Skript.getInstance());
+				}
+				return false;
+			} catch (IOException e) {
+				Skript.exception(e);
+				return false;
+			}
+		});
+	}
+
 	/**
 	 * Temporarily create an alias for materials which do not have aliases yet.
 	 */
 	private static void loadMissingAliases() {
 		if (!Skript.methodExists(Material.class, "getKey"))
 			return;
+		boolean modItemRegistered = false;
 		for (Material material : Material.values()) {
 			if (!material.isLegacy() && !provider.hasAliasForMaterial(material)) {
 				NamespacedKey key = material.getKey();
-				String name = key.getKey().replace("_", " ");
-				parser.loadAlias(name + "¦s", key.toString());
+				// mod:an_item -> (mod's an item) | (an item from mod)
+				// minecraft:dirt -> dirt
+				if (NamespacedKey.MINECRAFT.equals(key.getNamespace())) {
+					parser.loadAlias(key.getKey().replace("_", " ") + "¦s", key.toString());
+				} else {
+					if (!modItemRegistered) modItemRegistered = true;
+					parser.loadAlias((key.getNamespace() + "'s " + key.getKey() + "¦s").replace("_", " "), key.toString());
+					parser.loadAlias((key.getKey() + "¦s from " + key.getNamespace()).replace("_", " "), key.toString());
+				}
 				Skript.debug(ChatColor.YELLOW + "Creating temporary alias for: " + key);
 			}
 		}
+
+		if (modItemRegistered) {
+			Skript.warning("==============================================================");
+			Skript.warning("Some materials were found that seem to be modded.");
+			Skript.warning("An item that has the id 'mod:item' can be used as 'mod's item' or 'item from mod'.");
+			Skript.warning("WARNING: Skript does not officially support any modded servers.");
+			Skript.warning("Any issues you encounter related to modded items will be your responsibility to fix.");
+			Skript.warning("==============================================================");
+		}
 	}
-	
+
 	private static void loadInternal() throws IOException {
 		Path dataFolder = Skript.getInstance().getDataFolder().toPath();
-		
+
 		// Load aliases.zip OR aliases from jar (never both)
 		Path zipPath = dataFolder.resolve("aliases-english.zip");
 		if (!SkriptConfig.loadDefaultAliases.value()) {
@@ -436,9 +479,9 @@ private static void loadInternal() throws IOException {
 			} catch (URISyntaxException e) {
 				assert false;
 			}
-			
+
 		}
-		
+
 		// Load everything from aliases folder (user aliases)
 		Path aliasesFolder = dataFolder.resolve("aliases");
 		if (Files.exists(aliasesFolder)) {
@@ -448,19 +491,19 @@ private static void loadInternal() throws IOException {
 
 		// generate aliases from item names for any missing items
 		loadMissingAliases();
-		
+
 		// Update tracked item types
 		for (Map.Entry<String, ItemType> entry : trackedTypes.entrySet()) {
 			@SuppressWarnings("null") // No null keys in this map
 			ItemType type = parseItemType(entry.getKey());
 			if (type == null)
 				Skript.warning("Alias '" + entry.getKey() + "' is required by Skript, but does not exist anymore. "
-						+ "Make sure to fix this before restarting the server.");
+								   + "Make sure to fix this before restarting the server.");
 			else
 				entry.getValue().setTo(type);
 		}
 	}
-	
+
 	/**
 	 * Loads aliases from given directory.
 	 * @param dir Directory of aliases.
@@ -484,7 +527,7 @@ else if (name.endsWith(".sk"))
 			throw e.getCause();
 		}
 	}
-	
+
 	/**
 	 * Loads aliases from given path.
 	 * @param f Path of alias file.
@@ -494,7 +537,7 @@ public static void load(Path f) throws IOException {
 		Config config = new Config(f, false, false, "=");
 		load(config);
 	}
-	
+
 	/**
 	 * Loads aliases from configuration.
 	 * @param config Configuration containing the aliases.
@@ -505,7 +548,7 @@ public static void load(Config config) {
 				Skript.error(m_outside_section.toString());
 				continue;
 			}
-			
+
 			parser.load((SectionNode) n);
 		}
 	}
@@ -523,7 +566,7 @@ public static String getMinecraftId(ItemData data) {
 		}
 		return provider.getMinecraftId(data);
 	}
-	
+
 	/**
 	 * Gets an entity type related to given item. For example, an armor stand
 	 * item is related with armor stand entity.
@@ -538,22 +581,11 @@ public static EntityData<?> getRelatedEntity(ItemData data) {
 		}
 		return provider.getRelatedEntity(data);
 	}
-	
-	/**
-	 * Go through these whenever aliases are reloaded, and update them.
-	 */
-	private static final Map<String, ItemType> trackedTypes = new HashMap<>();
-	
-	/**
-	 * If user had an obscure config option set, don't crash due to missing
-	 * Java item types.
-	 */
-	private static final boolean noHardExceptions = SkriptConfig.apiSoftExceptions.value();
-	
+
 	/**
 	 * Gets an item type that matches the given name.
 	 * If it doesn't exist, an exception is thrown instead.
-	 * 
+	 *
 	 * <p>Item types provided by this method are updated when aliases are
 	 * reloaded. However, this also means they are tracked by aliases system
 	 * and NOT necessarily garbage-collected.
@@ -580,7 +612,7 @@ public static ItemType javaItemType(String name) {
 		trackedTypes.put(name, type);
 		return type;
 	}
-	
+
 	/**
 	 * Creates an aliases provider to be used by given addon. It can be used to
 	 * register aliases and variations to be used in scripts.
@@ -591,11 +623,11 @@ public static AliasesProvider getAddonProvider(@Nullable SkriptAddon addon) {
 		if (addon == null) {
 			throw new IllegalArgumentException("addon needed");
 		}
-		
+
 		// TODO in future, maybe record and allow unloading addon-provided aliases?
 		return provider; // For now, just allow loading aliases easily
 	}
-	
+
 	/**
 	 * Creates script aliases for the provided Script.
 	 * @return Script aliases that are ready to be added to.
diff --git a/src/main/java/ch/njol/skript/aliases/AliasesMap.java b/src/main/java/ch/njol/skript/aliases/AliasesMap.java
index 143f5264060..b42424b5178 100644
--- a/src/main/java/ch/njol/skript/aliases/AliasesMap.java
+++ b/src/main/java/ch/njol/skript/aliases/AliasesMap.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.aliases;
 
 import java.util.ArrayList;
diff --git a/src/main/java/ch/njol/skript/aliases/AliasesParser.java b/src/main/java/ch/njol/skript/aliases/AliasesParser.java
index e4a0891b689..623a86d64ca 100644
--- a/src/main/java/ch/njol/skript/aliases/AliasesParser.java
+++ b/src/main/java/ch/njol/skript/aliases/AliasesParser.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.aliases;
 
 import java.util.ArrayList;
diff --git a/src/main/java/ch/njol/skript/aliases/AliasesProvider.java b/src/main/java/ch/njol/skript/aliases/AliasesProvider.java
index 06ae5317f78..1cbaa0c9cfd 100644
--- a/src/main/java/ch/njol/skript/aliases/AliasesProvider.java
+++ b/src/main/java/ch/njol/skript/aliases/AliasesProvider.java
@@ -1,45 +1,24 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.aliases;
 
+import ch.njol.skript.Skript;
+import ch.njol.skript.bukkitutil.BukkitUnsafe;
+import ch.njol.skript.bukkitutil.ItemUtils;
+import ch.njol.skript.bukkitutil.block.BlockCompat;
+import ch.njol.skript.bukkitutil.block.BlockValues;
+import ch.njol.skript.entity.EntityData;
+import com.google.gson.Gson;
+import it.unimi.dsi.fastutil.objects.ObjectOpenHashSet;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
-import java.util.Set;
 import java.util.List;
 import java.util.Map;
-
-import ch.njol.skript.Skript;
-import it.unimi.dsi.fastutil.objects.ObjectOpenHashSet;
+import java.util.Set;
 import org.bukkit.Material;
 import org.bukkit.inventory.ItemStack;
 import org.jetbrains.annotations.Nullable;
 
-import com.google.gson.Gson;
-
-import ch.njol.skript.bukkitutil.BukkitUnsafe;
-import ch.njol.skript.bukkitutil.ItemUtils;
-import ch.njol.skript.bukkitutil.block.BlockCompat;
-import ch.njol.skript.bukkitutil.block.BlockValues;
-import ch.njol.skript.entity.EntityData;
-
 /**
  * Provides aliases on Bukkit/Spigot platform.
  */
@@ -47,14 +26,14 @@ public class AliasesProvider {
 
 	// not supported on Spigot versions older than 1.18
 	private static final boolean FASTER_SET_SUPPORTED = Skript.classExists("it.unimi.dsi.fastutil.objects.ObjectOpenHashSet");
-	
+
 	/**
 	 * When an alias is not found, it will requested from this provider.
 	 * Null when this is global aliases provider.
 	 */
 	@Nullable
 	private final AliasesProvider parent;
-	
+
 	/**
 	 * All aliases that are currently loaded by this provider.
 	 */
@@ -64,112 +43,21 @@ public class AliasesProvider {
 	 * All materials that are currently loaded by this provider.
 	 */
 	private final Set<Material> materials;
-	
+
 	/**
 	 * Tags are in JSON format. We may need GSON when merging tags
 	 * (which might be done if variations are used).
 	 */
 	private final Gson gson;
-	
-	/**
-	 * Represents a variation of material. It could, for example, define one
-	 * more tag or change base id, but keep tag intact.
-	 */
-	public static class Variation {
-		
-		@Nullable
-		private final String id;
-		private final int insertPoint;
-		
-		private final Map<String, Object> tags;
-		private final Map<String, String> states;
-		
-		public Variation(@Nullable String id, int insertPoint, Map<String, Object> tags, Map<String, String> states) {
-			this.id = id;
-			this.insertPoint = insertPoint;
-			this.tags = tags;
-			this.states = states;
-		}
-		
-		@Nullable
-		public String getId() {
-			return id;
-		}
-		
-		public int getInsertPoint() {
-			return insertPoint;
-		}
-		
-		@Nullable
-		public String insertId(@Nullable String inserted) {
-			if (inserted == null) // Nothing to insert
-				return id;
-			inserted = inserted.substring(0, inserted.length() - 1); // Strip out -
-			if (id == null) // Inserting to nothing
-				return inserted;
-			
-			String id = this.id;
-			assert id != null;
-			if (insertPoint == -1) // No place where to insert
-				return inserted;
-			
-			// Insert given string to in middle of our id
-			String before = id.substring(0, insertPoint);
-			String after = id.substring(insertPoint + 1);
-			return before + inserted + after;
-		}
-		
-		public Map<String, Object> getTags() {
-			return tags;
-		}
-
-
-		public Map<String,String> getBlockStates() {
-			return states;
-		}
-
-
-		public Variation merge(Variation other) {
-			// Merge tags and block states
-			Map<String, Object> mergedTags = new HashMap<>(other.tags);
-			mergedTags.putAll(tags);
-			Map<String, String> mergedStates = new HashMap<>(other.states);
-			mergedStates.putAll(states);
-			
-			// Potentially merge ids
-			String id = insertId(other.id);
-			
-			return new Variation(id, -1, mergedTags, mergedStates);
-		}
-	}
-	
-	public static class VariationGroup {
-		
-		public final List<String> keys;
-		
-		public final List<Variation> values;
-		
-		public VariationGroup() {
-			this.keys = new ArrayList<>();
-			this.values = new ArrayList<>();
-		}
-		
-		public void put(String key, Variation value) {
-			keys.add(key);
-			values.add(value);
-		}
-	}
-	
 	/**
 	 * Contains all variations.
 	 */
 	private final Map<String, VariationGroup> variations;
-	
 	/**
 	 * Allows looking up aliases based on item datas created runtime.
 	 */
 	private final AliasesMap aliasesMap;
-	
+
 	/**
 	 * Constructs a new aliases provider with no data.
 	 */
@@ -184,20 +72,20 @@ public AliasesProvider(int expectedCount, @Nullable AliasesProvider parent) {
 		} else {
 			this.materials = new HashSet<>();
 		}
-		
+
 		this.gson = new Gson();
 	}
-	
+
 	/**
 	 * Uses GSON to parse Mojang's JSON format to a map.
 	 * @param raw Raw JSON.
-	 * @return String,Object map.
+	 * @return String, Object map.
 	 */
 	@SuppressWarnings({"null", "unchecked"})
 	public Map<String, Object> parseMojangson(String raw) {
 		return (Map<String, Object>) gson.fromJson(raw, Object.class);
 	}
-	
+
 	/**
 	 * Applies given tags to an item stack.
 	 * @param stack Item stack.
@@ -213,10 +101,10 @@ public int applyTags(ItemStack stack, Map<String, Object> tags) {
 			tags.remove("Damage");
 			flags |= ItemFlags.CHANGED_DURABILITY;
 		}
-		
+
 		if (tags.isEmpty()) // No real tags to apply
 			return flags;
-		
+
 		// Apply random tags using JSON
 		if (Aliases.USING_ITEM_COMPONENTS) {
 			String components = (String) tags.get("components"); // only components are supported for modifying a stack
@@ -231,40 +119,10 @@ public int applyTags(ItemStack stack, Map<String, Object> tags) {
 			BukkitUnsafe.modifyItemStack(stack, json);
 		}
 		flags |= ItemFlags.CHANGED_TAGS;
-		
+
 		return flags;
 	}
-	
-	/**
-	 * Name of an alias used by {@link #addAlias(AliasName, String, Map, Map)}
-	 * for registration.
-	 */
-	public static class AliasName {
-		
-		/**
-		 * Singular for of alias name.
-		 */
-		public final String singular;
-		
-		/**
-		 * Plural form of alias name.
-		 */
-		public final String plural;
-		
-		/**
-		 * Gender of alias name.
-		 */
-		public final int gender;
 
-		public AliasName(String singular, String plural, int gender) {
-			super();
-			this.singular = singular;
-			this.plural = plural;
-			this.gender = gender;
-		}
-		
-	}
-	
 	/**
 	 * Adds an alias to this provider.
 	 * @param name Name of alias without any patterns or variation blocks.
@@ -290,19 +148,19 @@ public void addAlias(AliasName name, String id, @Nullable Map<String, Object> ta
 			datas = typeOfId.getTypes();
 		} else { // ... but quite often, we just got Vanilla id
 			// Prepare and modify ItemStack (using somewhat Unsafe methods)
-			Material material = BukkitUnsafe.getMaterialFromMinecraftId(id);
+			Material material = BukkitUnsafe.getMaterialFromNamespacedId(id);
 			if (material == null) { // If server doesn't recognize id, do not proceed
 				throw new InvalidMinecraftIdException(id);
 			}
 
 			materials.add(material);
-			
+
 			// Hacky: get related entity from block states
 			String entityName = blockStates.remove("relatedEntity");
 			if (entityName != null) {
 				related = EntityData.parse(entityName);
 			}
-			
+
 			// Apply (NBT) tags to item stack
 			ItemStack stack = null;
 			int itemFlags = 0;
@@ -312,14 +170,14 @@ public void addAlias(AliasName name, String id, @Nullable Map<String, Object> ta
 					itemFlags = applyTags(stack, new HashMap<>(tags));
 				}
 			}
-			
+
 			// Parse block state to block values
 			BlockValues blockValues = BlockCompat.INSTANCE.createBlockValues(material, blockStates, stack, itemFlags);
-			
+
 			ItemData data = stack != null ? new ItemData(stack, blockValues) : new ItemData(material, blockValues);
 			data.isAlias = true;
 			data.itemFlags = itemFlags;
-			
+
 			// Deduplicate item data if this has been loaded before
 			if (deduplicate) {
 				AliasesMap.Match canonical = aliasesMap.exactMatch(data);
@@ -329,10 +187,10 @@ public void addAlias(AliasName name, String id, @Nullable Map<String, Object> ta
 					data = aliasData.getItem();
 				}
 			}
-			
+
 			datas = Collections.singletonList(data);
 		}
-		
+
 		// If this is first time we're defining an item, store additional data about it
 		if (typeOfId == null) {
 			ItemData data = datas.get(0);
@@ -351,7 +209,8 @@ public void addAlias(AliasName name, String id, @Nullable Map<String, Object> ta
 			aliases.put(name.plural, type); // Plural form
 			type.addAll(datas);
 		} else { // There is already an item type with this name, we need to *only* add new data
-			newDataLoop: for (ItemData newData : datas) {
+			newDataLoop:
+			for (ItemData newData : datas) {
 				for (ItemData existingData : type.getTypes()) {
 					if (newData == existingData || newData.matchAlias(existingData).isAtLeast(MatchQuality.EXACT)) // Don't add this data, the item type already contains it!
 						continue newDataLoop;
@@ -360,11 +219,11 @@ public void addAlias(AliasName name, String id, @Nullable Map<String, Object> ta
 			}
 		}
 	}
-	
+
 	public void addVariationGroup(String name, VariationGroup group) {
 		variations.put(name, group);
 	}
-	
+
 	@Nullable
 	public VariationGroup getVariationGroup(String name) {
 		return variations.get(name);
@@ -378,7 +237,7 @@ public ItemType getAlias(String alias) {
 		}
 		return item;
 	}
-	
+
 	public AliasesMap.@Nullable AliasData getAliasData(ItemData item) {
 		AliasesMap.AliasData data = aliasesMap.matchAlias(item).getData();
 		if (data == null && parent != null) {
@@ -395,7 +254,7 @@ public String getMinecraftId(ItemData item) {
 		}
 		return null;
 	}
-	
+
 	@Nullable
 	public MaterialName getMaterialName(ItemData item) {
 		AliasesMap.AliasData data = getAliasData(item);
@@ -404,7 +263,7 @@ public MaterialName getMaterialName(ItemData item) {
 		}
 		return null;
 	}
-	
+
 	@Nullable
 	public EntityData<?> getRelatedEntity(ItemData item) {
 		AliasesMap.AliasData data = getAliasData(item);
@@ -434,4 +293,123 @@ public boolean hasAliasForMaterial(Material material) {
 		return materials.contains(material);
 	}
 
+	/**
+	 * Represents a variation of material. It could, for example, define one
+	 * more tag or change base id, but keep tag intact.
+	 */
+	public static class Variation {
+
+		@Nullable
+		private final String id;
+		private final int insertPoint;
+
+		private final Map<String, Object> tags;
+		private final Map<String, String> states;
+
+		public Variation(@Nullable String id, int insertPoint, Map<String, Object> tags, Map<String, String> states) {
+			this.id = id;
+			this.insertPoint = insertPoint;
+			this.tags = tags;
+			this.states = states;
+		}
+
+		@Nullable
+		public String getId() {
+			return id;
+		}
+
+		public int getInsertPoint() {
+			return insertPoint;
+		}
+
+		@Nullable
+		public String insertId(@Nullable String inserted) {
+			if (inserted == null) // Nothing to insert
+				return id;
+			inserted = inserted.substring(0, inserted.length() - 1); // Strip out -
+			if (id == null) // Inserting to nothing
+				return inserted;
+
+			String id = this.id;
+			assert id != null;
+			if (insertPoint == -1) // No place where to insert
+				return inserted;
+
+			// Insert given string to in middle of our id
+			String before = id.substring(0, insertPoint);
+			String after = id.substring(insertPoint + 1);
+			return before + inserted + after;
+		}
+
+		public Map<String, Object> getTags() {
+			return tags;
+		}
+
+
+		public Map<String, String> getBlockStates() {
+			return states;
+		}
+
+
+		public Variation merge(Variation other) {
+			// Merge tags and block states
+			Map<String, Object> mergedTags = new HashMap<>(other.tags);
+			mergedTags.putAll(tags);
+			Map<String, String> mergedStates = new HashMap<>(other.states);
+			mergedStates.putAll(states);
+
+			// Potentially merge ids
+			String id = insertId(other.id);
+
+			return new Variation(id, -1, mergedTags, mergedStates);
+		}
+	}
+
+	public static class VariationGroup {
+
+		public final List<String> keys;
+
+		public final List<Variation> values;
+
+		public VariationGroup() {
+			this.keys = new ArrayList<>();
+			this.values = new ArrayList<>();
+		}
+
+		public void put(String key, Variation value) {
+			keys.add(key);
+			values.add(value);
+		}
+	}
+
+	/**
+	 * Name of an alias used by {@link #addAlias(AliasName, String, Map, Map)}
+	 * for registration.
+	 */
+	public static class AliasName {
+
+		/**
+		 * Singular for of alias name.
+		 */
+		public final String singular;
+
+		/**
+		 * Plural form of alias name.
+		 */
+		public final String plural;
+
+		/**
+		 * Gender of alias name.
+		 */
+		public final int gender;
+
+		public AliasName(String singular, String plural, int gender) {
+			super();
+			this.singular = singular;
+			this.plural = plural;
+			this.gender = gender;
+		}
+
+	}
+
 }
diff --git a/src/main/java/ch/njol/skript/aliases/InvalidMinecraftIdException.java b/src/main/java/ch/njol/skript/aliases/InvalidMinecraftIdException.java
index a4074477e75..12235757b35 100644
--- a/src/main/java/ch/njol/skript/aliases/InvalidMinecraftIdException.java
+++ b/src/main/java/ch/njol/skript/aliases/InvalidMinecraftIdException.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.aliases;
 
 public class InvalidMinecraftIdException extends IllegalArgumentException {
diff --git a/src/main/java/ch/njol/skript/aliases/ItemData.java b/src/main/java/ch/njol/skript/aliases/ItemData.java
index f18812aabb8..a7a16ab8dc3 100644
--- a/src/main/java/ch/njol/skript/aliases/ItemData.java
+++ b/src/main/java/ch/njol/skript/aliases/ItemData.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.aliases;
 
 import ch.njol.skript.Skript;
diff --git a/src/main/java/ch/njol/skript/aliases/ItemFlags.java b/src/main/java/ch/njol/skript/aliases/ItemFlags.java
index b39b0b93c87..d14fed568bb 100644
--- a/src/main/java/ch/njol/skript/aliases/ItemFlags.java
+++ b/src/main/java/ch/njol/skript/aliases/ItemFlags.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.aliases;
 
 
diff --git a/src/main/java/ch/njol/skript/aliases/ItemType.java b/src/main/java/ch/njol/skript/aliases/ItemType.java
index aa772d2b646..11d8f2cae5a 100644
--- a/src/main/java/ch/njol/skript/aliases/ItemType.java
+++ b/src/main/java/ch/njol/skript/aliases/ItemType.java
@@ -4,6 +4,8 @@
 import ch.njol.skript.bukkitutil.BukkitUnsafe;
 import ch.njol.skript.bukkitutil.ItemUtils;
 import ch.njol.skript.lang.Unit;
+import ch.njol.skript.lang.util.common.AnyAmount;
+import ch.njol.skript.lang.util.common.AnyNamed;
 import ch.njol.skript.localization.Adjective;
 import ch.njol.skript.localization.GeneralWords;
 import ch.njol.skript.localization.Language;
@@ -35,6 +37,7 @@
 import org.bukkit.inventory.PlayerInventory;
 import org.bukkit.inventory.meta.ItemMeta;
 import org.bukkit.inventory.meta.SkullMeta;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.io.NotSerializableException;
@@ -44,6 +47,7 @@
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
@@ -55,7 +59,8 @@
 import java.util.stream.Collectors;
 
 @ContainerType(ItemStack.class)
-public class ItemType implements Unit, Iterable<ItemData>, Container<ItemStack>, YggdrasilExtendedSerializable {
+public class ItemType implements Unit, Iterable<ItemData>, Container<ItemStack>, YggdrasilExtendedSerializable,
+	AnyNamed, AnyAmount {
 
 	static {
 		// This handles updating ItemType and ItemData variable records
@@ -1414,6 +1419,33 @@ public Material getMaterial() {
 		return data.getType();
 	}
 
+	/**
+	 * @return All Materials this ItemType represents.
+	 */
+	public Material[] getMaterials() {
+		Set<Material> materials = new HashSet<>();
+		for (ItemData data : types) {
+			materials.add(data.getType());
+		}
+		return materials.toArray(new Material[0]);
+  }
+
+  /**
+	 * @return A random block material this ItemType represents.
+	 * @throws IllegalStateException If {@link #hasBlock()} is false.
+	 */
+	public Material getBlockMaterial() {
+		List<ItemData> blockItemDatas = new ArrayList<>();
+		for (ItemData d : types) {
+			if (d.type.isBlock())
+				blockItemDatas.add(d);
+		}
+		if (blockItemDatas.isEmpty())
+			throw new IllegalStateException("This ItemType does not represent a material. " +
+					"ItemType#hasBlock() should return true before invoking this method.");
+		return blockItemDatas.get(random.nextInt(blockItemDatas.size())).getType();
+	}
+
 	/**
 	 * Returns a base item type of this. Essentially, this calls
 	 * {@link ItemData#aliasCopy()} on all datas and creates a new type
@@ -1427,4 +1459,38 @@ public ItemType getBaseType() {
 		}
 		return copy;
 	}
+
+	@Override
+	public @Nullable String name() {
+		ItemMeta meta = this.getItemMeta();
+		return meta.hasDisplayName() ? meta.getDisplayName() : null;
+	}
+
+	@Override
+	public boolean supportsNameChange() {
+		return true;
+	}
+
+	@Override
+	public void setName(String name) {
+		ItemMeta meta = this.getItemMeta();
+		meta.setDisplayName(name);
+		this.setItemMeta(meta);
+	}
+
+	@Override
+	public @NotNull Number amount() {
+		return this.getAmount();
+	}
+
+	@Override
+	public boolean supportsAmountChange() {
+		return true;
+	}
+
+	@Override
+	public void setAmount(@Nullable Number amount) throws UnsupportedOperationException {
+		this.setAmount(amount != null ? amount.intValue() : 0);
+	}
+
 }
diff --git a/src/main/java/ch/njol/skript/aliases/MatchQuality.java b/src/main/java/ch/njol/skript/aliases/MatchQuality.java
index 58bac3dd2d5..8f863c7e0ca 100644
--- a/src/main/java/ch/njol/skript/aliases/MatchQuality.java
+++ b/src/main/java/ch/njol/skript/aliases/MatchQuality.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.aliases;
 
 /**
diff --git a/src/main/java/ch/njol/skript/aliases/MaterialName.java b/src/main/java/ch/njol/skript/aliases/MaterialName.java
index d79912b9103..67fe60be0cb 100644
--- a/src/main/java/ch/njol/skript/aliases/MaterialName.java
+++ b/src/main/java/ch/njol/skript/aliases/MaterialName.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.aliases;
 
 import org.bukkit.Material;
diff --git a/src/main/java/ch/njol/skript/aliases/ScriptAliases.java b/src/main/java/ch/njol/skript/aliases/ScriptAliases.java
index 6a5386f3b94..de6575e20a8 100644
--- a/src/main/java/ch/njol/skript/aliases/ScriptAliases.java
+++ b/src/main/java/ch/njol/skript/aliases/ScriptAliases.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.aliases;
 
 
diff --git a/src/main/java/ch/njol/skript/bukkitutil/BukkitUnsafe.java b/src/main/java/ch/njol/skript/bukkitutil/BukkitUnsafe.java
index f47a3f5d8d7..e7e255f1e72 100644
--- a/src/main/java/ch/njol/skript/bukkitutil/BukkitUnsafe.java
+++ b/src/main/java/ch/njol/skript/bukkitutil/BukkitUnsafe.java
@@ -1,76 +1,75 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.bukkitutil;
 
+import ch.njol.skript.Skript;
+import ch.njol.util.EnumTypeAdapter;
+import com.google.common.io.ByteStreams;
+import com.google.gson.GsonBuilder;
+import com.google.gson.reflect.TypeToken;
 import java.io.IOException;
 import java.io.InputStream;
-import java.lang.invoke.MethodHandle;
-import java.lang.invoke.MethodHandles;
-import java.lang.invoke.MethodType;
 import java.lang.reflect.Type;
 import java.nio.charset.StandardCharsets;
 import java.util.HashMap;
 import java.util.Map;
-
 import org.bukkit.Bukkit;
 import org.bukkit.Material;
+import org.bukkit.NamespacedKey;
 import org.bukkit.UnsafeValues;
 import org.bukkit.inventory.ItemStack;
 import org.jetbrains.annotations.Nullable;
 
-import com.google.common.io.ByteStreams;
-import com.google.gson.GsonBuilder;
-import com.google.gson.reflect.TypeToken;
-import ch.njol.util.EnumTypeAdapter;
-import ch.njol.skript.Skript;
-import ch.njol.skript.util.Version;
-
 /**
  * Contains helpers for Bukkit's not so safe stuff.
  */
 @SuppressWarnings("deprecation")
 public class BukkitUnsafe {
-	
+
 	/**
 	 * Bukkit's UnsafeValues allows us to do stuff that would otherwise
 	 * require NMS. It has existed for a long time, too, so 1.9 support is
 	 * not particularly hard to achieve.
-	 * 
+	 *
 	 * UnsafeValues' existence and behavior is not guaranteed across future versions.
 	 */
 	@Nullable
 	private static final UnsafeValues unsafe = Bukkit.getUnsafe();
 
+	/**
+	 * Maps pre 1.12 ids to materials for variable conversions.
+	 */
+	private static @Nullable Map<Integer, Material> idMappings;
+
 	static {
 		if (unsafe == null)
 			throw new Error("UnsafeValues are not available.");
 	}
 
 	/**
-	 * Maps pre 1.12 ids to materials for variable conversions.
+	 * Get a material from a minecraft id.
+	 *
+	 * @param id Namespaced ID with or without a namespace. IDs without a namespace will be treated
+	 * 		as minecraft namespaced IDs. ('minecraft:dirt' and 'dirt' are equivalent.)
+	 * @return The Material which the id represents, or null if no material can be matched.
+	 * @deprecated Prefer {@link BukkitUnsafe#getMaterialFromNamespacedId(String)} for including modded item support
 	 */
-	@Nullable
-	private static Map<Integer,Material> idMappings;
+	@Deprecated
+	public static @Nullable Material getMaterialFromMinecraftId(String id) {
+		return getMaterialFromNamespacedId(id);
+	}
 
-	@Nullable
-	public static Material getMaterialFromMinecraftId(String id) {
-		return Material.matchMaterial(id);
+	/**
+	 * Get a material from a namespaced ID.
+	 * For example, 'minecraft:iron_ingot' -> Material.IRON_INGOT; 'mod:an_item' -> Material.MOD_AN_ITEM
+	 *
+	 * @param id Namespaced ID with or without a namespace. IDs without a namespace will be treated
+	 * 		as minecraft namespaced IDs. ('minecraft:dirt' and 'dirt' are equivalent.)
+	 * @return The Material which the id represents, or null if no material can be matched.
+	 */
+	public static @Nullable Material getMaterialFromNamespacedId(String id) {
+		return Material.matchMaterial(id.toLowerCase().startsWith(NamespacedKey.MINECRAFT + ":")
+										  ? id
+										  : id.replace(":", "_")  //For Hybrid Server
+		);
 	}
 
 	public static void modifyItemStack(ItemStack stack, String arguments) {
@@ -78,19 +77,20 @@ public static void modifyItemStack(ItemStack stack, String arguments) {
 			throw new IllegalStateException("modifyItemStack could not be performed as UnsafeValues are not available.");
 		unsafe.modifyItemStack(stack, arguments);
 	}
-	
+
 	private static void initIdMappings() {
 		try (InputStream is = Skript.getInstance().getResource("materials/ids.json")) {
 			if (is == null) {
 				throw new AssertionError("missing id mappings");
 			}
 			String data = new String(ByteStreams.toByteArray(is), StandardCharsets.UTF_8);
-			
-			Type type = new TypeToken<Map<Integer,String>>(){}.getType();
+
+			Type type = new TypeToken<Map<Integer, String>>() {
+			}.getType();
 			Map<Integer, String> rawMappings = new GsonBuilder().
-				registerTypeAdapterFactory(EnumTypeAdapter.factory)
-				.create().fromJson(data, type);
-			
+												   registerTypeAdapterFactory(EnumTypeAdapter.factory)
+												   .create().fromJson(data, type);
+
 			// Process raw mappings
 			Map<Integer, Material> parsed = new HashMap<>(rawMappings.size());
 			// Legacy material conversion API
@@ -102,7 +102,7 @@ private static void initIdMappings() {
 			throw new AssertionError(e);
 		}
 	}
-	
+
 	@Nullable
 	public static Material getMaterialFromId(int id) {
 		if (idMappings == null) {
diff --git a/src/main/java/ch/njol/skript/bukkitutil/BukkitUtils.java b/src/main/java/ch/njol/skript/bukkitutil/BukkitUtils.java
index df551c268f5..53c43f02a7f 100644
--- a/src/main/java/ch/njol/skript/bukkitutil/BukkitUtils.java
+++ b/src/main/java/ch/njol/skript/bukkitutil/BukkitUtils.java
@@ -2,6 +2,8 @@
 
 import ch.njol.skript.Skript;
 import org.bukkit.Registry;
+import org.bukkit.potion.PotionEffectType;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Utility class with methods pertaining to Bukkit API
@@ -18,4 +20,20 @@ public static boolean registryExists(String registry) {
 		return Skript.classExists("org.bukkit.Registry") && Skript.fieldExists(Registry.class, registry);
 	}
 
+	/**
+	 * Get an instance of the {@link PotionEffectType} {@link Registry}
+	 * <p>Paper/Bukkit have 2 different names for the same registry.</p>
+	 *
+	 * @return PotionEffectType Registry
+	 */
+	@SuppressWarnings("NullableProblems")
+	public static @Nullable Registry<PotionEffectType> getPotionEffectTypeRegistry() {
+		if (registryExists("MOB_EFFECT")) { // Paper (1.21.4)
+			return Registry.MOB_EFFECT;
+		} else if (registryExists("EFFECT")) { // Bukkit (1.21.x)
+			return Registry.EFFECT;
+		}
+		return null;
+	}
+
 }
diff --git a/src/main/java/ch/njol/skript/bukkitutil/ClickEventTracker.java b/src/main/java/ch/njol/skript/bukkitutil/ClickEventTracker.java
index a0ad94999be..0a2188ae0f3 100644
--- a/src/main/java/ch/njol/skript/bukkitutil/ClickEventTracker.java
+++ b/src/main/java/ch/njol/skript/bukkitutil/ClickEventTracker.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.bukkitutil;
 
 import java.util.HashMap;
diff --git a/src/main/java/ch/njol/skript/bukkitutil/CommandReloader.java b/src/main/java/ch/njol/skript/bukkitutil/CommandReloader.java
index e7ae58015f0..aa730e1ad0c 100644
--- a/src/main/java/ch/njol/skript/bukkitutil/CommandReloader.java
+++ b/src/main/java/ch/njol/skript/bukkitutil/CommandReloader.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.bukkitutil;
 
 import java.lang.reflect.Method;
diff --git a/src/main/java/ch/njol/skript/bukkitutil/DamageUtils.java b/src/main/java/ch/njol/skript/bukkitutil/DamageUtils.java
new file mode 100644
index 00000000000..02f74bef6bb
--- /dev/null
+++ b/src/main/java/ch/njol/skript/bukkitutil/DamageUtils.java
@@ -0,0 +1,41 @@
+package ch.njol.skript.bukkitutil;
+
+import org.bukkit.damage.DamageSource;
+import org.bukkit.damage.DamageType;
+import org.bukkit.event.entity.EntityDamageEvent.DamageCause;
+import org.jetbrains.annotations.NotNull;
+
+public class DamageUtils {
+
+	@SuppressWarnings("UnstableApiUsage")
+	public static @NotNull DamageSource getDamageSourceFromCause(DamageCause cause) {
+		return DamageSource.builder(switch (cause) {
+			case KILL, SUICIDE -> DamageType.GENERIC_KILL;
+			case WORLD_BORDER, VOID -> DamageType.OUT_OF_WORLD;
+			case CONTACT -> DamageType.CACTUS;
+			case SUFFOCATION -> DamageType.IN_WALL;
+			case FALL -> DamageType.FALL;
+			case FIRE -> DamageType.ON_FIRE;
+			case FIRE_TICK -> DamageType.IN_FIRE;
+			case LAVA -> DamageType.LAVA;
+			case DROWNING -> DamageType.DROWN;
+			case BLOCK_EXPLOSION, ENTITY_EXPLOSION -> DamageType.EXPLOSION;
+			case LIGHTNING -> DamageType.LIGHTNING_BOLT;
+			case STARVATION -> DamageType.STARVE;
+			case MAGIC, POISON -> DamageType.MAGIC;
+			case WITHER -> DamageType.WITHER;
+			case FALLING_BLOCK -> DamageType.FALLING_BLOCK;
+			case THORNS -> DamageType.THORNS;
+			case DRAGON_BREATH -> DamageType.DRAGON_BREATH;
+			case FLY_INTO_WALL -> DamageType.FLY_INTO_WALL;
+			case HOT_FLOOR -> DamageType.HOT_FLOOR;
+			case CAMPFIRE -> DamageType.CAMPFIRE;
+			case CRAMMING -> DamageType.CRAMMING;
+			case DRYOUT -> DamageType.DRY_OUT;
+			case FREEZE -> DamageType.FREEZE;
+			case SONIC_BOOM -> DamageType.SONIC_BOOM;
+			default -> DamageType.GENERIC;
+		}).build();
+	}
+
+}
diff --git a/src/main/java/ch/njol/skript/bukkitutil/EnchantmentUtils.java b/src/main/java/ch/njol/skript/bukkitutil/EnchantmentUtils.java
deleted file mode 100644
index 7247bba5d37..00000000000
--- a/src/main/java/ch/njol/skript/bukkitutil/EnchantmentUtils.java
+++ /dev/null
@@ -1,182 +0,0 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
-package ch.njol.skript.bukkitutil;
-
-import ch.njol.skript.classes.ClassInfo;
-import ch.njol.skript.classes.Parser;
-import ch.njol.skript.classes.Serializer;
-import ch.njol.skript.lang.ParseContext;
-import ch.njol.skript.localization.Language;
-import ch.njol.util.StringUtils;
-import ch.njol.yggdrasil.Fields;
-import org.bukkit.NamespacedKey;
-import org.bukkit.Registry;
-import org.bukkit.enchantments.Enchantment;
-import org.jetbrains.annotations.Nullable;
-
-import java.io.StreamCorruptedException;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Locale;
-import java.util.Map;
-
-/**
- * Maps enchantments to their keys.
- */
-public class EnchantmentUtils {
-
-	private static final Map<Enchantment, String> NAMES = new HashMap<>();
-	private static final Map<String, Enchantment> PATTERNS = new HashMap<>();
-	private static final boolean HAS_REGISTRY = BukkitUtils.registryExists("ENCHANTMENT");
-
-	static {
-		if (!HAS_REGISTRY) {
-			Language.addListener(() -> {
-				NAMES.clear();
-				PATTERNS.clear();
-				for (Enchantment enchantment : Enchantment.values()) {
-					NamespacedKey key = enchantment.getKey();
-					final String[] names = Language.getList("enchantments." + key.getKey());
-
-					if (!names[0].startsWith("enchantments.")) {
-						NAMES.put(enchantment, names[0]);
-						// Add lang file names
-						for (String name : names)
-							PATTERNS.put(name.toLowerCase(Locale.ENGLISH), enchantment);
-					}
-					// If Minecraft provided, add key without namespace and underscores (ex: "fire aspect")
-					if (key.getNamespace().equalsIgnoreCase(NamespacedKey.MINECRAFT))
-						PATTERNS.put(key.getKey().replace("_", " "), enchantment);
-					// Add full namespaced key as pattern (ex: "minecraft:fire_aspect", "custom:floopy_floopy")
-					PATTERNS.put(key.toString(), enchantment);
-				}
-			});
-		}
-	}
-
-	public static String getKey(Enchantment enchantment) {
-		return enchantment.getKey().toString();
-	}
-
-	@Nullable
-	public static Enchantment getByKey(String key) {
-		if (!key.contains(":")) {
-			// Old method for old variables
-			return Enchantment.getByKey(NamespacedKey.minecraft(key));
-		} else {
-			NamespacedKey namespacedKey = NamespacedKey.fromString(key);
-			if (namespacedKey == null)
-				return null;
-
-			if (HAS_REGISTRY) {
-				return Registry.ENCHANTMENT.get(namespacedKey);
-			} else {
-				return Enchantment.getByKey(namespacedKey);
-			}
-		}
-	}
-
-	@Nullable
-	public static Enchantment parseEnchantment(String s) {
-		return PATTERNS.get(s);
-	}
-
-	@SuppressWarnings("null")
-	public static Collection<String> getNames() {
-		return NAMES.values();
-	}
-
-	@SuppressWarnings("null")
-	public static String toString(final Enchantment enchantment) {
-		// If we have a name in the lang file, return that first
-		if (NAMES.containsKey(enchantment))
-			return NAMES.get(enchantment);
-
-		// If no name is available, return the namespaced key
-		return enchantment.getKey().toString();
-	}
-
-	// REMIND flags?
-	@SuppressWarnings("null")
-	public static String toString(final Enchantment enchantment, final int flags) {
-		return toString(enchantment);
-	}
-
-	public static ClassInfo<Enchantment> createClassInfo() {
-		return new ClassInfo<>(Enchantment.class, "enchantment")
-			.parser(new Parser<>() {
-				@Override
-				@Nullable
-				public Enchantment parse(final String s, final ParseContext context) {
-					return EnchantmentUtils.parseEnchantment(s);
-				}
-
-				@Override
-				public String toString(final Enchantment e, final int flags) {
-					return EnchantmentUtils.toString(e, flags);
-				}
-
-				@Override
-				public String toVariableNameString(final Enchantment e) {
-					return "" + EnchantmentUtils.getKey(e);
-				}
-			}).serializer(new Serializer<>() {
-				@Override
-				public Fields serialize(final Enchantment ench) {
-					final Fields f = new Fields();
-					f.putObject("key", EnchantmentUtils.getKey(ench));
-					return f;
-				}
-
-				@Override
-				public boolean canBeInstantiated() {
-					return false;
-				}
-
-				@Override
-				public void deserialize(final Enchantment o, final Fields f) {
-					assert false;
-				}
-
-				@Override
-				protected Enchantment deserialize(final Fields fields) throws StreamCorruptedException {
-					final String key = fields.getObject("key", String.class);
-					assert key != null; // If a key happens to be null, something went really wrong...
-					final Enchantment e = EnchantmentUtils.getByKey(key);
-					if (e == null)
-						throw new StreamCorruptedException("Invalid enchantment " + key);
-					return e;
-				}
-
-				@Override
-				@Nullable
-				public Enchantment deserialize(String s) {
-					return Enchantment.getByName(s);
-				}
-
-				@Override
-				public boolean mustSyncDeserialization() {
-					return false;
-				}
-			})
-			.usage(StringUtils.join(EnchantmentUtils.getNames(), ", "))
-			.supplier(Enchantment.values());
-	}
-
-}
diff --git a/src/main/java/ch/njol/skript/bukkitutil/EntityUtils.java b/src/main/java/ch/njol/skript/bukkitutil/EntityUtils.java
index 0da7aee9a66..8d78a122875 100644
--- a/src/main/java/ch/njol/skript/bukkitutil/EntityUtils.java
+++ b/src/main/java/ch/njol/skript/bukkitutil/EntityUtils.java
@@ -1,36 +1,12 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.bukkitutil;
 
-import org.bukkit.Location;
-import org.bukkit.entity.Ageable;
-import org.bukkit.entity.Entity;
-import org.bukkit.entity.EntityType;
-import org.bukkit.entity.Piglin;
-import org.bukkit.entity.Zoglin;
-import org.bukkit.entity.Zombie;
-
-import com.google.common.collect.BiMap;
-import com.google.common.collect.HashBiMap;
-
 import ch.njol.skript.Skript;
 import ch.njol.skript.entity.EntityData;
+import com.google.common.collect.BiMap;
+import com.google.common.collect.HashBiMap;
+import org.bukkit.Location;
+import org.bukkit.entity.*;
+import org.jetbrains.annotations.ApiStatus.ScheduledForRemoval;
 
 /**
  * Utility class for quick {@link Entity} methods
@@ -156,7 +132,10 @@ public static EntityData<?> toSkriptEntityData(EntityType e) {
 	/**
 	 * Teleports the given entity to the given location.
 	 * Teleports to the given location in the entity's world if the location's world is null.
+	 * @deprecated this method is only used by EffTeleport, and with the recent additions of TeleportFlag, this method should be moved within that effect.
 	 */
+	@Deprecated
+	@ScheduledForRemoval
 	public static void teleport(Entity entity, Location location) {
 		if (location.getWorld() == null) {
 			location = location.clone();
diff --git a/src/main/java/ch/njol/skript/bukkitutil/HealthUtils.java b/src/main/java/ch/njol/skript/bukkitutil/HealthUtils.java
index aae3224b409..90795c36a92 100644
--- a/src/main/java/ch/njol/skript/bukkitutil/HealthUtils.java
+++ b/src/main/java/ch/njol/skript/bukkitutil/HealthUtils.java
@@ -2,6 +2,11 @@
 
 import ch.njol.skript.Skript;
 import ch.njol.util.Math2;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
+
+import org.bukkit.NamespacedKey;
+import org.bukkit.Registry;
 import org.bukkit.attribute.Attributable;
 import org.bukkit.attribute.Attribute;
 import org.bukkit.attribute.AttributeInstance;
@@ -13,15 +18,21 @@
 import org.bukkit.event.entity.EntityDamageEvent.DamageCause;
 import org.jetbrains.annotations.Nullable;
 
-import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
-
 public class HealthUtils {
+	private static final @Nullable Constructor<EntityDamageEvent> OLD_DAMAGE_EVENT_CONSTRUCTOR;
+
+	static {
+		Constructor<EntityDamageEvent> constructor = null;
+		try {
+			constructor = EntityDamageEvent.class.getConstructor(Damageable.class, DamageCause.class, double.class);
+		} catch (NoSuchMethodException ignored) {}
+		OLD_DAMAGE_EVENT_CONSTRUCTOR = constructor;
+	}
 
 	private static final Attribute MAX_HEALTH;
 	static {
 		if (Skript.isRunningMinecraft(1, 21, 3)) { // In 1.21.3, Attribute became an Interface
-			MAX_HEALTH = Attribute.valueOf("MAX_HEALTH");
+			MAX_HEALTH = Registry.ATTRIBUTE.get(NamespacedKey.minecraft("max_health"));
 		} else {
 			MAX_HEALTH = (Attribute) Enum.valueOf((Class) Attribute.class, "GENERIC_MAX_HEALTH");
 		}
@@ -29,80 +40,95 @@ public class HealthUtils {
 
 	/**
 	 * Get the health of an entity
-	 * @param e Entity to get health from
+	 *
+	 * @param damageable Entity to get health from
 	 * @return The amount of hearts the entity has left
 	 */
-	public static double getHealth(Damageable e) {
-		if (e.isDead())
+	public static double getHealth(Damageable damageable) {
+		if (damageable.isDead())
 			return 0;
-		return e.getHealth() / 2;
+		return damageable.getHealth() / 2;
 	}
-	
+
 	/**
 	 * Set the health of an entity
-	 * @param e Entity to set health for
+	 *
+	 * @param damageable      Entity to set health for
 	 * @param health The amount of hearts to set
 	 */
-	public static void setHealth(Damageable e, double health) {
-		e.setHealth(Math2.fit(0, health, getMaxHealth(e)) * 2);
+	public static void setHealth(Damageable damageable, double health) {
+		damageable.setHealth(Math2.fit(0, health, getMaxHealth(damageable)) * 2);
 	}
-	
+
 	/**
 	 * Get the max health an entity has
-	 * @param e Entity to get max health from
+	 *
+	 * @param damageable Entity to get max health from
 	 * @return How many hearts the entity can have at most
 	 */
-	public static double getMaxHealth(Damageable e) {
-		AttributeInstance attributeInstance = ((Attributable) e).getAttribute(MAX_HEALTH);
+	public static double getMaxHealth(Damageable damageable) {
+		AttributeInstance attributeInstance = ((Attributable) damageable).getAttribute(MAX_HEALTH);
 		assert attributeInstance != null;
 		return attributeInstance.getValue() / 2;
 	}
-	
+
 	/**
 	 * Set the max health an entity can have
-	 * @param e Entity to set max health for
+	 *
+	 * @param damageable      Entity to set max health for
 	 * @param health How many hearts the entity can have at most
 	 */
-	public static void setMaxHealth(Damageable e, double health) {
-		AttributeInstance attributeInstance = ((Attributable) e).getAttribute(MAX_HEALTH);
+	public static void setMaxHealth(Damageable damageable, double health) {
+		AttributeInstance attributeInstance = ((Attributable) damageable).getAttribute(MAX_HEALTH);
 		assert attributeInstance != null;
 		attributeInstance.setBaseValue(health * 2);
 	}
-	
+
 	/**
 	 * Apply damage to an entity
-	 * @param e Entity to apply damage to
-	 * @param d Amount of hearts to damage
+	 *
+	 * @param damageable Entity to apply damage to
+	 * @param damage Amount of hearts to damage
 	 */
-	public static void damage(Damageable e, double d) {
-		if (d < 0) {
-			heal(e, -d);
+	public static void damage(Damageable damageable, double damage) {
+		if (damage < 0) {
+			heal(damageable, -damage);
 			return;
 		}
-		e.damage(d * 2);
+		damageable.damage(damage * 2);
+	}
+
+	@SuppressWarnings("UnstableApiUsage")
+	public static void damage(Damageable damageable, double damage, DamageSource cause) {
+		if (damage < 0) {
+			heal(damageable, -damage);
+			return;
+		}
+		damageable.damage(damage * 2, cause);
 	}
 
 	/**
 	 * Heal an entity
-	 * @param e Entity to heal
-	 * @param h Amount of hearts to heal
+	 *
+	 * @param damageable Entity to heal
+	 * @param health Amount of hearts to heal
 	 */
-	public static void heal(Damageable e, double h) {
-		if (h < 0) {
-			damage(e, -h);
+	public static void heal(Damageable damageable, double health) {
+		if (health < 0) {
+			damage(damageable, -health);
 			return;
 		}
-		setHealth(e, getHealth(e) + h);
+		setHealth(damageable, getHealth(damageable) + health);
 	}
-	
-	public static double getDamage(EntityDamageEvent e) {
-		return e.getDamage() / 2;
+
+	public static double getDamage(EntityDamageEvent event) {
+		return event.getDamage() / 2;
 	}
-	
-	public static double getFinalDamage(EntityDamageEvent e) {
-		return e.getFinalDamage() / 2;
+
+	public static double getFinalDamage(EntityDamageEvent event) {
+		return event.getFinalDamage() / 2;
 	}
-	
+
 	public static void setDamage(EntityDamageEvent event, double damage) {
 		event.setDamage(damage * 2);
 		// Set last damage manually as Bukkit doesn't appear to do that
@@ -110,27 +136,16 @@ public static void setDamage(EntityDamageEvent event, double damage) {
 			((LivingEntity) event.getEntity()).setLastDamage(damage * 2);
 	}
 
-	@Nullable
-	private static final Constructor<EntityDamageEvent> OLD_DAMAGE_EVENT_CONSTRUCTOR;
-
-	static {
-		Constructor<EntityDamageEvent> constructor = null;
-		try {
-			constructor = EntityDamageEvent.class.getConstructor(Damageable.class, DamageCause.class, double.class);
-		} catch (NoSuchMethodException ignored) { }
-		OLD_DAMAGE_EVENT_CONSTRUCTOR = constructor;
-	}
-
-	public static void setDamageCause(Damageable e, DamageCause cause) {
+	@SuppressWarnings("removal")
+	public static void setDamageCause(Damageable damageable, DamageCause cause) {
 		if (OLD_DAMAGE_EVENT_CONSTRUCTOR != null) {
 			try {
-				e.setLastDamageCause(OLD_DAMAGE_EVENT_CONSTRUCTOR.newInstance(e, cause, 0));
+				damageable.setLastDamageCause(OLD_DAMAGE_EVENT_CONSTRUCTOR.newInstance(damageable, cause, 0));
 			} catch (InstantiationException | IllegalAccessException | InvocationTargetException ex) {
 				Skript.exception("Failed to set last damage cause");
 			}
 		} else {
-			e.setLastDamageCause(new EntityDamageEvent(e, cause, DamageSource.builder(DamageType.GENERIC).build(), 0));
+			damageable.setLastDamageCause(new EntityDamageEvent(damageable, cause, DamageSource.builder(DamageType.GENERIC).build(), 0));
 		}
 	}
-
 }
diff --git a/src/main/java/ch/njol/skript/bukkitutil/ItemUtils.java b/src/main/java/ch/njol/skript/bukkitutil/ItemUtils.java
index 2af432ce6d3..b27265f5ae3 100644
--- a/src/main/java/ch/njol/skript/bukkitutil/ItemUtils.java
+++ b/src/main/java/ch/njol/skript/bukkitutil/ItemUtils.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.bukkitutil;
 
 import ch.njol.skript.Skript;
@@ -36,10 +18,12 @@
 import org.bukkit.inventory.meta.Damageable;
 import org.bukkit.inventory.meta.ItemMeta;
 import org.bukkit.inventory.meta.SkullMeta;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.HashMap;
 import java.util.UUID;
+import java.util.function.Consumer;
 
 /**
  * Miscellaneous static utility methods related to items.
@@ -220,14 +204,14 @@ public static Material asItem(Material type) {
 	 * @param object Object to convert
 	 * @return ItemStack from slot/itemtype
 	 */
-	@Nullable
-	public static ItemStack asItemStack(Object object) {
-		if (object instanceof ItemType)
-			return ((ItemType) object).getRandom();
-		else if (object instanceof Slot)
-			return ((Slot) object).getItem();
-		else if (object instanceof ItemStack)
-			return ((ItemStack) object);
+	public static @Nullable ItemStack asItemStack(@Nullable Object object) {
+		if (object instanceof ItemType itemType) {
+			return itemType.getRandom();
+		} else if (object instanceof Slot slot) {
+			return slot.getItem();
+		} else if (object instanceof ItemStack itemStack) {
+			return itemStack;
+		}
 		return null;
 	}
 	
@@ -379,4 +363,46 @@ public static boolean isGlass(Material material) {
 				return false;
 		}
 	}
+
+	/**
+	 * Applies a provided {@code Consumer} to the meta of the provided {@code ItemStack} and returns the updated {@code ItemStack} (with updated {@code ItemMeta}).
+	 *
+	 * @param itemStack the item whose meta is to be changed using the provided Consumer
+	 * @param metaChanger a consumer to update the meta of the provided ItemStack
+	 * @param <T>
+	 * @return the updated item
+	 */
+	public static <T extends ItemMeta> ItemStack changeItemMeta(@NotNull Class<T> metaClass, @NotNull ItemStack itemStack, @NotNull Consumer<T> metaChanger) {
+		ItemMeta originalMeta = itemStack.getItemMeta();
+		if (metaClass.isInstance(originalMeta)) {
+			//noinspection unchecked
+			T itemMeta = (T) originalMeta;
+			metaChanger.accept(itemMeta);
+			itemStack.setItemMeta(itemMeta);
+		}
+		return itemStack;
+	}
+
+	/**
+	 * Updates the provided object's ({@code Slot}, {@code ItemType}, {@code ItemStack}) {@link ItemMeta} by setting it to the provided {@code ItemStack}.
+	 *
+	 * @param object the object to update
+	 * @param itemMeta the {@link ItemMeta} to change to
+	 * @see #asItemStack(Object)
+	 */
+	public static void setItemMeta(Object object, @NotNull ItemMeta itemMeta) {
+		if (object instanceof Slot slot) {
+			ItemStack itemStack = slot.getItem();
+			if (itemStack == null)
+				return;
+			itemStack.setItemMeta(itemMeta);
+			slot.setItem(itemStack);
+		} else if (object instanceof ItemType itemType) {
+			itemType.setItemMeta(itemMeta);
+		} else if (object instanceof ItemStack itemStack) {
+			itemStack.setItemMeta(itemMeta);
+		}
+		throw new IllegalArgumentException("Object was not a Slot, ItemType or ItemStack.");
+	}
+
 }
diff --git a/src/main/java/ch/njol/skript/bukkitutil/PaperEntityUtils.java b/src/main/java/ch/njol/skript/bukkitutil/PaperEntityUtils.java
index 00a95c7ffca..b488fcbc9a7 100644
--- a/src/main/java/ch/njol/skript/bukkitutil/PaperEntityUtils.java
+++ b/src/main/java/ch/njol/skript/bukkitutil/PaperEntityUtils.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.bukkitutil;
 
 import java.util.EnumSet;
diff --git a/src/main/java/ch/njol/skript/bukkitutil/PassengerUtils.java b/src/main/java/ch/njol/skript/bukkitutil/PassengerUtils.java
index 70b84941f93..9d2af9fbfb0 100644
--- a/src/main/java/ch/njol/skript/bukkitutil/PassengerUtils.java
+++ b/src/main/java/ch/njol/skript/bukkitutil/PassengerUtils.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.bukkitutil;
 
 import java.lang.reflect.Method;
diff --git a/src/main/java/ch/njol/skript/bukkitutil/PlayerUtils.java b/src/main/java/ch/njol/skript/bukkitutil/PlayerUtils.java
index 5132dc521c6..6f3791fa34d 100644
--- a/src/main/java/ch/njol/skript/bukkitutil/PlayerUtils.java
+++ b/src/main/java/ch/njol/skript/bukkitutil/PlayerUtils.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.bukkitutil;
 
 import ch.njol.skript.Skript;
diff --git a/src/main/java/ch/njol/skript/bukkitutil/SkriptTeleportFlag.java b/src/main/java/ch/njol/skript/bukkitutil/SkriptTeleportFlag.java
new file mode 100644
index 00000000000..28d1ba69ca1
--- /dev/null
+++ b/src/main/java/ch/njol/skript/bukkitutil/SkriptTeleportFlag.java
@@ -0,0 +1,33 @@
+package ch.njol.skript.bukkitutil;
+
+import io.papermc.paper.entity.TeleportFlag;
+import io.papermc.paper.entity.TeleportFlag.EntityState;
+import io.papermc.paper.entity.TeleportFlag.Relative;
+
+/**
+ * A utility enum for accessing Paper's teleport flags (1.19.4+)
+ */
+public enum SkriptTeleportFlag {
+
+	RETAIN_OPEN_INVENTORY(EntityState.RETAIN_OPEN_INVENTORY),
+	RETAIN_PASSENGERS(EntityState.RETAIN_PASSENGERS),
+	RETAIN_VEHICLE(EntityState.RETAIN_VEHICLE),
+	RETAIN_DIRECTION(Relative.PITCH, Relative.YAW),
+	RETAIN_PITCH(Relative.PITCH),
+	RETAIN_YAW(Relative.YAW),
+	RETAIN_MOVEMENT(Relative.X, Relative.Y, Relative.Z),
+	RETAIN_X(Relative.X),
+	RETAIN_Y(Relative.Y),
+	RETAIN_Z(Relative.Z);
+
+	final TeleportFlag[] teleportFlags;
+
+	SkriptTeleportFlag(TeleportFlag... teleportFlags) {
+		this.teleportFlags = teleportFlags;
+	}
+
+	public TeleportFlag[] getTeleportFlags() {
+		return teleportFlags;
+	}
+
+}
diff --git a/src/main/java/ch/njol/skript/bukkitutil/SoundUtils.java b/src/main/java/ch/njol/skript/bukkitutil/SoundUtils.java
new file mode 100644
index 00000000000..c87309600f8
--- /dev/null
+++ b/src/main/java/ch/njol/skript/bukkitutil/SoundUtils.java
@@ -0,0 +1,68 @@
+package ch.njol.skript.bukkitutil;
+
+import org.bukkit.Keyed;
+import org.bukkit.NamespacedKey;
+import org.bukkit.Registry;
+import org.bukkit.Sound;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.Locale;
+
+/**
+ * Utility class for working with sounds.
+ */
+public final class SoundUtils {
+
+	// Sound.class is an interface (rather than an enum) as of MC 1.21.3
+	private static final boolean SOUND_IS_INTERFACE = Sound.class.isInterface();
+
+	/**
+	 * Gets the key of a sound, given its enum-name-style name.
+	 * @param soundString The enum name to use to find the sound.
+	 * @return The key of the sound.
+	 */
+	@SuppressWarnings("removal")
+	public static @Nullable NamespacedKey getKey(String soundString) {
+		soundString = soundString.toUpperCase(Locale.ENGLISH);
+		if (SOUND_IS_INTERFACE) {
+			try {
+				return Sound.valueOf(soundString).getKey();
+			} catch (Exception ignored) {}
+		} else {
+			try {
+				//noinspection unchecked,rawtypes
+				Enum soundEnum = Enum.valueOf((Class) Sound.class, soundString);
+				return ((Keyed) soundEnum).getKey();
+			} catch (IllegalArgumentException ignored) {}
+		}
+		return NamespacedKey.fromString(soundString.toLowerCase(Locale.ENGLISH));
+	}
+
+	/**
+	 * returns the key string for a sound. For version compat.
+	 * @param sound The sound to get the key string of.
+	 * @return The key string of the {@link NamespacedKey} of the sound.
+	 */
+	@SuppressWarnings("removal")
+	public static @NotNull NamespacedKey getKey(Sound sound) {
+		if (SOUND_IS_INTERFACE) {
+			return sound.getKey();
+		} else {
+			return ((Keyed) sound).getKey();
+		}
+	}
+
+	/**
+	 * Retrieves the sound correlating to the provided {@code soundString}
+	 * @param soundString The string to get the correlating sound
+	 * @return The correlating {@link Sound}
+	 */
+	public static @Nullable Sound getSound(String soundString) {
+		NamespacedKey key = getKey(soundString);
+		if (key == null)
+			return null;
+		return Registry.SOUNDS.get(key);
+	}
+
+}
diff --git a/src/main/java/ch/njol/skript/bukkitutil/WorldUtils.java b/src/main/java/ch/njol/skript/bukkitutil/WorldUtils.java
index b08e464088b..9862eb379c4 100644
--- a/src/main/java/ch/njol/skript/bukkitutil/WorldUtils.java
+++ b/src/main/java/ch/njol/skript/bukkitutil/WorldUtils.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.bukkitutil;
 
 import ch.njol.skript.Skript;
diff --git a/src/main/java/ch/njol/skript/bukkitutil/block/BlockCompat.java b/src/main/java/ch/njol/skript/bukkitutil/block/BlockCompat.java
index f6866b595f7..cd1045b47ec 100644
--- a/src/main/java/ch/njol/skript/bukkitutil/block/BlockCompat.java
+++ b/src/main/java/ch/njol/skript/bukkitutil/block/BlockCompat.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.bukkitutil.block;
 
 import java.util.Map;
diff --git a/src/main/java/ch/njol/skript/bukkitutil/block/BlockSetter.java b/src/main/java/ch/njol/skript/bukkitutil/block/BlockSetter.java
index e428734fe20..bfcdb41854a 100644
--- a/src/main/java/ch/njol/skript/bukkitutil/block/BlockSetter.java
+++ b/src/main/java/ch/njol/skript/bukkitutil/block/BlockSetter.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.bukkitutil.block;
 
 import org.bukkit.Location;
diff --git a/src/main/java/ch/njol/skript/bukkitutil/block/BlockValues.java b/src/main/java/ch/njol/skript/bukkitutil/block/BlockValues.java
index 0cf4e1a3c21..48a338d2174 100644
--- a/src/main/java/ch/njol/skript/bukkitutil/block/BlockValues.java
+++ b/src/main/java/ch/njol/skript/bukkitutil/block/BlockValues.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.bukkitutil.block;
 
 import ch.njol.skript.aliases.MatchQuality;
diff --git a/src/main/java/ch/njol/skript/bukkitutil/block/NewBlockCompat.java b/src/main/java/ch/njol/skript/bukkitutil/block/NewBlockCompat.java
index c20febc95e9..6307a4634cd 100644
--- a/src/main/java/ch/njol/skript/bukkitutil/block/NewBlockCompat.java
+++ b/src/main/java/ch/njol/skript/bukkitutil/block/NewBlockCompat.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.bukkitutil.block;
 
 import ch.njol.skript.Skript;
diff --git a/src/main/java/ch/njol/skript/bukkitutil/sounds/SoundReceiver.java b/src/main/java/ch/njol/skript/bukkitutil/sounds/SoundReceiver.java
index b9533a30142..1885115fd3b 100644
--- a/src/main/java/ch/njol/skript/bukkitutil/sounds/SoundReceiver.java
+++ b/src/main/java/ch/njol/skript/bukkitutil/sounds/SoundReceiver.java
@@ -19,7 +19,7 @@
  */
 public interface SoundReceiver {
 
-	boolean ADVENTURE_API = Skript.classExists("net.kyori.adventure.sound.Sound$Builder");
+	boolean ADVENTURE_API = Skript.classExists("net.kyori.adventure.sound.Sound$Builder") && Skript.methodExists(SoundCategory.class, "soundSource");
 	boolean SPIGOT_SOUND_SEED = Skript.methodExists(Player.class, "playSound", Entity.class, Sound.class, SoundCategory.class, float.class, float.class, long.class);
 	boolean ENTITY_EMITTER_SOUND = Skript.methodExists(Player.class, "playSound", Entity.class, Sound.class, SoundCategory.class, float.class, float.class);
 	boolean ENTITY_EMITTER_STRING = Skript.methodExists(Player.class, "playSound", Entity.class, String.class, SoundCategory.class, float.class, float.class);
diff --git a/src/main/java/ch/njol/skript/classes/AnyInfo.java b/src/main/java/ch/njol/skript/classes/AnyInfo.java
new file mode 100644
index 00000000000..283e0c5189b
--- /dev/null
+++ b/src/main/java/ch/njol/skript/classes/AnyInfo.java
@@ -0,0 +1,40 @@
+package ch.njol.skript.classes;
+
+import ch.njol.skript.lang.util.common.AnyProvider;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.regex.Pattern;
+import java.util.regex.PatternSyntaxException;
+
+/**
+ * A special kind of {@link ClassInfo} for dealing with 'any'-accepting types.
+ * These auto-generate their user patterns (e.g. {@code named} -> {@code any named thing}).
+ *
+ * @see AnyProvider
+ */
+public class AnyInfo<Type extends AnyProvider> extends ClassInfo<Type> {
+
+	/**
+	 * @param c        The class
+	 * @param codeName The name used in patterns
+	 */
+	public AnyInfo(Class<Type> c, String codeName) {
+		super(c, codeName);
+		this.user("(any )?" + codeName + " (thing|object)s?");
+	}
+
+	@Override
+	public ClassInfo<Type> user(String... userInputPatterns) throws PatternSyntaxException {
+		if (this.userInputPatterns == null)
+			return super.user(userInputPatterns);
+		// Allow appending the patterns.
+		List<Pattern> list = new ArrayList<>(List.of(this.userInputPatterns));
+		for (String pattern : userInputPatterns) {
+			list.add(Pattern.compile(pattern));
+		}
+		this.userInputPatterns = list.toArray(new Pattern[0]);
+		return this;
+	}
+
+}
diff --git a/src/main/java/ch/njol/skript/classes/Arithmetic.java b/src/main/java/ch/njol/skript/classes/Arithmetic.java
deleted file mode 100644
index 2365c3a64da..00000000000
--- a/src/main/java/ch/njol/skript/classes/Arithmetic.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
-package ch.njol.skript.classes;
-
-/**
- * Represents arithmetic for certain two types. Multiplication, division and
- * power of methods are optional and may throw UnsupportedOperationExceptions.
- * @param <A> the type of the absolute value
- * @param <R> the type of the relative value
- */
-@Deprecated
-public interface Arithmetic<A, R> {
-	
-	public R difference(A first, A second);
-	
-	public A add(A value, R difference);
-	
-	public A subtract(A value, R difference);
-	
-	public A multiply(A value, R multiplier);
-	
-	public A divide(A value, R divider);
-	
-	public A power(A value, R exponent);
-	
-}
diff --git a/src/main/java/ch/njol/skript/classes/ChainedConverter.java b/src/main/java/ch/njol/skript/classes/ChainedConverter.java
deleted file mode 100644
index 7e560d3dd20..00000000000
--- a/src/main/java/ch/njol/skript/classes/ChainedConverter.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
-package ch.njol.skript.classes;
-
-import org.jetbrains.annotations.Nullable;
-
-import org.skriptlang.skript.lang.converter.Converters;
-
-/**
- * Used to chain convertes to build a single converter. This is automatically created when a new converter is added.
- * 
- * @author Peter Güttinger
- * @param <F> same as Converter's <F> (from)
- * @param <M> the middle type, i.e. the type the first converter converts to and the second converter comverts from.
- * @param <T> same as Converter's <T> (to)
- * @see Converters#registerConverter(Class, Class, Converter)
- * @see Converter
- * @deprecated Use {@link org.skriptlang.skript.lang.converter.Converter}
- */
-@Deprecated
-public final class ChainedConverter<F, M, T> implements Converter<F, T> {
-	
-	private final Converter<? super F, ? extends M> first;
-	private final Converter<? super M, ? extends T> second;
-	
-	public ChainedConverter(final Converter<? super F, ? extends M> first, final Converter<? super M, ? extends T> second) {
-		assert first != null;
-		assert second != null;
-		this.first = first;
-		this.second = second;
-	}
-	
-	@SuppressWarnings("unchecked")
-	public static <F, M, T> ChainedConverter<F, M, T> newInstance(final Converter<? super F, ?> first, final Converter<?, ? extends T> second) {
-		return new ChainedConverter<>((Converter<? super F, ? extends M>) first, (Converter<? super M, ? extends T>) second);
-	}
-	
-	@Override
-	@Nullable
-	public T convert(final F f) {
-		final M m = first.convert(f);
-		if (m == null)
-			return null;
-		return second.convert(m);
-	}
-	
-	@Override
-	public String toString() {
-		return "ChainedConverter{first=" + first + ",second=" + second + "}";
-	}
-}
diff --git a/src/main/java/ch/njol/skript/classes/Changer.java b/src/main/java/ch/njol/skript/classes/Changer.java
index 7c0f2c3e199..74b0040fe15 100644
--- a/src/main/java/ch/njol/skript/classes/Changer.java
+++ b/src/main/java/ch/njol/skript/classes/Changer.java
@@ -1,24 +1,7 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.classes;
 
 import org.bukkit.event.Event;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import ch.njol.skript.classes.data.DefaultChangers;
@@ -29,67 +12,88 @@
  * isn't overridden.
  * <p>
  * Some useful Changers can be found in {@link DefaultChangers}
- * 
- * @author Peter Güttinger
+ *
  * @see DefaultChangers
  * @see Expression
  */
 public interface Changer<T> {
 	
-	public static enum ChangeMode {
+	enum ChangeMode {
 		ADD, SET, REMOVE, REMOVE_ALL, DELETE, RESET;
+
+		public boolean supportsKeyedChange() {
+			return this == SET;
+			// ADD could be supported in future
+		}
+
 	}
-	
+
 	/**
 	 * Tests whether this changer supports the given mode, and if yes what type(s) it expects the elements of <code>delta</code> to be.
 	 * <p>
 	 * Unlike {@link Expression#acceptChange(ChangeMode)} this method must not print errors.
 	 * 
-	 * @param mode
+	 * @param mode The {@link ChangeMode} to test.
 	 * @return An array of types that {@link #change(Object[], Object[], ChangeMode)} accepts as its <code>delta</code> parameter (which can be arrays to denote that multiple of
 	 *         that type are accepted), or null if the given mode is not supported. For {@link ChangeMode#DELETE} and {@link ChangeMode#RESET} this can return any non-null array to
 	 *         mark them as supported.
 	 */
-	@Nullable
-	public abstract Class<?>[] acceptChange(ChangeMode mode);
+	Class<?> @Nullable [] acceptChange(ChangeMode mode);
 	
 	/**
 	 * @param what The objects to change
 	 * @param delta An array with one or more instances of one or more of the the classes returned by {@link #acceptChange(ChangeMode)} for the given change mode (null for
 	 *            {@link ChangeMode#DELETE} and {@link ChangeMode#RESET}). <b>This can be a Object[], thus casting is not allowed.</b>
-	 * @param mode
+	 * @param mode The {@link ChangeMode} to test.
 	 * @throws UnsupportedOperationException (optional) if this method was called on an unsupported ChangeMode.
 	 */
-	public abstract void change(T[] what, @Nullable Object[] delta, ChangeMode mode);
+	void change(T[] what, Object @Nullable [] delta, ChangeMode mode);
 	
-	public static abstract class ChangerUtils {
-		
-		@SuppressWarnings("unchecked")
-		public static <T, V> void change(final Changer<T> changer, final Object[] what, final @Nullable Object[] delta, final ChangeMode mode) {
+	abstract class ChangerUtils {
+
+		public static <T> void change(@NotNull Changer<T> changer, Object[] what, Object @Nullable [] delta, ChangeMode mode) {
+			//noinspection unchecked
 			changer.change((T[]) what, delta, mode);
 		}
 		
 		/**
 		 * Tests whether an expression accepts changes of a certain type. If multiple types are given it test for whether any of the types is accepted.
 		 * 
-		 * @param e The expression to test
+		 * @param expression The expression to test
 		 * @param mode The ChangeMode to use in the test
 		 * @param types The types to test for
-		 * @return Whether <tt>e.{@link Expression#change(Event, Object[], ChangeMode) change}(event, type[], mode)</tt> can be used or not.
+		 * @return Whether <tt>expression.{@link Expression#change(Event, Object[], ChangeMode) change}(event, type[], mode)</tt> can be used or not.
 		 */
-		public static boolean acceptsChange(final Expression<?> e, final ChangeMode mode, final Class<?>... types) {
-			final Class<?>[] cs = e.acceptChange(mode);
-			if (cs == null)
+		public static boolean acceptsChange(@NotNull Expression<?> expression, ChangeMode mode, Class<?>... types) {
+			Class<?>[] validTypes = expression.acceptChange(mode);
+			if (validTypes == null)
 				return false;
-			for (final Class<?> type : types) {
-				for (final Class<?> c : cs) {
-					if (c.isArray() ? c.getComponentType().isAssignableFrom(type) : c.isAssignableFrom(type))
+
+			for (int i = 0; i < validTypes.length; i++) {
+				if (validTypes[i].isArray())
+					validTypes[i] = validTypes[i].getComponentType();
+			}
+
+			return acceptsChangeTypes(validTypes, types);
+		}
+
+		/**
+		 * Tests whether any of the given types is accepted by the given array of valid types.
+		 *
+		 * @param types The types to test for
+		 * @param validTypes The valid types. All array classes should be unwrapped to their component type before calling.
+		 * @return Whether any of the types is accepted by the valid types.
+		 */
+		public static boolean acceptsChangeTypes(Class<?>[] validTypes, Class<?> @NotNull ... types) {
+			for (Class<?> type : types) {
+				for (Class<?> validType : validTypes) {
+					if (validType.isAssignableFrom(type))
 						return true;
 				}
 			}
 			return false;
 		}
-		
+
 	}
 	
 }
diff --git a/src/main/java/ch/njol/skript/classes/ClassInfo.java b/src/main/java/ch/njol/skript/classes/ClassInfo.java
index 2ba7776f61d..41380de7b41 100644
--- a/src/main/java/ch/njol/skript/classes/ClassInfo.java
+++ b/src/main/java/ch/njol/skript/classes/ClassInfo.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.classes;
 
 import ch.njol.skript.SkriptAPIException;
@@ -37,8 +19,6 @@
 import java.util.function.Supplier;
 import java.util.regex.Pattern;
 import java.util.regex.PatternSyntaxException;
-import org.skriptlang.skript.lang.arithmetic.Operator;
-import org.skriptlang.skript.lang.arithmetic.Arithmetics;
 
 /**
  * @author Peter Güttinger
@@ -46,23 +26,22 @@
  */
 @SuppressFBWarnings("DM_STRING_VOID_CTOR")
 public class ClassInfo<T> implements Debuggable {
-	
+
 	private final Class<T> c;
 	private final String codeName;
 	private final Noun name;
-	
+
 	@Nullable
 	private DefaultExpression<T> defaultExpression = null;
-	
+
 	@Nullable
 	private Parser<? extends T> parser = null;
-	
+
 	@Nullable
 	private Cloner<T> cloner = null;
-	
-	@Nullable
-	private Pattern[] userInputPatterns = null;
-	
+
+	Pattern @Nullable [] userInputPatterns = null;
+  
 	@Nullable
 	private Changer<? super T> changer = null;
 
@@ -73,31 +52,25 @@ public class ClassInfo<T> implements Debuggable {
 	private Serializer<? super T> serializer = null;
 	@Nullable
 	private Class<?> serializeAs = null;
-	
-	@Nullable
-	private Arithmetic<? super T, ?> math = null;
+
 	@Nullable
 	private Class<?> mathRelativeType = null;
-	
+
 	@Nullable
 	private String docName = null;
-	@Nullable
-	private String[] description = null;
-	@Nullable
-	private String[] usage = null;
-	@Nullable
-	private String[] examples = null;
+	private String @Nullable [] description = null;
+	private String @Nullable [] usage = null;
+	private String @Nullable [] examples = null;
 	@Nullable
 	private String since = null;
-	@Nullable
-	private String[] requiredPlugins = null;
+	private String @Nullable [] requiredPlugins = null;
 	
 	/**
 	 * Overrides documentation id assigned from class name.
 	 */
 	@Nullable
 	private String documentationId = null;
-	
+
 	/**
 	 * @param c The class
 	 * @param codeName The name used in patterns
@@ -109,21 +82,13 @@ public ClassInfo(final Class<T> c, final String codeName) {
 		this.codeName = codeName;
 		name = new Noun("types." + codeName);
 	}
-	
-	/**
-	 * Incorrect spelling in method name. This will be removed in the future.
-	 */
-	@Deprecated
-	public static boolean isVaildCodeName(final String name) {
-		return isValidCodeName(name);
-	}
-	
+
 	public static boolean isValidCodeName(final String name) {
-		return name.matches("[a-z0-9]+");
+		return name.matches("(?:any-)?[a-z0-9]+");
 	}
-	
+
 	// === FACTORY METHODS ===
-	
+
 	/**
 	 * @param parser A parser to parse values of this class or null if not applicable
 	 */
@@ -132,7 +97,7 @@ public ClassInfo<T> parser(final Parser<? extends T> parser) {
 		this.parser = parser;
 		return this;
 	}
-	
+
 	/**
 	 * @param cloner A {@link Cloner} to clone values when setting variables
 	 *                  or passing function arguments.
@@ -142,7 +107,7 @@ public ClassInfo<T> cloner(Cloner<T> cloner) {
 		this.cloner = cloner;
 		return this;
 	}
-	
+
 	/**
 	 * @param userInputPatterns <u>Regex</u> patterns to match this class, e.g. in the expressions loop-[type], random [type] out of ..., or as command arguments. These patterns
 	 *            must be english and match singular and plural.
@@ -157,7 +122,7 @@ public ClassInfo<T> user(final String... userInputPatterns) throws PatternSyntax
 		}
 		return this;
 	}
-	
+
 	/**
 	 * @param defaultExpression The default (event) value of this class or null if not applicable
 	 * @see EventValueExpression
@@ -205,7 +170,7 @@ public ClassInfo<T> serializer(final Serializer<? super T> serializer) {
 		serializer.register(this);
 		return this;
 	}
-	
+
 	public ClassInfo<T> serializeAs(final Class<?> serializeAs) {
 		assert this.serializeAs == null;
 		if (serializer != null)
@@ -213,41 +178,21 @@ public ClassInfo<T> serializeAs(final Class<?> serializeAs) {
 		this.serializeAs = serializeAs;
 		return this;
 	}
-	
-	@Deprecated
-	public ClassInfo<T> changer(final SerializableChanger<? super T> changer) {
-		return changer((Changer<? super T>) changer);
-	}
-	
+
 	public ClassInfo<T> changer(final Changer<? super T> changer) {
 		assert this.changer == null;
 		this.changer = changer;
 		return this;
 	}
 
-	@Deprecated
-	@SuppressWarnings("unchecked")
-	public <R> ClassInfo<T> math(final Class<R> relativeType, final Arithmetic<? super T, R> math) {
-		assert this.math == null;
-		this.math = math;
-		mathRelativeType = relativeType;
-		Arithmetics.registerOperation(Operator.ADDITION, c, relativeType, (left, right) -> (T) math.add(left, right));
-		Arithmetics.registerOperation(Operator.SUBTRACTION, c, relativeType, (left, right) -> (T) math.subtract(left, right));
-		Arithmetics.registerOperation(Operator.MULTIPLICATION, c, relativeType, (left, right) -> (T) math.multiply(left, right));
-		Arithmetics.registerOperation(Operator.DIVISION, c, relativeType, (left, right) -> (T) math.divide(left, right));
-		Arithmetics.registerOperation(Operator.EXPONENTIATION, c, relativeType, (left, right) -> (T) math.power(left, right));
-		Arithmetics.registerDifference(c, relativeType, math::difference);
-		return this;
-	}
-	
 	/**
 	 * Use this as {@link #name(String)} to suppress warnings about missing documentation.
 	 */
 	public final static String NO_DOC = new String();
-	
+
 	/**
 	 * Only used for Skript's documentation.
-	 * 
+	 *
 	 * @param name
 	 * @return This ClassInfo object
 	 */
@@ -256,10 +201,10 @@ public ClassInfo<T> name(final String name) {
 		this.docName = name;
 		return this;
 	}
-	
+
 	/**
 	 * Only used for Skript's documentation.
-	 * 
+	 *
 	 * @param description
 	 * @return This ClassInfo object
 	 */
@@ -268,10 +213,10 @@ public ClassInfo<T> description(final String... description) {
 		this.description = description;
 		return this;
 	}
-	
+
 	/**
 	 * Only used for Skript's documentation.
-	 * 
+	 *
 	 * @param usage
 	 * @return This ClassInfo object
 	 */
@@ -280,10 +225,10 @@ public ClassInfo<T> usage(final String... usage) {
 		this.usage = usage;
 		return this;
 	}
-	
+
 	/**
 	 * Only used for Skript's documentation.
-	 * 
+	 *
 	 * @param examples
 	 * @return This ClassInfo object
 	 */
@@ -292,10 +237,10 @@ public ClassInfo<T> examples(final String... examples) {
 		this.examples = examples;
 		return this;
 	}
-	
+
 	/**
 	 * Only used for Skript's documentation.
-	 * 
+	 *
 	 * @param since
 	 * @return This ClassInfo object
 	 */
@@ -304,7 +249,7 @@ public ClassInfo<T> since(final String since) {
 		this.since = since;
 		return this;
 	}
-	
+
 	/**
 	 * Other plugin dependencies for this ClassInfo.
 	 *
@@ -318,7 +263,7 @@ public ClassInfo<T> requiredPlugins(final String... pluginNames) {
 		this.requiredPlugins = pluginNames;
 		return this;
 	}
-	
+
 	/**
 	 * Overrides default documentation id, which is assigned from class name.
 	 * This is especially useful for inner classes whose names are useless without
@@ -331,36 +276,36 @@ public ClassInfo<T> documentationId(String id) {
 		this.documentationId = id;
 		return this;
 	}
-	
+
 	// === GETTERS ===
-	
+
 	public Class<T> getC() {
 		return c;
 	}
-	
+
 	public Noun getName() {
 		return name;
 	}
-	
+
 	public String getCodeName() {
 		return codeName;
 	}
-	
+
 	@Nullable
 	public DefaultExpression<T> getDefaultExpression() {
 		return defaultExpression;
 	}
-	
+
 	@Nullable
 	public Parser<? extends T> getParser() {
 		return parser;
 	}
-	
+
 	@Nullable
 	public Cloner<? extends T> getCloner() {
 		return cloner;
 	}
-	
+
 	/**
 	 * Clones the given object using {@link ClassInfo#cloner},
 	 * returning the given object if no {@link Cloner} is registered.
@@ -368,12 +313,28 @@ public Cloner<? extends T> getCloner() {
 	public T clone(T t) {
 		return cloner == null ? t : cloner.clone(t);
 	}
-	
-	@Nullable
-	public Pattern[] getUserInputPatterns() {
+
+	public Pattern @Nullable [] getUserInputPatterns() {
 		return userInputPatterns;
 	}
-	
+
+	/**
+	 * Checks whether the given input matches any of the user input patterns.
+	 *
+	 * @param input The user input string to be checked against the patterns.
+	 * @return true if the input matches any of the patterns, false otherwise.
+	 */
+	public boolean matchesUserInput(String input) {
+		if (userInputPatterns == null)
+			return false;
+		for (Pattern typePattern : userInputPatterns) {
+			if (typePattern.matcher(input).matches()) {
+				return true;
+			}
+		}
+		return false;
+	}
+
 	@Nullable
 	public Changer<? super T> getChanger() {
 		return changer;
@@ -390,50 +351,32 @@ public Supplier<Iterator<T>> getSupplier() {
 	public Serializer<? super T> getSerializer() {
 		return serializer;
 	}
-	
+
 	@Nullable
 	public Class<?> getSerializeAs() {
 		return serializeAs;
 	}
-	
-	@Nullable
-	@Deprecated
-	public Arithmetic<? super T, ?> getMath() {
-		return math;
-	}
 
-	@Nullable
-	@Deprecated
-	public <R> Arithmetic<T, R> getRelativeMath() {
-		return (Arithmetic<T, R>) math;
-	}
-	
-	@Nullable
-	@Deprecated
-	public Class<?> getMathRelativeType() {
-		return mathRelativeType;
-	}
-	
 	@Nullable
 	public String[] getDescription() {
 		return description;
 	}
-	
+
 	@Nullable
 	public String[] getUsage() {
 		return usage;
 	}
-	
+
 	@Nullable
 	public String[] getExamples() {
 		return examples;
 	}
-	
+
 	@Nullable
 	public String getSince() {
 		return since;
 	}
-	
+
 	@Nullable
 	public String getDocName() {
 		return docName;
@@ -443,7 +386,7 @@ public String getDocName() {
 	public String[] getRequiredPlugins() {
 		return requiredPlugins;
 	}
-	
+
 	/**
 	 * Gets overridden documentation id of this this type. If no override has
 	 * been set, null is returned and the caller may try to derive this from
@@ -458,13 +401,13 @@ public String getDocumentationID() {
 	public boolean hasDocs() {
 		return getDocName() != null && !ClassInfo.NO_DOC.equals(getDocName());
 	}
-	
+
 	// === ORDERING ===
-	
+
 	@Nullable
 	private Set<String> before;
 	private final Set<String> after = new HashSet<>();
-	
+
 	/**
 	 * Sets one or more classes that this class should occur before in the class info list. This only affects the order in which classes are parsed if it's unknown of which type
 	 * the parsed string is.
@@ -472,7 +415,7 @@ public boolean hasDocs() {
 	 * Please note that subclasses will always be registered before superclasses, no matter what is defined here or in {@link #after(String...)}.
 	 * <p>
 	 * This list can safely contain classes that may not exist.
-	 * 
+	 *
 	 * @param before
 	 * @return this ClassInfo
 	 */
@@ -481,7 +424,7 @@ public ClassInfo<T> before(final String... before) {
 		this.before = new HashSet<>(Arrays.asList(before));
 		return this;
 	}
-	
+
 	/**
 	 * Sets one or more classes that this class should occur after in the class info list. This only affects the order in which classes are parsed if it's unknown of which type
 	 * the parsed string is.
@@ -489,7 +432,7 @@ public ClassInfo<T> before(final String... before) {
 	 * Please note that subclasses will always be registered before superclasses, no matter what is defined here or in {@link #before(String...)}.
 	 * <p>
 	 * This list can safely contain classes that may not exist.
-	 * 
+	 *
 	 * @param after
 	 * @return this ClassInfo
 	 */
@@ -497,7 +440,7 @@ public ClassInfo<T> after(final String... after) {
 		this.after.addAll(Arrays.asList(after));
 		return this;
 	}
-	
+
 	/**
 	 * @return Set of classes that should be after this one. May return null.
 	 */
@@ -505,26 +448,26 @@ public ClassInfo<T> after(final String... after) {
 	public Set<String> before() {
 		return before;
 	}
-	
+
 	/**
 	 * @return Set of classes that should be before this one. Never returns null.
 	 */
 	public Set<String> after() {
 		return after;
 	}
-	
+
 	// === GENERAL ===
-	
+
 	@Override
 	@NotNull
 	public String toString() {
 		return getName().getSingular();
 	}
-	
+
 	public String toString(final int flags) {
 		return getName().toString(flags);
 	}
-	
+
 	@Override
 	@NotNull
 	public String toString(final @Nullable Event event, final boolean debug) {
@@ -532,5 +475,5 @@ public String toString(final @Nullable Event event, final boolean debug) {
 			return codeName + " (" + c.getCanonicalName() + ")";
 		return getName().getSingular();
 	}
-	
+
 }
diff --git a/src/main/java/ch/njol/skript/classes/Cloner.java b/src/main/java/ch/njol/skript/classes/Cloner.java
index 4625980496a..f68fa24b193 100644
--- a/src/main/java/ch/njol/skript/classes/Cloner.java
+++ b/src/main/java/ch/njol/skript/classes/Cloner.java
@@ -1,29 +1,12 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.classes;
 
 /**
  * An interface for optionally cloning an object,
  * should return the given object if no cloning is required.
  */
+@FunctionalInterface
 public interface Cloner<T> {
-	
+
 	T clone(T t);
-	
+
 }
diff --git a/src/main/java/ch/njol/skript/classes/Comparator.java b/src/main/java/ch/njol/skript/classes/Comparator.java
deleted file mode 100644
index ae71dd3c8de..00000000000
--- a/src/main/java/ch/njol/skript/classes/Comparator.java
+++ /dev/null
@@ -1,236 +0,0 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
-package ch.njol.skript.classes;
-
-/**
- * Used to compare two objects of a different or the same type.
- * @deprecated Use {@link org.skriptlang.skript.lang.comparator.Comparators}
- */
-@Deprecated
-public interface Comparator<T1, T2> {
-
-	/**
-	 * represents a relation between two objects.
-	 */
-	@Deprecated
-	public static enum Relation {
-		EQUAL, NOT_EQUAL, GREATER, GREATER_OR_EQUAL, SMALLER, SMALLER_OR_EQUAL;
-
-		/**
-		 * Returns EQUAL for true or NOT_EQUAL for false
-		 *
-		 * @param b
-		 * @return <tt>b ? Relation.EQUAL : Relation.NOT_EQUAL</tt>
-		 */
-		public static Relation get(final boolean b) {
-			return b ? Relation.EQUAL : Relation.NOT_EQUAL;
-		}
-
-		/**
-		 * Gets a Relation from a difference: If i is 0, EQUAL is returned, if i is greater than 0, GREATER is returned, otherwise SMALLER.
-		 *
-		 * @param i
-		 * @return <tt>i == 0 ? Relation.EQUAL : i > 0 ? Relation.GREATER : Relation.SMALLER</tt>
-		 */
-		public static Relation get(final int i) {
-			return i == 0 ? Relation.EQUAL : i > 0 ? Relation.GREATER : Relation.SMALLER;
-		}
-
-		/**
-		 * Gets a Relation from a difference: If d is 0, EQUAL is returned, if d is greater than 0, GREATER is returned, otherwise SMALLER.
-		 *
-		 * @param d
-		 * @return <tt>d == 0 ? Relation.EQUAL : d > 0 ? Relation.GREATER : Relation.SMALLER</tt>
-		 */
-		public static Relation get(final double d) {
-			return d == 0 ? Relation.EQUAL : d > 0 ? Relation.GREATER : Relation.SMALLER;
-		}
-
-		/**
-		 * Test whether this relation is fulfilled if another is, i.e. if the parameter relation fulfils <code>X rel Y</code>, then this relation fulfils <code>X rel Y</code> as
-		 * well.
-		 *
-		 * @param other
-		 * @return Whether this relation is part of the given relation, e.g. <code>GREATER_OR_EQUAL.is(EQUAL)</code> returns true.
-		 */
-		public boolean is(final Relation other) {
-			if (other == this)
-				return true;
-			switch (this) {
-				case EQUAL:
-					return false;
-				case NOT_EQUAL:
-					return other == SMALLER || other == GREATER;
-				case GREATER:
-					return false;
-				case GREATER_OR_EQUAL:
-					return other == GREATER || other == EQUAL;
-				case SMALLER:
-					return false;
-				case SMALLER_OR_EQUAL:
-					return other == SMALLER || other == EQUAL;
-			}
-			assert false;
-			return false;
-		}
-
-		/**
-		 * Returns this relation's string representation, which is similar to "equal to" or "greater than".
-		 */
-		@Override
-		public String toString() {
-			switch (this) {
-				case EQUAL:
-					return "equal to";
-				case NOT_EQUAL:
-					return "not equal to";
-				case GREATER:
-					return "greater than";
-				case GREATER_OR_EQUAL:
-					return "greater than or equal to";
-				case SMALLER:
-					return "smaller than";
-				case SMALLER_OR_EQUAL:
-					return "smaller than or equal to";
-			}
-			assert false;
-			return "";
-		}
-
-		/**
-		 * Gets the inverse of this relation, i.e if this relation fulfils <code>X rel Y</code>, then the returned relation fulfils <code>!(X rel Y)</code>.
-		 *
-		 * @return !this
-		 */
-		public Relation getInverse() {
-			switch (this) {
-				case EQUAL:
-					return NOT_EQUAL;
-				case NOT_EQUAL:
-					return EQUAL;
-				case GREATER:
-					return SMALLER_OR_EQUAL;
-				case GREATER_OR_EQUAL:
-					return SMALLER;
-				case SMALLER:
-					return GREATER_OR_EQUAL;
-				case SMALLER_OR_EQUAL:
-					return GREATER;
-			}
-			assert false;
-			return NOT_EQUAL;
-		}
-
-		/**
-		 * Gets the relation which has switched arguments, i.e. if this relation fulfils <code>X rel Y</code>, then the returned relation fulfils <code>Y rel X</code>.
-		 *
-		 * @return siht
-		 */
-		public Relation getSwitched() {
-			switch (this) {
-				case EQUAL:
-					return EQUAL;
-				case NOT_EQUAL:
-					return NOT_EQUAL;
-				case GREATER:
-					return SMALLER;
-				case GREATER_OR_EQUAL:
-					return SMALLER_OR_EQUAL;
-				case SMALLER:
-					return GREATER;
-				case SMALLER_OR_EQUAL:
-					return GREATER_OR_EQUAL;
-			}
-			assert false;
-			return NOT_EQUAL;
-		}
-
-		public boolean isEqualOrInverse() {
-			return this == Relation.EQUAL || this == Relation.NOT_EQUAL;
-		}
-
-		public int getRelation() {
-			switch (this) {
-				case EQUAL:
-				case NOT_EQUAL:
-					return 0;
-				case GREATER:
-				case GREATER_OR_EQUAL:
-					return 1;
-				case SMALLER:
-				case SMALLER_OR_EQUAL:
-					return -1;
-			}
-			assert false;
-			return 0;
-		}
-	}
-
-	/**
-	 * holds information about a comparator.
-	 *
-	 * @param <T1> see {@link Comparator}
-	 * @param <T2> dito
-	 */
-	@Deprecated
-	public static class ComparatorInfo<T1, T2> {
-
-		public Class<T1> c1;
-		public Class<T2> c2;
-		public Comparator<T1, T2> c;
-
-		public ComparatorInfo(final Class<T1> c1, final Class<T2> c2, final Comparator<T1, T2> c) {
-			this.c1 = c1;
-			this.c2 = c2;
-			this.c = c;
-		}
-
-		public Class<?> getType(final boolean first) {
-			return first ? c1 : c2;
-		}
-
-	}
-
-	Comparator<?, ?> equalsComparator = new Comparator<Object, Object>() {
-		@Override
-		public Relation compare(final Object o1, final Object o2) {
-			return Relation.get(o1.equals(o2));
-		}
-
-		@Override
-		public boolean supportsOrdering() {
-			return false;
-		}
-	};
-
-	/**
-	 * Compares the given objects which may not be null. Returning GREATER/SMALLER means that the first parameter is greater/smaller.
-	 *
-	 * @param o1 Non-null object
-	 * @param o2 Non-null object
-	 * @return the relation of the objects. Should neither return GREATER_OR_EQUAL nor SMALLER_OR_EQUAL.
-	 */
-	public Relation compare(T1 o1, T2 o2);
-
-	/**
-	 * @return whether this comparator supports ordering of elements or not.
-	 */
-	public boolean supportsOrdering();
-
-}
diff --git a/src/main/java/ch/njol/skript/classes/ConfigurationSerializer.java b/src/main/java/ch/njol/skript/classes/ConfigurationSerializer.java
index b70d843ba7a..de0491c1b62 100644
--- a/src/main/java/ch/njol/skript/classes/ConfigurationSerializer.java
+++ b/src/main/java/ch/njol/skript/classes/ConfigurationSerializer.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.classes;
 
 import java.io.NotSerializableException;
diff --git a/src/main/java/ch/njol/skript/classes/Converter.java b/src/main/java/ch/njol/skript/classes/Converter.java
index abb6399dacb..3bf628cf2c0 100644
--- a/src/main/java/ch/njol/skript/classes/Converter.java
+++ b/src/main/java/ch/njol/skript/classes/Converter.java
@@ -1,191 +1,53 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.classes;
 
-import ch.njol.skript.lang.Debuggable;
-import ch.njol.skript.registrations.Classes;
-import org.bukkit.event.Event;
+import ch.njol.skript.command.Commands;
+import ch.njol.skript.util.Utils;
 import org.jetbrains.annotations.Nullable;
-import org.skriptlang.skript.lang.converter.Converters;
-
-import java.util.Arrays;
-import java.util.stream.Collectors;
 
 /**
- * Converts data from type to another.
- * 
- * @param <F> The accepted type of objects to convert <b>f</b>rom
- * @param <T> The type to convert <b>t</b>o
- * @see Converters#registerConverter(Class, Class, Converter)
+ * <h2>WARNING! This class has been removed in this update.</h2>
+ * This class stub has been left behind to prevent loading errors from outdated addons,
+ * but its functionality has been largely removed.
+ *
  * @deprecated Use {@link org.skriptlang.skript.lang.converter.Converter}
  */
-@Deprecated
-public interface Converter<F, T> {
-	
-	/**
-	 * Disallow other converters from being chained to this.
-	 */
-	public final static int NO_LEFT_CHAINING = 1;
-	
-	/**
-	 * Disallow chaining this with other converters.
-	 */
-	public final static int NO_RIGHT_CHAINING = 2;
-	
-	/**
-	 * Disallow all chaining.
-	 */
-	public final static int NO_CHAINING = NO_LEFT_CHAINING | NO_RIGHT_CHAINING;
-	
-	public final static int NO_COMMAND_ARGUMENTS = 4;
-	
-	/**
-	 * holds information about a converter
-	 * 
-	 * @author Peter Güttinger
-	 * @param <F> same as in {@link Converter}
-	 * @param <T> dito
-	 */
-	public final static class ConverterInfo<F, T> implements Debuggable {
-		
-		public final Class<F> from;
-		public final Class<T> to;
-		public final Converter<F, T> converter;
-		public final int options;
-		
-		/**
-		 * Chain of types this converter will go through from right to left.
-		 * For normal converters, contains from at 0 and to at 1. For chained
-		 * converters, chains of first and second converter are concatenated
-		 * together.
-		 */
-		private final Class<?>[] chain;
-		
-		public ConverterInfo(Class<F> from, Class<T> to, Converter<F, T> converter, int options) {
-			this.from = from;
-			this.to = to;
-			this.converter = converter;
-			this.options = options;
-			this.chain = new Class[] {from, to};
-		}
-		
-		@SuppressWarnings("unchecked")
-		public ConverterInfo(ConverterInfo<?,?> first, ConverterInfo<?,?> second, Converter<F, T> converter, int options) {
-			this.from = (Class<F>) first.from;
-			this.to = (Class<T>) second.to;
-			this.converter = converter;
-			this.options = options;
-			this.chain = new Class[first.chain.length + second.chain.length];
-			System.arraycopy(first.chain, 0, chain, 0, first.chain.length);
-			System.arraycopy(second.chain, 0, chain, first.chain.length, second.chain.length);
-		}
+@Deprecated(forRemoval = true)
+public interface Converter<F, T> extends org.skriptlang.skript.lang.converter.Converter<F, T> {
 
-		@Override
-		public String toString(@Nullable Event event, boolean debug) {
-			if (debug) {
-				String str = Arrays.stream(chain).map(c -> Classes.getExactClassName(c)).collect(Collectors.joining(" -> "));
-				assert str != null;
-				return str;
-			}
-			return Classes.getExactClassName(from) + " to " + Classes.getExactClassName(to);
-		}
-		
-	}
-	
-	/**
-	 * Converts an object from the given to the desired type.
-	 * 
-	 * @param f The object to convert.
-	 * @return the converted object
-	 */
-	@Nullable
-	public T convert(F f);
-	
-	public final static class ConverterUtils {
-		
-		public static <F, T> Converter<?, T> createInstanceofConverter(final ConverterInfo<F, T> conv) {
-			return createInstanceofConverter(conv.from, conv.converter);
-		}
-		
-		public static <F, T> Converter<?, T> createInstanceofConverter(final Class<F> from, final Converter<F, T> conv) {
-			return new Converter<Object, T>() {
-				@SuppressWarnings("unchecked")
-				@Override
-				@Nullable
-				public T convert(final Object o) {
-					if (!from.isInstance(o))
-						return null;
-					return conv.convert((F) o);
-				}
-			};
-		}
-		
-		/**
-		 * Wraps a converter in a filter that will only accept conversion
-		 * results of given type. All other results are replaced with nulls.
-		 * @param conv Converter to wrap.
-		 * @param to Accepted return type of the converter.
-		 * @return The wrapped converter.
-		 */
-		public static <F, T> Converter<F, T> createInstanceofConverter(final Converter<F, ?> conv, final Class<T> to) {
-			return new Converter<F, T>() {
-				@SuppressWarnings("unchecked")
-				@Override
-				@Nullable
-				public T convert(final F f) {
-					final Object o = conv.convert(f);
-					if (to.isInstance(o))
-						return (T) o;
-					return null;
-				}
-			};
+	// Interfaces don't have a <clinit> so we trigger the warning notice with this
+	int $_WARNING = Utils.loadedRemovedClassWarning(Converter.class);
+
+	@Deprecated(forRemoval = true)
+	int NO_LEFT_CHAINING = org.skriptlang.skript.lang.converter.Converter.NO_LEFT_CHAINING;
+	@Deprecated(forRemoval = true)
+	int NO_RIGHT_CHAINING = org.skriptlang.skript.lang.converter.Converter.NO_RIGHT_CHAINING;
+	@Deprecated(forRemoval = true)
+	int NO_CHAINING = NO_LEFT_CHAINING | NO_RIGHT_CHAINING;
+	@Deprecated(forRemoval = true)
+	int NO_COMMAND_ARGUMENTS = Commands.CONVERTER_NO_COMMAND_ARGUMENTS;
+
+	@Deprecated(forRemoval = true)
+	@Nullable T convert(F f);
+
+	@Deprecated(forRemoval = true)
+	final class ConverterUtils {
+
+		@Deprecated(forRemoval = true)
+		public static <F, T> Converter<?, T> createInstanceofConverter(Class<F> from, Converter<F, T> conv) {
+			throw new UnsupportedOperationException();
 		}
-		
-		public static <F, T> Converter<?, T> createDoubleInstanceofConverter(final ConverterInfo<F, ?> conv, final Class<T> to) {
-			return createDoubleInstanceofConverter(conv.from, conv.converter, to);
+
+		@Deprecated(forRemoval = true)
+		public static <F, T> Converter<F, T> createInstanceofConverter(Converter<F, ?> conv, Class<T> to) {
+			throw new UnsupportedOperationException();
 		}
-		
-		/**
-		 * Wraps a converter. When values given to the wrapper converter are
-		 * not of accepted type, it will not be called; instead, a null is
-		 * returned. When it returns a value that is not of accepted type, the
-		 * wrapped converter will return null instead.
-		 * @param from Accepted type of input.
-		 * @param conv Converter to wrap.
-		 * @param to Accepted type of output.
-		 * @return A wrapped converter.
-		 */
-		public static <F, T> Converter<?, T> createDoubleInstanceofConverter(final Class<F> from, final Converter<F, ?> conv, final Class<T> to) {
-			return new Converter<Object, T>() {
-				@SuppressWarnings("unchecked")
-				@Override
-				@Nullable
-				public T convert(final Object o) {
-					if (!from.isInstance(o))
-						return null;
-					final Object o2 = conv.convert((F) o);
-					if (to.isInstance(o2))
-						return (T) o2;
-					return null;
-				}
-			};
+
+		@Deprecated(forRemoval = true)
+		public static <F, T> Converter<?, T>
+		createDoubleInstanceofConverter(Class<F> from, Converter<F, ?> conv, Class<T> to) {
+			throw new UnsupportedOperationException();
 		}
-		
+
 	}
+
 }
diff --git a/src/main/java/ch/njol/skript/classes/EnumClassInfo.java b/src/main/java/ch/njol/skript/classes/EnumClassInfo.java
index e644d967d19..61c3ec1a638 100644
--- a/src/main/java/ch/njol/skript/classes/EnumClassInfo.java
+++ b/src/main/java/ch/njol/skript/classes/EnumClassInfo.java
@@ -1,28 +1,15 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.classes;
 
 import ch.njol.skript.expressions.base.EventValueExpression;
 import ch.njol.skript.lang.DefaultExpression;
 import ch.njol.skript.lang.ParseContext;
 import ch.njol.skript.util.EnumUtils;
+import ch.njol.skript.util.StringMode;
+import ch.njol.util.coll.iterator.ArrayIterator;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
+import org.skriptlang.skript.lang.comparator.Comparators;
+import org.skriptlang.skript.lang.comparator.Relation;
 
 /**
  * This class can be used for an easier writing of ClassInfos that are enums,
@@ -33,43 +20,66 @@
 public class EnumClassInfo<T extends Enum<T>> extends ClassInfo<T> {
 
 	/**
-	 * @param c The class
+	 * @param enumClass The class
+	 * @param codeName The name used in patterns
+	 * @param languageNode The language node of the type
+	 */
+	public EnumClassInfo(Class<T> enumClass, String codeName, String languageNode) {
+		this(enumClass, codeName, languageNode, new EventValueExpression<>(enumClass), true);
+	}
+
+	/**
+	 * @param enumClass The class
 	 * @param codeName The name used in patterns
 	 * @param languageNode The language node of the type
+	 * @param registerComparator Whether a default comparator should be registered for this enum's classinfo
+	 */
+	public EnumClassInfo(Class<T> enumClass, String codeName, String languageNode, boolean registerComparator) {
+		this(enumClass, codeName, languageNode, new EventValueExpression<>(enumClass), registerComparator);
+	}
+
+	/**
+	 * @param enumClass The class
+	 * @param codeName The name used in patterns
+	 * @param languageNode The language node of the type
+	 * @param defaultExpression The default expression of the type
 	 */
-	public EnumClassInfo(Class<T> c, String codeName, String languageNode) {
-		this(c, codeName, languageNode, new EventValueExpression<>(c));
+	public EnumClassInfo(Class<T> enumClass, String codeName, String languageNode, DefaultExpression<T> defaultExpression) {
+		this(enumClass, codeName, languageNode, defaultExpression, true);
 	}
 
 	/**
-	 * @param c The class
+	 * @param enumClass The class
 	 * @param codeName The name used in patterns
 	 * @param languageNode The language node of the type
 	 * @param defaultExpression The default expression of the type
+	 * @param registerComparator Whether a default comparator should be registered for this enum's classinfo
 	 */
-	public EnumClassInfo(Class<T> c, String codeName, String languageNode, DefaultExpression<T> defaultExpression) {
-		super(c, codeName);
-		EnumUtils<T> enumUtils = new EnumUtils<>(c, languageNode);
+	public EnumClassInfo(Class<T> enumClass, String codeName, String languageNode, DefaultExpression<T> defaultExpression, boolean registerComparator) {
+		super(enumClass, codeName);
+		EnumUtils<T> enumUtils = new EnumUtils<>(enumClass, languageNode);
 		usage(enumUtils.getAllNames())
-			.serializer(new EnumSerializer<>(c))
+			.serializer(new EnumSerializer<>(enumClass))
 			.defaultExpression(defaultExpression)
+			.supplier(() -> new ArrayIterator<>(enumClass.getEnumConstants()))
 			.parser(new Parser<T>() {
 				@Override
-				@Nullable
-				public T parse(String s, ParseContext context) {
-					return enumUtils.parse(s);
+				public @Nullable T parse(String input, ParseContext context) {
+					return enumUtils.parse(input);
 				}
 
 				@Override
-				public String toString(T o, int flags) {
-					return enumUtils.toString(o, flags);
+				public @NotNull String toString(T constant, int flags) {
+					return enumUtils.toString(constant, StringMode.MESSAGE);
 				}
 
 				@Override
-				public String toVariableNameString(T o) {
-					return o.name();
+				public @NotNull String toVariableNameString(T constant) {
+					return enumUtils.toString(constant, StringMode.VARIABLE_NAME);
 				}
 			});
+		if (registerComparator)
+			Comparators.registerComparator(enumClass, enumClass, (o1, o2) -> Relation.get(o1.ordinal() - o2.ordinal()));
 	}
 
 }
diff --git a/src/main/java/ch/njol/skript/classes/EnumSerializer.java b/src/main/java/ch/njol/skript/classes/EnumSerializer.java
index 812ec4491b4..a4440e5e192 100644
--- a/src/main/java/ch/njol/skript/classes/EnumSerializer.java
+++ b/src/main/java/ch/njol/skript/classes/EnumSerializer.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.classes;
 
 import java.io.StreamCorruptedException;
diff --git a/src/main/java/ch/njol/skript/classes/InverseComparator.java b/src/main/java/ch/njol/skript/classes/InverseComparator.java
deleted file mode 100644
index dc9ccf5f003..00000000000
--- a/src/main/java/ch/njol/skript/classes/InverseComparator.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
-package ch.njol.skript.classes;
-
-/**
- * @author Peter Güttinger
- * @deprecated This class is no longer exposed in newer versions. It should not be used or referenced.
- */
-@Deprecated
-public class InverseComparator<T1, T2> implements Comparator<T1, T2> {
-
-	private final Comparator<? super T2, ? super T1> comp;
-
-	public InverseComparator(final Comparator<? super T2, ? super T1> c) {
-		comp = c;
-	}
-
-	@Override
-	public Relation compare(final T1 o1, final T2 o2) {
-		return comp.compare(o2, o1).getSwitched();
-	}
-
-	@Override
-	public boolean supportsOrdering() {
-		return comp.supportsOrdering();
-	}
-
-	@Override
-	public String toString() {
-		return "InverseComparator(" + comp + ")";
-	}
-
-}
diff --git a/src/main/java/ch/njol/skript/classes/NumberArithmetic.java b/src/main/java/ch/njol/skript/classes/NumberArithmetic.java
deleted file mode 100644
index 71c035ebd7d..00000000000
--- a/src/main/java/ch/njol/skript/classes/NumberArithmetic.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
-package ch.njol.skript.classes;
-
-/**
- * @author Peter Güttinger
- */
-@Deprecated
-public class NumberArithmetic implements Arithmetic<Number, Number> {
-	
-	@Override
-	public Number difference(final Number first, final Number second) {
-		double result = Math.abs(first.doubleValue() - second.doubleValue());
-		if (result == (long) result)
-			return (long) result;
-		return result;
-	}
-	
-	@Override
-	public Number add(final Number value, final Number difference) {
-		double result = value.doubleValue() + difference.doubleValue();
-		if (result == (long) result)
-			return (long) result;
-		return result;
-	}
-	
-	@Override
-	public Number subtract(final Number value, final Number difference) {
-		double result = value.doubleValue() - difference.doubleValue();
-		if (result == (long) result)
-			return (long) result;
-		return result;
-	}
-
-	@Override
-	public Number multiply(Number value, Number multiplier) {
-		double result = value.doubleValue() * multiplier.doubleValue();
-		if (result == (long) result)
-			return (long) result;
-		return result;
-	}
-
-	@Override
-	public Number divide(Number value, Number divider) {
-		double result = value.doubleValue() / divider.doubleValue();
-		if (result == (long) result)
-			return (long) result;
-		return result;
-	}
-
-	@Override
-	public Number power(Number value, Number exponent) {
-		double result = Math.pow(value.doubleValue(), exponent.doubleValue());
-		if (result == (long) result)
-			return (long) result;
-		return result;
-	}
-	
-}
diff --git a/src/main/java/ch/njol/skript/classes/Parser.java b/src/main/java/ch/njol/skript/classes/Parser.java
index 9060a36b430..16f85792571 100644
--- a/src/main/java/ch/njol/skript/classes/Parser.java
+++ b/src/main/java/ch/njol/skript/classes/Parser.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.classes;
 
 import org.jetbrains.annotations.Nullable;
diff --git a/src/main/java/ch/njol/skript/classes/SerializableChanger.java b/src/main/java/ch/njol/skript/classes/SerializableChanger.java
deleted file mode 100644
index 2bbbc86e44b..00000000000
--- a/src/main/java/ch/njol/skript/classes/SerializableChanger.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
-package ch.njol.skript.classes;
-
-/**
- * @author Peter Güttinger
- */
-@Deprecated
-public interface SerializableChanger<T> extends Changer<T> {}
diff --git a/src/main/java/ch/njol/skript/classes/SerializableChecker.java b/src/main/java/ch/njol/skript/classes/SerializableChecker.java
index 3b7d4e3643f..ce5e8a66c8f 100644
--- a/src/main/java/ch/njol/skript/classes/SerializableChecker.java
+++ b/src/main/java/ch/njol/skript/classes/SerializableChecker.java
@@ -1,27 +1,13 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.classes;
 
-import ch.njol.util.Checker;
+import org.jetbrains.annotations.ApiStatus;
+
+import java.util.function.Predicate;
 
 /**
- * @author Peter Güttinger
+ * @deprecated use {@link Predicate}
  */
-@Deprecated
-public interface SerializableChecker<T> extends Checker<T> {}
+@FunctionalInterface
+@Deprecated(forRemoval = true)
+@SuppressWarnings("removal")
+public interface SerializableChecker<T> extends ch.njol.util.Checker<T>, Predicate<T> {}
diff --git a/src/main/java/ch/njol/skript/classes/SerializableGetter.java b/src/main/java/ch/njol/skript/classes/SerializableGetter.java
deleted file mode 100644
index 0dbd5c2098b..00000000000
--- a/src/main/java/ch/njol/skript/classes/SerializableGetter.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
-package ch.njol.skript.classes;
-
-import ch.njol.skript.util.Getter;
-
-/**
- * @author Peter Güttinger
- */
-@Deprecated
-public abstract class SerializableGetter<R, A> extends Getter<R, A> {}
diff --git a/src/main/java/ch/njol/skript/classes/Serializer.java b/src/main/java/ch/njol/skript/classes/Serializer.java
index 64b9375e27a..aec12090692 100644
--- a/src/main/java/ch/njol/skript/classes/Serializer.java
+++ b/src/main/java/ch/njol/skript/classes/Serializer.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.classes;
 
 import java.io.NotSerializableException;
diff --git a/src/main/java/ch/njol/skript/classes/VectorArithmethic.java b/src/main/java/ch/njol/skript/classes/VectorArithmethic.java
deleted file mode 100644
index 5bdac60af9a..00000000000
--- a/src/main/java/ch/njol/skript/classes/VectorArithmethic.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
-package ch.njol.skript.classes;
-
-import org.bukkit.util.Vector;
-
-/**
- * @author bi0qaw
- */
-@Deprecated
-public class VectorArithmethic implements Arithmetic<Vector, Vector> {
-	
-	@Override
-	public Vector difference(final Vector first, final Vector second) {
-		return new Vector(Math.abs(first.getX() - second.getX()), Math.abs(first.getY() - second.getY()), Math.abs(first.getZ() - second.getZ()));
-	}
-	
-	@Override
-	public Vector add(final Vector value, final Vector difference) {
-		return new Vector().add(value).add(difference);
-	}
-	
-	@Override
-	public Vector subtract(Vector value, Vector difference) {
-		return new Vector().add(value).subtract(difference);
-	}
-
-	@Override
-	public Vector multiply(Vector value, Vector multiplier) {
-		return value.clone().multiply(multiplier);
-	}
-
-	@Override
-	public Vector divide(Vector value, Vector divider) {
-		return value.clone().divide(divider);
-	}
-
-	@Override
-	public Vector power(Vector value, Vector exponent) {
-		return new Vector(Math.pow(value.getX(), exponent.getX()), Math.pow(value.getY(), exponent.getY()), Math.pow(value.getZ(), exponent.getZ()));
-	}
-}
diff --git a/src/main/java/ch/njol/skript/classes/YggdrasilSerializer.java b/src/main/java/ch/njol/skript/classes/YggdrasilSerializer.java
index 5fab3d52342..5add92542c0 100644
--- a/src/main/java/ch/njol/skript/classes/YggdrasilSerializer.java
+++ b/src/main/java/ch/njol/skript/classes/YggdrasilSerializer.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.classes;
 
 import java.io.NotSerializableException;
diff --git a/src/main/java/ch/njol/skript/classes/data/BukkitClasses.java b/src/main/java/ch/njol/skript/classes/data/BukkitClasses.java
index 98d072893ce..c6b17abb6d2 100644
--- a/src/main/java/ch/njol/skript/classes/data/BukkitClasses.java
+++ b/src/main/java/ch/njol/skript/classes/data/BukkitClasses.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.classes.data;
 
 import ch.njol.skript.Skript;
@@ -23,15 +5,13 @@
 import ch.njol.skript.aliases.Aliases;
 import ch.njol.skript.aliases.ItemType;
 import ch.njol.skript.bukkitutil.BukkitUtils;
-import ch.njol.skript.bukkitutil.EnchantmentUtils;
+import ch.njol.skript.bukkitutil.EntityUtils;
+import ch.njol.skript.bukkitutil.SkriptTeleportFlag;
 import ch.njol.skript.bukkitutil.ItemUtils;
-import ch.njol.skript.classes.ClassInfo;
-import ch.njol.skript.classes.ConfigurationSerializer;
-import ch.njol.skript.classes.EnumClassInfo;
-import ch.njol.skript.classes.Parser;
-import ch.njol.skript.classes.Serializer;
+import ch.njol.skript.classes.*;
 import ch.njol.skript.classes.registry.RegistryClassInfo;
 import ch.njol.skript.entity.EntityData;
+import ch.njol.skript.entity.WolfData;
 import ch.njol.skript.expressions.ExprDamageCause;
 import ch.njol.skript.expressions.base.EventValueExpression;
 import ch.njol.skript.lang.ParseContext;
@@ -44,50 +24,35 @@
 import ch.njol.util.StringUtils;
 import ch.njol.yggdrasil.Fields;
 import io.papermc.paper.world.MoonPhase;
-import org.bukkit.Bukkit;
-import org.bukkit.Chunk;
-import org.bukkit.Difficulty;
-import org.bukkit.FireworkEffect;
-import org.bukkit.GameMode;
-import org.bukkit.GameRule;
-import org.bukkit.Location;
-import org.bukkit.Material;
-import org.bukkit.OfflinePlayer;
-import org.bukkit.Registry;
-import org.bukkit.SoundCategory;
-import org.bukkit.World;
+import org.bukkit.*;
 import org.bukkit.World.Environment;
 import org.bukkit.attribute.Attribute;
 import org.bukkit.block.Biome;
 import org.bukkit.block.Block;
 import org.bukkit.block.BlockState;
 import org.bukkit.block.DoubleChest;
+import org.bukkit.block.banner.PatternType;
 import org.bukkit.block.data.BlockData;
 import org.bukkit.command.CommandSender;
 import org.bukkit.enchantments.Enchantment;
 import org.bukkit.enchantments.EnchantmentOffer;
-import org.bukkit.entity.Cat;
-import org.bukkit.entity.Entity;
-import org.bukkit.entity.Item;
-import org.bukkit.entity.LivingEntity;
+import org.bukkit.entity.*;
 import org.bukkit.entity.Panda.Gene;
-import org.bukkit.entity.Player;
-import org.bukkit.entity.Projectile;
 import org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason;
 import org.bukkit.event.entity.EntityDamageEvent.DamageCause;
+import org.bukkit.event.entity.EntityPotionEffectEvent;
 import org.bukkit.event.entity.EntityRegainHealthEvent.RegainReason;
 import org.bukkit.event.entity.EntityTransformEvent.TransformReason;
+import org.bukkit.event.entity.EntityUnleashEvent;
 import org.bukkit.event.inventory.ClickType;
 import org.bukkit.event.inventory.InventoryAction;
 import org.bukkit.event.inventory.InventoryCloseEvent;
 import org.bukkit.event.inventory.InventoryType;
+import org.bukkit.event.player.PlayerExpCooldownChangeEvent.ChangeReason;
 import org.bukkit.event.player.PlayerQuitEvent.QuitReason;
 import org.bukkit.event.player.PlayerResourcePackStatusEvent.Status;
 import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
-import org.bukkit.inventory.BlockInventoryHolder;
-import org.bukkit.inventory.Inventory;
-import org.bukkit.inventory.InventoryHolder;
-import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.*;
 import org.bukkit.metadata.Metadatable;
 import org.bukkit.potion.PotionEffect;
 import org.bukkit.potion.PotionEffectType;
@@ -96,19 +61,12 @@
 import org.jetbrains.annotations.Nullable;
 
 import java.io.StreamCorruptedException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Locale;
+import java.util.*;
 import java.util.Map.Entry;
-import java.util.UUID;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
-/**
- * @author Peter Güttinger
- */
 public class BukkitClasses {
 
 	public BukkitClasses() {}
@@ -154,12 +112,12 @@ public Entity parse(final String s, final ParseContext context) {
 						}
 						return null;
 					}
-					
+
 					@Override
 					public boolean canParse(final ParseContext context) {
 						return context == ParseContext.COMMAND || context == ParseContext.PARSE;
 					}
-					
+
 					@Override
 					public String toVariableNameString(final Entity e) {
 						return "entity:" + e.getUniqueId().toString().toLowerCase(Locale.ENGLISH);
@@ -171,7 +129,7 @@ public String toString(final Entity e, final int flags) {
 					}
 				})
 				.changer(DefaultChangers.entityChanger));
-		
+
 		Classes.registerClass(new ClassInfo<>(LivingEntity.class, "livingentity")
 				.user("living ?entit(y|ies)")
 				.name("Living Entity")
@@ -183,7 +141,7 @@ public String toString(final Entity e, final int flags) {
 				.since("1.0")
 				.defaultExpression(new EventValueExpression<>(LivingEntity.class))
 				.changer(DefaultChangers.entityChanger));
-		
+
 		Classes.registerClass(new ClassInfo<>(Projectile.class, "projectile")
 				.user("projectiles?")
 				.name("Projectile")
@@ -194,7 +152,7 @@ public String toString(final Entity e, final int flags) {
 				.since("1.0")
 				.defaultExpression(new EventValueExpression<>(Projectile.class))
 				.changer(DefaultChangers.nonLivingEntityChanger));
-		
+
 		Classes.registerClass(new ClassInfo<>(Block.class, "block")
 				.user("blocks?")
 				.name("Block")
@@ -210,17 +168,17 @@ public String toString(final Entity e, final int flags) {
 					public Block parse(final String s, final ParseContext context) {
 						return null;
 					}
-					
+
 					@Override
 					public boolean canParse(final ParseContext context) {
 						return false;
 					}
-					
+
 					@Override
 					public String toString(final Block b, final int flags) {
 						return BlockUtils.blockToString(b, flags);
 					}
-					
+
 					@Override
 					public String toVariableNameString(final Block b) {
 						return b.getWorld().getName() + ":" + b.getX() + "," + b.getY() + "," + b.getZ();
@@ -242,12 +200,12 @@ public Fields serialize(final Block b) {
 						f.putPrimitive("z", b.getZ());
 						return f;
 					}
-					
+
 					@Override
 					public void deserialize(final Block o, final Fields f) {
 						assert false;
 					}
-					
+
 					@Override
 					protected Block deserialize(final Fields fields) throws StreamCorruptedException {
 						final World w = fields.getObject("world", World.class);
@@ -256,17 +214,17 @@ protected Block deserialize(final Fields fields) throws StreamCorruptedException
 							throw new StreamCorruptedException();
 						return w.getBlockAt(x, y, z);
 					}
-					
+
 					@Override
 					public boolean mustSyncDeserialization() {
 						return true;
 					}
-					
+
 					@Override
 					public boolean canBeInstantiated() {
 						return false;
 					}
-					
+
 					// return b.getWorld().getName() + ":" + b.getX() + "," + b.getY() + "," + b.getZ();
 					@Override
 					@Nullable
@@ -310,12 +268,12 @@ public Block deserialize(final String s) {
 					public BlockData parse(String input, ParseContext context) {
 						return BlockUtils.createBlockData(input);
 					}
-	
+
 					@Override
 					public String toString(BlockData o, int flags) {
 						return o.getAsString().replace(",", ";");
 					}
-	
+
 					@Override
 					public String toVariableNameString(BlockData o) {
 						return "blockdata:" + o.getAsString();
@@ -328,12 +286,12 @@ public Fields serialize(BlockData o) {
 						f.putObject("blockdata", o.getAsString());
 						return f;
 					}
-	
+
 					@Override
 					public void deserialize(BlockData o, Fields f) {
 						assert false;
 					}
-	
+
 					@Override
 					protected BlockData deserialize(Fields f) throws StreamCorruptedException {
 						String data = f.getObject("blockdata", String.class);
@@ -344,12 +302,12 @@ protected BlockData deserialize(Fields f) throws StreamCorruptedException {
 							throw new StreamCorruptedException("Invalid block data: " + data);
 						}
 					}
-	
+
 					@Override
 					public boolean mustSyncDeserialization() {
 						return true;
 					}
-	
+
 					@Override
 					protected boolean canBeInstantiated() {
 						return false;
@@ -371,18 +329,18 @@ protected boolean canBeInstantiated() {
 					public Location parse(final String s, final ParseContext context) {
 						return null;
 					}
-					
+
 					@Override
 					public boolean canParse(final ParseContext context) {
 						return false;
 					}
-					
+
 					@Override
 					public String toString(final Location l, final int flags) {
 						String worldPart = l.getWorld() == null ? "" : " in '" + l.getWorld().getName() + "'"; // Safety: getWorld is marked as Nullable by spigot
 						return "x: " + Skript.toString(l.getX()) + ", y: " + Skript.toString(l.getY()) + ", z: " + Skript.toString(l.getZ()) + ", yaw: " + Skript.toString(l.getYaw()) + ", pitch: " + Skript.toString(l.getPitch()) + worldPart;
 					}
-					
+
 					@Override
 					public String toVariableNameString(final Location l) {
 						return l.getWorld().getName() + ":" + l.getX() + "," + l.getY() + "," + l.getZ();
@@ -410,29 +368,29 @@ public Fields serialize(Location location) {
 						fields.putPrimitive("pitch", location.getPitch());
 						return fields;
 					}
-					
+
 					@Override
 					public void deserialize(final Location o, final Fields f) {
 						assert false;
 					}
-					
+
 					@Override
 					public Location deserialize(final Fields f) throws StreamCorruptedException {
 						return new Location(f.getObject("world", World.class),
 								f.getPrimitive("x", double.class), f.getPrimitive("y", double.class), f.getPrimitive("z", double.class),
 								f.getPrimitive("yaw", float.class), f.getPrimitive("pitch", float.class));
 					}
-					
+
 					@Override
 					public boolean canBeInstantiated() {
 						return false; // no nullary constructor - also, saving the location manually prevents errors should Location ever be changed
 					}
-					
+
 					@Override
 					public boolean mustSyncDeserialization() {
 						return true;
 					}
-					
+
 					// return l.getWorld().getName() + ":" + l.getX() + "," + l.getY() + "," + l.getZ() + "|" + l.getYaw() + "/" + l.getPitch();
 					@Override
 					@Nullable
@@ -454,7 +412,7 @@ public Location deserialize(final String s) {
 					}
 				})
 				.cloner(Location::clone));
-		
+
 		Classes.registerClass(new ClassInfo<>(Vector.class, "vector")
 				.user("vectors?")
 				.name("Vector")
@@ -469,17 +427,17 @@ public Location deserialize(final String s) {
 					public Vector parse(final String s, final ParseContext context) {
 						return null;
 					}
-					
+
 					@Override
 					public boolean canParse(final ParseContext context) {
 						return false;
 					}
-					
+
 					@Override
 					public String toString(final Vector vec, final int flags) {
 						return "x: " + Skript.toString(vec.getX()) + ", y: " + Skript.toString(vec.getY()) + ", z: " + Skript.toString(vec.getZ());
 					}
-					
+
 					@Override
 					public String toVariableNameString(final Vector vec) {
 						return "vector:" + vec.getX() + "," + vec.getY() + "," + vec.getZ();
@@ -499,29 +457,29 @@ public Fields serialize(Vector o) {
 						f.putPrimitive("z", o.getZ());
 						return f;
 					}
-					
+
 					@Override
 					public void deserialize(Vector o, Fields f) {
 						assert false;
 					}
-					
+
 					@Override
 					public Vector deserialize(final Fields f) throws StreamCorruptedException {
 						return new Vector(f.getPrimitive("x", double.class), f.getPrimitive("y", double.class), f.getPrimitive("z", double.class));
 					}
-					
+
 					@Override
 					public boolean mustSyncDeserialization() {
 						return false;
 					}
-					
+
 					@Override
 					protected boolean canBeInstantiated() {
 						return false;
 					}
 				})
 				.cloner(Vector::clone));
-		
+
 		Classes.registerClass(new ClassInfo<>(World.class, "world")
 				.user("worlds?")
 				.name("World")
@@ -535,7 +493,7 @@ protected boolean canBeInstantiated() {
 				.parser(new Parser<World>() {
 					@SuppressWarnings("null")
 					private final Pattern parsePattern = Pattern.compile("(?:(?:the )?world )?\"(.+)\"", Pattern.CASE_INSENSITIVE);
-					
+
 					@Override
 					@Nullable
 					public World parse(final String s, final ParseContext context) {
@@ -547,12 +505,12 @@ public World parse(final String s, final ParseContext context) {
 							return Bukkit.getWorld(m.group(1));
 						return null;
 					}
-					
+
 					@Override
 					public String toString(final World w, final int flags) {
 						return "" + w.getName();
 					}
-					
+
 					@Override
 					public String toVariableNameString(final World w) {
 						return "" + w.getName();
@@ -564,17 +522,17 @@ public Fields serialize(final World w) {
 						f.putObject("name", w.getName());
 						return f;
 					}
-					
+
 					@Override
 					public void deserialize(final World o, final Fields f) {
 						assert false;
 					}
-					
+
 					@Override
 					public boolean canBeInstantiated() {
 						return false;
 					}
-					
+
 					@Override
 					protected World deserialize(final Fields fields) throws StreamCorruptedException {
 						final String name = fields.getObject("name", String.class);
@@ -584,20 +542,20 @@ protected World deserialize(final Fields fields) throws StreamCorruptedException
 							throw new StreamCorruptedException("Missing world " + name);
 						return w;
 					}
-					
+
 					// return w.getName();
 					@Override
 					@Nullable
 					public World deserialize(final String s) {
 						return Bukkit.getWorld(s);
 					}
-					
+
 					@Override
 					public boolean mustSyncDeserialization() {
 						return true;
 					}
 				}));
-		
+
 		Classes.registerClass(new ClassInfo<>(Inventory.class, "inventory")
 				.user("inventor(y|ies)")
 				.name("Inventory")
@@ -616,28 +574,28 @@ public boolean mustSyncDeserialization() {
 					public Inventory parse(final String s, final ParseContext context) {
 						return null;
 					}
-					
+
 					@Override
 					public boolean canParse(final ParseContext context) {
 						return false;
 					}
-					
+
 					@Override
 					public String toString(final Inventory i, final int flags) {
 						return "inventory of " + Classes.toString(i.getHolder());
 					}
-					
+
 					@Override
 					public String getDebugMessage(final Inventory i) {
 						return "inventory of " + Classes.getDebugMessage(i.getHolder());
 					}
-					
+
 					@Override
 					public String toVariableNameString(final Inventory i) {
 						return "inventory of " + Classes.toString(i.getHolder(), StringMode.VARIABLE_NAME);
 					}
 				}).changer(DefaultChangers.inventoryChanger));
-		
+
 		Classes.registerClass(new EnumClassInfo<>(InventoryAction.class, "inventoryaction", "inventory actions")
 				.user("inventory ?actions?")
 				.name("Inventory Action")
@@ -652,7 +610,7 @@ public String toVariableNameString(final Inventory i) {
 						"assuming that default keybindings are used in client side.")
 				.examples("")
 				.since("2.2-dev16b, 2.2-dev35 (renamed to click type)"));
-		
+
 		Classes.registerClass(new EnumClassInfo<>(InventoryType.class, "inventorytype", "inventory types")
 				.user("inventory ?types?")
 				.name("Inventory Type")
@@ -708,17 +666,17 @@ public Player parse(String string, ParseContext context) {
 						assert false;
 						return null;
 					}
-					
+
 					@Override
 					public boolean canParse(final ParseContext context) {
 						return context == ParseContext.COMMAND || context == ParseContext.PARSE;
 					}
-					
+
 					@Override
 					public String toString(final Player p, final int flags) {
 						return "" + p.getName();
 					}
-					
+
 					@Override
 					public String toVariableNameString(final Player p) {
 						if (SkriptConfig.usePlayerUUIDsInVariableNames.value())
@@ -763,17 +721,17 @@ else if (!SkriptConfig.playerNameRegexPattern.value().matcher(s).matches())
 						assert false;
 						return null;
 					}
-					
+
 					@Override
 					public boolean canParse(ParseContext context) {
 						return context == ParseContext.COMMAND || context == ParseContext.PARSE;
 					}
-					
+
 					@Override
 					public String toString(OfflinePlayer p, int flags) {
 						return p.getName() == null ? p.getUniqueId().toString() : p.getName();
 					}
-					
+
 					@Override
 					public String toVariableNameString(OfflinePlayer p) {
 						if (SkriptConfig.usePlayerUUIDsInVariableNames.value() || p.getName() == null)
@@ -795,17 +753,17 @@ public Fields serialize(final OfflinePlayer p) {
 						f.putObject("uuid", p.getUniqueId());
 						return f;
 					}
-					
+
 					@Override
 					public void deserialize(final OfflinePlayer o, final Fields f) {
 						assert false;
 					}
-					
+
 					@Override
 					public boolean canBeInstantiated() {
 						return false;
 					}
-					
+
 					@SuppressWarnings("deprecation")
 					@Override
 					protected OfflinePlayer deserialize(final Fields fields) throws StreamCorruptedException {
@@ -821,7 +779,7 @@ protected OfflinePlayer deserialize(final Fields fields) throws StreamCorruptedE
 							return Bukkit.getOfflinePlayer(name);
 						}
 					}
-					
+
 					// return p.getName();
 					@SuppressWarnings("deprecation")
 					@Override
@@ -829,13 +787,13 @@ protected OfflinePlayer deserialize(final Fields fields) throws StreamCorruptedE
 					public OfflinePlayer deserialize(final String s) {
 						return Bukkit.getOfflinePlayer(s);
 					}
-					
+
 					@Override
 					public boolean mustSyncDeserialization() {
 						return true;
 					}
 				}));
-		
+
 		Classes.registerClass(new ClassInfo<>(CommandSender.class, "commandsender")
 				.user("((commands?)? ?)?(sender|executor)s?")
 				.name("Command Sender")
@@ -861,23 +819,23 @@ public boolean mustSyncDeserialization() {
 					public CommandSender parse(final String s, final ParseContext context) {
 						return null;
 					}
-					
+
 					@Override
 					public boolean canParse(final ParseContext context) {
 						return false;
 					}
-					
+
 					@Override
 					public String toString(final CommandSender s, final int flags) {
 						return "" + s.getName();
 					}
-					
+
 					@Override
 					public String toVariableNameString(final CommandSender s) {
 						return "" + s.getName();
 					}
 				}));
-		
+
 		Classes.registerClass(new ClassInfo<>(InventoryHolder.class, "inventoryholder")
 				.name(ClassInfo.NO_DOC)
 				.defaultExpression(new EventValueExpression<>(InventoryHolder.class))
@@ -887,7 +845,7 @@ public String toVariableNameString(final CommandSender s) {
 					public boolean canParse(ParseContext context) {
 						return false;
 					}
-					
+
 					@Override
 					public String toString(InventoryHolder holder, int flags) {
 						if (holder instanceof BlockState) {
@@ -902,7 +860,7 @@ public String toString(InventoryHolder holder, int flags) {
 							return Classes.toString(holder);
 						}
 					}
-					
+
 					@Override
 					public String toVariableNameString(InventoryHolder holder) {
 						return toString(holder, 0);
@@ -915,7 +873,7 @@ public String toVariableNameString(InventoryHolder holder) {
 				.examples("player's gamemode is survival",
 						"set the player argument's game mode to creative")
 				.since("1.0"));
-		
+
 		Classes.registerClass(new ClassInfo<>(ItemStack.class, "itemstack")
 				.user("items?")
 				.name("Item")
@@ -946,7 +904,7 @@ public ItemStack parse(final String s, final ParseContext context) {
 							Skript.error("'" + s + "' represents multiple materials");
 							return null;
 						}
-						
+
 						final ItemStack i = t.getRandom();
 						if (i == null) {
 							Skript.error("'" + s + "' cannot represent an item");
@@ -954,21 +912,21 @@ public ItemStack parse(final String s, final ParseContext context) {
 						}
 						return i;
 					}
-					
+
 					@Override
 					public String toString(final ItemStack i, final int flags) {
 						return ItemType.toString(i, flags);
 					}
-					
+
 					@Override
 					public String toVariableNameString(final ItemStack i) {
 						final StringBuilder b = new StringBuilder("item:");
 						b.append(i.getType().name());
 						b.append(":" + ItemUtils.getDamage(i));
 						b.append("*" + i.getAmount());
-						
+
 						for (Entry<Enchantment, Integer> entry : i.getEnchantments().entrySet())
-							b.append("#" + EnchantmentUtils.getKey(entry.getKey()))
+							b.append("#" + entry.getKey().getKey())
 									.append(":" + entry.getValue());
 
 						return b.toString();
@@ -976,20 +934,13 @@ public String toVariableNameString(final ItemStack i) {
 				})
 				.cloner(ItemStack::clone)
 				.serializer(new ConfigurationSerializer<>()));
-		
+
 		Classes.registerClass(new ClassInfo<>(Item.class, "itementity")
 				.name(ClassInfo.NO_DOC)
 				.since("2.0")
 				.changer(DefaultChangers.itemChanger));
 
-		ClassInfo<?> biomeClassInfo;
-		if (BukkitUtils.registryExists("BIOME")) {
-			biomeClassInfo = new RegistryClassInfo<>(Biome.class, Registry.BIOME, "biome", "biomes");
-		} else {
-			//noinspection rawtypes,unchecked
-			biomeClassInfo = new EnumClassInfo<>((Class) Biome.class, "biome", "biomes");
-		}
-		Classes.registerClass(biomeClassInfo
+		Classes.registerClass(new RegistryClassInfo<>(Biome.class, Registry.BIOME, "biome", "biomes")
 				.user("biomes?")
 				.name("Biome")
 				.description("All possible biomes Minecraft uses to generate a world.",
@@ -997,7 +948,7 @@ public String toVariableNameString(final ItemStack i) {
 				.examples("biome at the player is desert")
 				.since("1.4.4")
 				.after("damagecause"));
-		
+
 		Classes.registerClass(new ClassInfo<>(PotionEffect.class, "potioneffect")
 			.user("potion ?effects?")
 			.name("Potion Effect")
@@ -1005,17 +956,17 @@ public String toVariableNameString(final ItemStack i) {
 			.usage("speed of tier 1 for 10 seconds")
 			.since("2.5.2")
 			.parser(new Parser<PotionEffect>() {
-				
+
 				@Override
 				public boolean canParse(ParseContext context) {
 					return false;
 				}
-				
+
 				@Override
 				public String toString(PotionEffect potionEffect, int flags) {
 					return PotionEffectUtils.toString(potionEffect);
 				}
-				
+
 				@Override
 				public String toVariableNameString(PotionEffect o) {
 					return "potion_effect:" + o.getType().getName();
@@ -1033,12 +984,12 @@ public Fields serialize(PotionEffect o) {
 					fields.putPrimitive("ambient", o.isAmbient());
 					return fields;
 				}
-				
+
 				@Override
 				public void deserialize(PotionEffect o, Fields f) {
 					assert false;
 				}
-				
+
 				@Override
 				protected PotionEffect deserialize(Fields fields) throws StreamCorruptedException {
 					String typeName = fields.getObject("type", String.class);
@@ -1052,86 +1003,32 @@ protected PotionEffect deserialize(Fields fields) throws StreamCorruptedExceptio
 					boolean ambient = fields.getPrimitive("ambient", boolean.class);
 					return new PotionEffect(type, duration, amplifier, ambient, particles);
 				}
-				
+
 				@Override
 				public boolean mustSyncDeserialization() {
 					return false;
 				}
-				
+
 				@Override
 				protected boolean canBeInstantiated() {
 					return false;
 				}
 			}));
-		
-		Classes.registerClass(new ClassInfo<>(PotionEffectType.class, "potioneffecttype")
-				.user("potion( ?effect)? ?types?") // "type" had to be made non-optional to prevent clashing with potion effects
+
+		Registry<PotionEffectType> petRegistry = BukkitUtils.getPotionEffectTypeRegistry();
+		if (petRegistry != null) {
+			Classes.registerClass(new RegistryClassInfo<>(PotionEffectType.class, petRegistry, "potioneffecttype", "potion effect types", false)
+				.user("potion( ?effect)? ?types?")
 				.name("Potion Effect Type")
 				.description("A potion effect type, e.g. 'strength' or 'swiftness'.")
-				.usage(StringUtils.join(PotionEffectUtils.getNames(), ", "))
 				.examples("apply swiftness 5 to the player",
-						"apply potion of speed 2 to the player for 60 seconds",
-						"remove invisibility from the victim")
-				.since("")
-				.supplier(PotionEffectType.values())
-				.parser(new Parser<PotionEffectType>() {
-					@Override
-					@Nullable
-					public PotionEffectType parse(final String s, final ParseContext context) {
-						return PotionEffectUtils.parseType(s);
-					}
-
-					@Override
-					public String toString(final PotionEffectType p, final int flags) {
-						return PotionEffectUtils.toString(p, flags);
-					}
+					"apply potion of speed 2 to the player for 60 seconds",
+					"remove invisibility from the victim")
+				.since(""));
+		} else {
+			Classes.registerClass(PotionEffectUtils.getLegacyClassInfo());
+		}
 
-					@Override
-					public String toVariableNameString(final PotionEffectType p) {
-						return "" + p.getName();
-					}
-				})
-				.serializer(new Serializer<PotionEffectType>() {
-					@Override
-					public Fields serialize(final PotionEffectType o) {
-						final Fields f = new Fields();
-						f.putObject("name", o.getName());
-						return f;
-					}
-					
-					@Override
-					public boolean canBeInstantiated() {
-						return false;
-					}
-					
-					@Override
-					public void deserialize(final PotionEffectType o, final Fields f) {
-						assert false;
-					}
-					
-					@Override
-					protected PotionEffectType deserialize(final Fields fields) throws StreamCorruptedException {
-						final String name = fields.getObject("name", String.class);
-						assert name != null;
-						final PotionEffectType t = PotionEffectType.getByName(name);
-						if (t == null)
-							throw new StreamCorruptedException("Invalid PotionEffectType " + name);
-						return t;
-					}
-					
-					// return o.getName();
-					@Override
-					@Nullable
-					public PotionEffectType deserialize(final String s) {
-						return PotionEffectType.getByName(s);
-					}
-					
-					@Override
-					public boolean mustSyncDeserialization() {
-						return false;
-					}
-				}));
-		
 		// REMIND make my own damage cause class (that e.g. stores the attacker entity, the projectile, or the attacking block)
 		Classes.registerClass(new EnumClassInfo<>(DamageCause.class, "damagecause", "damage causes", new ExprDamageCause())
 				.user("damage ?causes?")
@@ -1142,7 +1039,7 @@ public boolean mustSyncDeserialization() {
 				.examples("")
 				.since("2.0")
 				.after("itemtype", "itemstack", "entitydata", "entitytype"));
-		
+
 		Classes.registerClass(new ClassInfo<>(Chunk.class, "chunk")
 				.user("chunks?")
 				.name("Chunk")
@@ -1156,17 +1053,17 @@ public boolean mustSyncDeserialization() {
 					public Chunk parse(final String s, final ParseContext context) {
 						return null;
 					}
-					
+
 					@Override
 					public boolean canParse(final ParseContext context) {
 						return false;
 					}
-					
+
 					@Override
 					public String toString(final Chunk c, final int flags) {
 						return "chunk (" + c.getX() + "," + c.getZ() + ") of " + c.getWorld().getName();
 					}
-					
+
 					@Override
 					public String toVariableNameString(final Chunk c) {
 						return c.getWorld().getName() + ":" + c.getX() + "," + c.getZ();
@@ -1181,17 +1078,17 @@ public Fields serialize(final Chunk c) {
 						f.putPrimitive("z", c.getZ());
 						return f;
 					}
-					
+
 					@Override
 					public void deserialize(final Chunk o, final Fields f) {
 						assert false;
 					}
-					
+
 					@Override
 					public boolean canBeInstantiated() {
 						return false;
 					}
-					
+
 					@Override
 					protected Chunk deserialize(final Fields fields) throws StreamCorruptedException {
 						final World w = fields.getObject("world", World.class);
@@ -1200,7 +1097,7 @@ protected Chunk deserialize(final Fields fields) throws StreamCorruptedException
 							throw new StreamCorruptedException();
 						return w.getChunkAt(x, z);
 					}
-					
+
 					// return c.getWorld().getName() + ":" + c.getX() + "," + c.getZ();
 					@Override
 					@Nullable
@@ -1219,20 +1116,14 @@ public Chunk deserialize(final String s) {
 							return null;
 						}
 					}
-					
+
 					@Override
 					public boolean mustSyncDeserialization() {
 						return true;
 					}
 				}));
 
-		ClassInfo<Enchantment> enchantmentClassInfo;
-		if (BukkitUtils.registryExists("ENCHANTMENT")) {
-			enchantmentClassInfo = new RegistryClassInfo<>(Enchantment.class, Registry.ENCHANTMENT, "enchantment", "enchantments");
-		} else {
-			enchantmentClassInfo = EnchantmentUtils.createClassInfo();
-		}
-		Classes.registerClass(enchantmentClassInfo
+		Classes.registerClass(new RegistryClassInfo<>(Enchantment.class, Registry.ENCHANTMENT, "enchantment", "enchantments")
 				.user("enchantments?")
 				.name("Enchantment")
 				.description("An enchantment, e.g. 'sharpness' or 'fortune'. Unlike <a href='#enchantmenttype'>enchantment type</a> " +
@@ -1242,7 +1133,7 @@ public boolean mustSyncDeserialization() {
 				.examples("")
 				.since("1.4.6")
 				.before("enchantmenttype"));
-		
+
 		Material[] allMaterials = Material.values();
 		Classes.registerClass(new ClassInfo<>(Material.class, "material")
 				.name(ClassInfo.NO_DOC)
@@ -1254,49 +1145,49 @@ public Fields serialize(Material o) {
 						f.putObject("i", o.ordinal());
 						return f;
 					}
-					
+
 					@Override
 					public void deserialize(Material o, Fields f) {
 						assert false;
 					}
-					
+
 					@Override
 					public Material deserialize(Fields f) throws StreamCorruptedException {
 						Material mat = allMaterials[(int) f.getPrimitive("i")];
 						assert mat != null; // Hope server owner didn't mod too much...
 						return mat;
 					}
-					
+
 					@Override
 					public boolean mustSyncDeserialization() {
 						return false;
 					}
-					
+
 					@Override
 					protected boolean canBeInstantiated() {
 						return false; // It is an enum, come on
 					}
 				}));
-		
+
 		Classes.registerClass(new ClassInfo<>(Metadatable.class, "metadataholder")
 				.user("metadata ?holders?")
 				.name("Metadata Holder")
 				.description("Something that can hold metadata (e.g. an entity or block)")
 				.examples("set metadata value \"super cool\" of player to true")
 				.since("2.2-dev36"));
-		
+
 		Classes.registerClass(new EnumClassInfo<>(TeleportCause.class, "teleportcause", "teleport causes")
 				.user("teleport ?(cause|reason|type)s?")
 				.name("Teleport Cause")
 				.description("The teleport cause in a <a href='events.html#teleport'>teleport</a> event.")
 				.since("2.2-dev35"));
-		
+
 		Classes.registerClass(new EnumClassInfo<>(SpawnReason.class, "spawnreason", "spawn reasons")
 				.user("spawn(ing)? ?reasons?")
 				.name("Spawn Reason")
 				.description("The spawn reason in a <a href='events.html#spawn'>spawn</a> event.")
 				.since("2.3"));
-		
+
 		if (Skript.classExists("com.destroystokyo.paper.event.server.PaperServerListPingEvent")) {
 			Classes.registerClass(new ClassInfo<>(CachedServerIcon.class, "cachedservericon")
 					.user("server ?icons?")
@@ -1310,31 +1201,31 @@ protected boolean canBeInstantiated() {
 						public CachedServerIcon parse(final String s, final ParseContext context) {
 							return null;
 						}
-						
+
 						@Override
 						public boolean canParse(final ParseContext context) {
 							return false;
 						}
-						
+
 						@Override
 						public String toString(final CachedServerIcon o, int flags) {
 							return "server icon";
 						}
-						
+
 						@Override
 						public String toVariableNameString(final CachedServerIcon o) {
 							return "server icon";
 						}
 					}));
 		}
-		
+
 		Classes.registerClass(new EnumClassInfo<>(FireworkEffect.Type.class, "fireworktype", "firework types")
 				.user("firework ?types?")
 				.name("Firework Type")
 				.description("The type of a <a href='#fireworkeffect'>fireworkeffect</a>.")
 				.since("2.4")
 				.documentationId("FireworkType"));
-		
+
 		Classes.registerClass(new ClassInfo<>(FireworkEffect.class, "fireworkeffect")
 				.user("firework ?effects?")
 				.name("Firework Effect")
@@ -1355,23 +1246,23 @@ public String toVariableNameString(final CachedServerIcon o) {
 					public FireworkEffect parse(String input, ParseContext context) {
 						return null;
 					}
-					
+
 					@Override
 					public boolean canParse(ParseContext context) {
 						return false;
 					}
-					
+
 					@Override
 					public String toString(FireworkEffect effect, int flags) {
 						return "Firework effect " + effect.toString();
 					}
-					
+
 					@Override
 					public String toVariableNameString(FireworkEffect effect) {
 						return "firework effect " + effect.toString();
 					}
 				}));
-		
+
 		Classes.registerClass(new EnumClassInfo<>(Difficulty.class, "difficulty", "difficulties")
 				.user("difficult(y|ies)")
 				.name("Difficulty")
@@ -1465,26 +1356,19 @@ public String toVariableNameString(GameRule o) {
 					public boolean canParse(ParseContext context) {
 						return false;
 					}
-	
+
 					@Override
 					public String toString(EnchantmentOffer eo, int flags) {
-						return EnchantmentUtils.toString(eo.getEnchantment(), flags) + " " + eo.getEnchantmentLevel();
+						return Classes.toString(eo.getEnchantment()) + " " + eo.getEnchantmentLevel();
 					}
-	
+
 					@Override
 					public String toVariableNameString(EnchantmentOffer eo) {
-						return "offer:" + EnchantmentUtils.toString(eo.getEnchantment()) + "=" + eo.getEnchantmentLevel();
+						return "offer:" + Classes.toString(eo.getEnchantment()) + "=" + eo.getEnchantmentLevel();
 					}
 				}));
 
-		ClassInfo<Attribute> attributeClassInfo;
-		if (BukkitUtils.registryExists("ATTRIBUTE")) {
-			attributeClassInfo = new RegistryClassInfo<>(Attribute.class, Registry.ATTRIBUTE, "attributetype", "attribute types");
-		} else {
-			//noinspection rawtypes,unchecked
-			attributeClassInfo = new EnumClassInfo<>((Class) Attribute.class, "attributetype", "attribute types");
-		}
-		Classes.registerClass(attributeClassInfo
+		Classes.registerClass(new RegistryClassInfo<>(Attribute.class, Registry.ATTRIBUTE, "attributetype", "attribute types")
 				.user("attribute ?types?")
 				.name("Attribute Type")
 				.description("Represents the type of an attribute. Note that this type does not contain any numerical values."
@@ -1527,6 +1411,131 @@ public String toVariableNameString(EnchantmentOffer eo) {
 				.name("Transform Reason")
 				.description("Represents a transform reason of an <a href='events.html#entity transform'>entity transform event</a>.")
 				.since("2.8.0"));
+
+		Classes.registerClass(new EnumClassInfo<>(EntityUnleashEvent.UnleashReason.class, "unleashreason", "unleash reasons")
+			.user("unleash ?(reason|cause)s?")
+			.name("Unleash Reason")
+			.description("Represents an unleash reason of an unleash event.")
+			.since("2.10"));
+
+		Classes.registerClass(new EnumClassInfo<>(ItemFlag.class, "itemflag", "item flags")
+				.user("item ?flags?")
+				.name("Item Flag")
+				.description("Represents flags that may be applied to hide certain attributes of an item.")
+				.since("2.10"));
+
+		Classes.registerClass(new EnumClassInfo<>(EntityPotionEffectEvent.Cause.class, "entitypotioncause", "entity potion causes")
+				.user("(entity )?potion ?effect ?cause")
+				.name("Entity Potion Cause")
+				.description("Represents the cause of the action of a potion effect on an entity, e.g. arrow, command")
+				.since("2.10"));
+
+		ClassInfo<?> wolfVariantClassInfo;
+		if (Skript.classExists("org.bukkit.entity.Wolf$Variant") && BukkitUtils.registryExists("WOLF_VARIANT")) {
+			wolfVariantClassInfo = new RegistryClassInfo<>(Wolf.Variant.class, Registry.WOLF_VARIANT, "wolfvariant", "wolf variants");
+		} else {
+			/*
+			 * Registers a dummy/placeholder class to ensure working operation on MC versions that do not have `Wolf.Variant`
+			 */
+			wolfVariantClassInfo = new ClassInfo<>(WolfData.VariantDummy.class, "wolfvariant");
+		}
+		Classes.registerClass(wolfVariantClassInfo
+			.user("wolf ?variants?")
+			.name("Wolf Variant")
+			.description("Represents the variant of a wolf entity.",
+				"NOTE: Minecraft namespaces are supported, ex: 'minecraft:ashen'.")
+			.since("@VERSION")
+			.requiredPlugins("Minecraft 1.21+")
+			.documentationId("WolfVariant"));
+
+		Classes.registerClass(new EnumClassInfo<>(ChangeReason.class,  "experiencecooldownchangereason", "experience cooldown change reasons")
+			.user("(experience|[e]xp) cooldown change (reason|cause)s?")
+			.name("Experience Cooldown Change Reason")
+			.description("Represents a change reason of an <a href='events.html#experience cooldown change event'>experience cooldown change event</a>.")
+			.since("2.10"));
+
+		Classes.registerClass(new RegistryClassInfo<>(Villager.Type.class, Registry.VILLAGER_TYPE, "villagertype", "villager types")
+			.user("villager ?types?")
+			.name("Villager Type")
+			.description("Represents the different types of villagers. These are usually the biomes a villager can be from.")
+			.after("biome")
+			.since("2.10"));
+
+		Classes.registerClass(new RegistryClassInfo<>(Villager.Profession.class, Registry.VILLAGER_PROFESSION, "villagerprofession", "villager professions")
+			.user("villager ?professions?")
+			.name("Villager Profession")
+			.description("Represents the different professions of villagers.")
+			.since("2.10"));
+
+		if (Skript.classExists("org.bukkit.entity.EntitySnapshot")) {
+			Classes.registerClass(new ClassInfo<>(EntitySnapshot.class, "entitysnapshot")
+				.user("entity ?snapshots?")
+				.name("Entity Snapshot")
+				.description("Represents a snapshot of an entity's data.",
+					"This includes all of the data associated with an entity (its name, health, attributes, etc.), at the time this expression is used. "
+						+ "Essentially, these are a way to create templates for entities.",
+					"Individual attributes of a snapshot cannot be modified or retrieved.")
+				.requiredPlugins("Minecraft 1.20.2+")
+				.since("2.10")
+				.parser(new Parser<>() {
+					@Override
+					public boolean canParse(ParseContext context) {
+						return false;
+					}
+
+					@Override
+					public String toString(EntitySnapshot snapshot, int flags) {
+						return EntityUtils.toSkriptEntityData(snapshot.getEntityType()).toString() + " snapshot";
+					}
+
+					@Override
+					public String toVariableNameString(EntitySnapshot snapshot) {
+						return toString(snapshot, 0);
+					}
+				})
+			);
+		}
+
+		Classes.registerClass(new ClassInfo<>(org.bukkit.block.banner.Pattern.class, "bannerpattern")
+			.user("banner ?patterns?")
+			.name("Banner Pattern")
+			.description("Represents a banner pattern.")
+			.since("2.10")
+		);
+
+		ClassInfo<?> patternTypeInfo;
+		Registry<PatternType> patternRegistry = Bukkit.getRegistry(PatternType.class);
+		if (patternRegistry != null) {
+			patternTypeInfo = new RegistryClassInfo<>(PatternType.class, patternRegistry, "bannerpatterntype", "banner pattern types");
+		} else {
+			try {
+				Class<?> patternClass = Class.forName("org.bukkit.block.banner.PatternType");
+				if (patternClass.isEnum()) {
+					//noinspection unchecked,rawtypes
+					Class<? extends Enum> enumClass = (Class<? extends Enum>) patternClass;
+					//noinspection rawtypes,unchecked
+					patternTypeInfo = new EnumClassInfo<>(enumClass, "bannerpatterntype", "banner pattern types");
+				} else {
+					throw new IllegalStateException("PatternType is neither an enum nor a valid registry.");
+				}
+			} catch (ClassNotFoundException e) {
+				throw new RuntimeException(e);
+			}
+		}
+		Classes.registerClass(patternTypeInfo
+			.user("banner ?pattern ?types?")
+			.name("Banner Pattern Type")
+			.description("Represents the various banner patterns that can be applied to a banner.")
+			.since("2.10")
+		);
+
+		if (Skript.classExists("io.papermc.paper.entity.TeleportFlag"))
+			Classes.registerClass(new EnumClassInfo<>(SkriptTeleportFlag.class, "teleportflag", "teleport flags")
+					.user("teleport ?flags?")
+					.name("Teleport Flag")
+					.description("Teleport Flags are settings to retain during a teleport.")
+					.requiredPlugins("Paper 1.19+")
+					.since("2.10"));
 	}
 
 }
diff --git a/src/main/java/ch/njol/skript/classes/data/BukkitEventValues.java b/src/main/java/ch/njol/skript/classes/data/BukkitEventValues.java
index 82fca450068..503baf87877 100644
--- a/src/main/java/ch/njol/skript/classes/data/BukkitEventValues.java
+++ b/src/main/java/ch/njol/skript/classes/data/BukkitEventValues.java
@@ -1,30 +1,6 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.classes.data;
 
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
 import ch.njol.skript.Skript;
-import ch.njol.skript.aliases.Aliases;
 import ch.njol.skript.aliases.ItemType;
 import ch.njol.skript.bukkitutil.InventoryUtils;
 import ch.njol.skript.command.CommandEvent;
@@ -32,1908 +8,732 @@
 import ch.njol.skript.events.bukkit.SkriptStartEvent;
 import ch.njol.skript.events.bukkit.SkriptStopEvent;
 import ch.njol.skript.registrations.EventValues;
-import ch.njol.skript.util.BlockStateBlock;
-import ch.njol.skript.util.BlockUtils;
-import ch.njol.skript.util.DelayedChangeBlock;
-import ch.njol.skript.util.Direction;
-import ch.njol.skript.util.EnchantmentType;
-import ch.njol.skript.util.Getter;
-import ch.njol.skript.util.Timespan;
+import ch.njol.skript.util.Color;
+import ch.njol.skript.util.*;
 import ch.njol.skript.util.slot.InventorySlot;
 import ch.njol.skript.util.slot.Slot;
 import com.destroystokyo.paper.event.block.AnvilDamagedEvent;
+import com.destroystokyo.paper.event.block.BeaconEffectEvent;
 import com.destroystokyo.paper.event.entity.EndermanAttackPlayerEvent;
 import com.destroystokyo.paper.event.entity.ProjectileCollideEvent;
+import com.destroystokyo.paper.event.inventory.PrepareResultEvent;
 import com.destroystokyo.paper.event.player.PlayerArmorChangeEvent;
+import com.destroystokyo.paper.event.player.PlayerElytraBoostEvent;
 import io.papermc.paper.event.entity.EntityMoveEvent;
-import io.papermc.paper.event.player.PlayerStopUsingItemEvent;
-import io.papermc.paper.event.player.PlayerInventorySlotChangeEvent;
-import io.papermc.paper.event.player.PlayerStonecutterRecipeSelectEvent;
-import io.papermc.paper.event.player.PlayerTradeEvent;
-import org.bukkit.Bukkit;
-import org.bukkit.Chunk;
-import org.bukkit.FireworkEffect;
-import org.bukkit.GameMode;
-import org.bukkit.Keyed;
-import org.bukkit.Location;
-import org.bukkit.Material;
-import org.bukkit.World;
+import io.papermc.paper.event.player.*;
+import org.bukkit.*;
 import org.bukkit.block.Block;
 import org.bukkit.block.BlockFace;
 import org.bukkit.block.BlockState;
 import org.bukkit.block.data.BlockData;
+import org.bukkit.command.BlockCommandSender;
 import org.bukkit.command.CommandSender;
-import org.bukkit.entity.AbstractVillager;
-import org.bukkit.entity.AreaEffectCloud;
-import org.bukkit.entity.Egg;
-import org.bukkit.entity.Entity;
-import org.bukkit.entity.Firework;
-import org.bukkit.entity.Hanging;
-import org.bukkit.entity.HumanEntity;
-import org.bukkit.entity.Item;
-import org.bukkit.entity.LivingEntity;
-import org.bukkit.entity.Player;
-import org.bukkit.entity.Projectile;
-import org.bukkit.entity.Vehicle;
-import org.bukkit.event.block.BlockBreakEvent;
-import org.bukkit.event.block.BlockCanBuildEvent;
-import org.bukkit.event.block.BlockDamageEvent;
-import org.bukkit.event.block.BlockDispenseEvent;
-import org.bukkit.event.block.BlockEvent;
-import org.bukkit.event.block.BlockFadeEvent;
-import org.bukkit.event.block.BlockFertilizeEvent;
-import org.bukkit.event.block.BlockFromToEvent;
-import org.bukkit.event.block.BlockGrowEvent;
-import org.bukkit.event.block.BlockIgniteEvent;
-import org.bukkit.event.block.BlockPlaceEvent;
-import org.bukkit.event.block.SignChangeEvent;
-import org.bukkit.event.block.BellRingEvent;
-import org.bukkit.event.block.BellResonateEvent;
+import org.bukkit.entity.*;
+import org.bukkit.event.block.*;
 import org.bukkit.event.enchantment.EnchantItemEvent;
 import org.bukkit.event.enchantment.PrepareItemEnchantEvent;
-import org.bukkit.event.entity.AreaEffectCloudApplyEvent;
-import org.bukkit.event.entity.CreatureSpawnEvent;
+import org.bukkit.event.entity.*;
 import org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason;
-import org.bukkit.event.entity.EntityChangeBlockEvent;
-import org.bukkit.event.entity.EntityDamageByEntityEvent;
-import org.bukkit.event.entity.EntityDamageEvent;
 import org.bukkit.event.entity.EntityDamageEvent.DamageCause;
-import org.bukkit.event.entity.EntityDeathEvent;
-import org.bukkit.event.entity.EntityDropItemEvent;
-import org.bukkit.event.entity.EntityEvent;
-import org.bukkit.event.entity.EntityPickupItemEvent;
-import org.bukkit.event.entity.EntityRegainHealthEvent;
 import org.bukkit.event.entity.EntityRegainHealthEvent.RegainReason;
-import org.bukkit.event.entity.EntityResurrectEvent;
-import org.bukkit.event.entity.EntityTameEvent;
-import org.bukkit.event.entity.EntityTeleportEvent;
-import org.bukkit.event.entity.EntityTransformEvent;
 import org.bukkit.event.entity.EntityTransformEvent.TransformReason;
-import org.bukkit.event.entity.FireworkExplodeEvent;
-import org.bukkit.event.entity.HorseJumpEvent;
-import org.bukkit.event.entity.ItemDespawnEvent;
-import org.bukkit.event.entity.ItemMergeEvent;
-import org.bukkit.event.entity.ItemSpawnEvent;
-import org.bukkit.event.entity.ProjectileHitEvent;
-import org.bukkit.event.entity.ProjectileLaunchEvent;
 import org.bukkit.event.hanging.HangingBreakByEntityEvent;
 import org.bukkit.event.hanging.HangingBreakEvent;
 import org.bukkit.event.hanging.HangingEvent;
 import org.bukkit.event.hanging.HangingPlaceEvent;
-import org.bukkit.event.inventory.ClickType;
-import org.bukkit.event.inventory.CraftItemEvent;
-import org.bukkit.event.inventory.DragType;
-import org.bukkit.event.inventory.InventoryAction;
-import org.bukkit.event.inventory.InventoryClickEvent;
-import org.bukkit.event.inventory.InventoryCloseEvent;
-import org.bukkit.event.inventory.InventoryDragEvent;
-import org.bukkit.event.inventory.InventoryMoveItemEvent;
-import org.bukkit.event.inventory.InventoryOpenEvent;
-import org.bukkit.event.inventory.InventoryPickupItemEvent;
-import org.bukkit.event.inventory.PrepareAnvilEvent;
-import org.bukkit.event.inventory.PrepareItemCraftEvent;
-import org.bukkit.event.player.PlayerBedEnterEvent;
-import org.bukkit.event.player.PlayerBedLeaveEvent;
-import org.bukkit.event.player.PlayerBucketEmptyEvent;
-import org.bukkit.event.player.PlayerBucketFillEvent;
-import org.bukkit.event.player.PlayerChangedWorldEvent;
-import org.bukkit.event.player.PlayerDropItemEvent;
-import org.bukkit.event.player.PlayerEditBookEvent;
-import org.bukkit.event.player.PlayerEggThrowEvent;
-import org.bukkit.event.player.PlayerEvent;
-import org.bukkit.event.player.PlayerInteractEntityEvent;
-import org.bukkit.event.player.PlayerInteractEvent;
-import org.bukkit.event.player.PlayerItemBreakEvent;
-import org.bukkit.event.player.PlayerItemConsumeEvent;
-import org.bukkit.event.player.PlayerItemDamageEvent;
-import org.bukkit.event.player.PlayerItemHeldEvent;
-import org.bukkit.event.player.PlayerItemMendEvent;
-import org.bukkit.event.player.PlayerMoveEvent;
-import org.bukkit.event.player.PlayerPickupArrowEvent;
-import org.bukkit.event.player.PlayerPickupItemEvent;
-import org.bukkit.event.player.PlayerQuitEvent;
+import org.bukkit.event.inventory.*;
+import org.bukkit.event.player.*;
+import org.bukkit.event.player.PlayerExpCooldownChangeEvent.ChangeReason;
 import org.bukkit.event.player.PlayerQuitEvent.QuitReason;
-import org.bukkit.event.player.PlayerRiptideEvent;
-import org.bukkit.event.player.PlayerShearEntityEvent;
-import org.bukkit.event.player.PlayerTeleportEvent;
 import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
-import org.bukkit.event.player.PlayerToggleFlightEvent;
 import org.bukkit.event.server.ServerCommandEvent;
-import org.bukkit.event.vehicle.VehicleDamageEvent;
-import org.bukkit.event.vehicle.VehicleDestroyEvent;
-import org.bukkit.event.vehicle.VehicleEnterEvent;
-import org.bukkit.event.vehicle.VehicleEvent;
-import org.bukkit.event.vehicle.VehicleExitEvent;
+import org.bukkit.event.vehicle.*;
 import org.bukkit.event.weather.LightningStrikeEvent;
 import org.bukkit.event.weather.WeatherEvent;
-import org.bukkit.event.world.ChunkEvent;
-import org.bukkit.event.world.LootGenerateEvent;
-import org.bukkit.event.world.PortalCreateEvent;
-import org.bukkit.event.world.StructureGrowEvent;
-import org.bukkit.event.world.WorldEvent;
-import org.bukkit.inventory.EntityEquipment;
-import org.bukkit.inventory.EquipmentSlot;
-import org.bukkit.inventory.Inventory;
-import org.bukkit.inventory.InventoryView;
-import org.bukkit.inventory.ItemStack;
-import org.bukkit.inventory.PlayerInventory;
-import org.bukkit.inventory.Recipe;
-import org.bukkit.potion.PotionData;
+import org.bukkit.event.world.*;
+import org.bukkit.inventory.*;
+import org.bukkit.potion.PotionEffect;
 import org.bukkit.potion.PotionEffectType;
 import org.bukkit.potion.PotionType;
-import org.jetbrains.annotations.Nullable;
+import org.skriptlang.skript.lang.converter.Converter;
 
-/**
- * @author Peter Güttinger
- */
-@SuppressWarnings("deprecation")
-public final class BukkitEventValues {
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
 
-	public BukkitEventValues() {
-	}
+import static ch.njol.skript.registrations.EventValues.*;
+
+public final class BukkitEventValues {
 
 	private static final ItemStack AIR_IS = new ItemStack(Material.AIR);
 
 	static {
 
 		// === WorldEvents ===
-		EventValues.registerEventValue(WorldEvent.class, World.class, new Getter<World, WorldEvent>() {
-			@Override
-			@Nullable
-			public World get(final WorldEvent e) {
-				return e.getWorld();
-			}
-		}, 0);
+		EventValues.registerEventValue(WorldEvent.class, World.class, WorldEvent::getWorld);
 		// StructureGrowEvent - a WorldEvent
-		EventValues.registerEventValue(StructureGrowEvent.class, Block.class, new Getter<Block, StructureGrowEvent>() {
-			@Override
-			@Nullable
-			public Block get(final StructureGrowEvent e) {
-				return e.getLocation().getBlock();
-			}
-		}, 0);
-		EventValues.registerEventValue(StructureGrowEvent.class, Block[].class, new Getter<Block[], StructureGrowEvent>() {
-			@Override
-			@Nullable
-			public Block[] get(StructureGrowEvent event) {
-				return event.getBlocks().stream()
-					.map(BlockState::getBlock)
-					.toArray(Block[]::new);
-			}
-		}, EventValues.TIME_NOW);
-		EventValues.registerEventValue(StructureGrowEvent.class, Block.class, new Getter<Block, StructureGrowEvent>() {
-			@Override
-			@Nullable
-			public Block get(StructureGrowEvent event) {
-				for (final BlockState bs : event.getBlocks()) {
-					if (bs.getLocation().equals(event.getLocation()))
-						return new BlockStateBlock(bs);
-				}
-				return event.getLocation().getBlock();
-			}
-		}, EventValues.TIME_FUTURE);
-		EventValues.registerEventValue(StructureGrowEvent.class, Block[].class, new Getter<Block[], StructureGrowEvent>() {
-			@Override
-			@Nullable
-			public Block[] get(StructureGrowEvent event) {
-				return event.getBlocks().stream()
+		EventValues.registerEventValue(StructureGrowEvent.class, Block.class, event -> event.getLocation().getBlock());
+
+		EventValues.registerEventValue(StructureGrowEvent.class, Block[].class,
+			event -> event.getBlocks().stream()
+				.map(BlockState::getBlock)
+				.toArray(Block[]::new));
+		EventValues.registerEventValue(StructureGrowEvent.class, Block.class, event -> {
+			for (BlockState bs : event.getBlocks()) {
+				if (bs.getLocation().equals(event.getLocation()))
+					return new BlockStateBlock(bs);
+			}
+			return event.getLocation().getBlock();
+		}, TIME_FUTURE);
+		EventValues.registerEventValue(StructureGrowEvent.class, Block[].class, event ->
+				event.getBlocks().stream()
 					.map(BlockStateBlock::new)
-					.toArray(Block[]::new);
-			}
-		}, EventValues.TIME_FUTURE);
+					.toArray(Block[]::new),
+			TIME_FUTURE);
 		// WeatherEvent - not a WorldEvent (wtf ô_Ô)
-		EventValues.registerEventValue(WeatherEvent.class, World.class, new Getter<World, WeatherEvent>() {
-			@Override
-			@Nullable
-			public World get(final WeatherEvent e) {
-				return e.getWorld();
-			}
-		}, 0);
+		EventValues.registerEventValue(WeatherEvent.class, World.class, WeatherEvent::getWorld);
 		// ChunkEvents
-		EventValues.registerEventValue(ChunkEvent.class, Chunk.class, new Getter<Chunk, ChunkEvent>() {
-			@Override
-			@Nullable
-			public Chunk get(final ChunkEvent e) {
-				return e.getChunk();
-			}
-		}, 0);
+		EventValues.registerEventValue(ChunkEvent.class, Chunk.class, ChunkEvent::getChunk);
 
 		// === BlockEvents ===
-		EventValues.registerEventValue(BlockEvent.class, Block.class, new Getter<Block, BlockEvent>() {
-			@Override
-			@Nullable
-			public Block get(final BlockEvent e) {
-				return e.getBlock();
-			}
-		}, 0);
-		EventValues.registerEventValue(BlockEvent.class, World.class, new Getter<World, BlockEvent>() {
-			@Override
-			@Nullable
-			public World get(final BlockEvent e) {
-				return e.getBlock().getWorld();
-			}
-		}, 0);
+		EventValues.registerEventValue(BlockEvent.class, Block.class, BlockEvent::getBlock);
+		EventValues.registerEventValue(BlockEvent.class, World.class, event -> event.getBlock().getWorld());
 		// REMIND workaround of the event's location being at the entity in block events that have an entity event value
-		EventValues.registerEventValue(BlockEvent.class, Location.class, new Getter<Location, BlockEvent>() {
-			@Override
-			@Nullable
-			public Location get(final BlockEvent e) {
-				return BlockUtils.getLocation(e.getBlock());
-			}
-		}, 0);
+		EventValues.registerEventValue(BlockEvent.class, Location.class, event -> BlockUtils.getLocation(event.getBlock()));
 		// BlockPlaceEvent
-		EventValues.registerEventValue(BlockPlaceEvent.class, Player.class, new Getter<Player, BlockPlaceEvent>() {
-			@Override
-			@Nullable
-			public Player get(final BlockPlaceEvent e) {
-				return e.getPlayer();
-			}
-		}, 0);
-		EventValues.registerEventValue(BlockPlaceEvent.class, ItemStack.class, new Getter<ItemStack, BlockPlaceEvent>() {
-			@Override
-			@Nullable
-			public ItemStack get(BlockPlaceEvent event) {
-				return event.getItemInHand();
-			}
-		}, EventValues.TIME_PAST);
-		EventValues.registerEventValue(BlockPlaceEvent.class, ItemStack.class, new Getter<ItemStack, BlockPlaceEvent>() {
-			@Override
-			@Nullable
-			public ItemStack get(BlockPlaceEvent event) {
-				return event.getItemInHand();
-			}
-		}, EventValues.TIME_NOW);
-		EventValues.registerEventValue(BlockPlaceEvent.class, ItemStack.class, new Getter<ItemStack, BlockPlaceEvent>() {
-			@Override
-			@Nullable
-			public ItemStack get(BlockPlaceEvent event) {
-				ItemStack item = event.getItemInHand().clone();
-				if (event.getPlayer().getGameMode() != GameMode.CREATIVE)
-					item.setAmount(item.getAmount() - 1);
-				return item;
-			}
-		}, EventValues.TIME_FUTURE);
-		EventValues.registerEventValue(BlockPlaceEvent.class, Block.class, new Getter<Block, BlockPlaceEvent>() {
-			@Override
-			public Block get(final BlockPlaceEvent e) {
-				return new BlockStateBlock(e.getBlockReplacedState());
-			}
-		}, -1);
-		EventValues.registerEventValue(BlockPlaceEvent.class, Direction.class, new Getter<Direction, BlockPlaceEvent>() {
-			@Override
-			@Nullable
-			public Direction get(final BlockPlaceEvent e) {
-				BlockFace bf = e.getBlockPlaced().getFace(e.getBlockAgainst());
-				if (bf != null) {
-					return new Direction(new double[] {bf.getModX(), bf.getModY(), bf.getModZ()});
-				}
-				return Direction.ZERO;
-			}
-		}, 0);
+		EventValues.registerEventValue(BlockPlaceEvent.class, Player.class, BlockPlaceEvent::getPlayer);
+		EventValues.registerEventValue(BlockPlaceEvent.class, ItemStack.class, BlockPlaceEvent::getItemInHand, TIME_PAST);
+		EventValues.registerEventValue(BlockPlaceEvent.class, ItemStack.class, BlockPlaceEvent::getItemInHand);
+		EventValues.registerEventValue(BlockPlaceEvent.class, ItemStack.class, event -> {
+			ItemStack item = event.getItemInHand().clone();
+			if (event.getPlayer().getGameMode() != GameMode.CREATIVE)
+				item.setAmount(item.getAmount() - 1);
+			return item;
+		}, TIME_FUTURE);
+		EventValues.registerEventValue(BlockPlaceEvent.class, Block.class,
+			event -> new BlockStateBlock(event.getBlockReplacedState()), TIME_PAST);
+		EventValues.registerEventValue(BlockPlaceEvent.class, Direction.class, event -> {
+			BlockFace bf = event.getBlockPlaced().getFace(event.getBlockAgainst());
+			if (bf != null) {
+				return new Direction(new double[]{bf.getModX(), bf.getModY(), bf.getModZ()});
+			}
+			return Direction.ZERO;
+		});
 		// BlockFadeEvent
-		EventValues.registerEventValue(BlockFadeEvent.class, Block.class, new Getter<Block, BlockFadeEvent>() {
-			@Override
-			@Nullable
-			public Block get(final BlockFadeEvent e) {
-				return e.getBlock();
-			}
-		}, -1);
-		EventValues.registerEventValue(BlockFadeEvent.class, Block.class, new Getter<Block, BlockFadeEvent>() {
-			@Override
-			public Block get(final BlockFadeEvent e) {
-				return new DelayedChangeBlock(e.getBlock(), e.getNewState());
-			}
-		}, 0);
-		EventValues.registerEventValue(BlockFadeEvent.class, Block.class, new Getter<Block, BlockFadeEvent>() {
-			@Override
-			public Block get(final BlockFadeEvent e) {
-				return new BlockStateBlock(e.getNewState());
-			}
-		}, 1);
+		EventValues.registerEventValue(BlockFadeEvent.class, Block.class, BlockEvent::getBlock, TIME_PAST);
+		EventValues.registerEventValue(BlockFadeEvent.class, Block.class,
+			event -> new DelayedChangeBlock(event.getBlock(), event.getNewState()));
+		EventValues.registerEventValue(BlockFadeEvent.class, Block.class,
+			event -> new BlockStateBlock(event.getNewState()), TIME_FUTURE);
 		// BlockGrowEvent (+ BlockFormEvent)
-		EventValues.registerEventValue(BlockGrowEvent.class, Block.class, new Getter<Block, BlockGrowEvent>() {
-			@Override
-			@Nullable
-			public Block get(final BlockGrowEvent e) {
-				return new BlockStateBlock(e.getNewState());
-			}
-		}, 0);
-		EventValues.registerEventValue(BlockGrowEvent.class, Block.class, new Getter<Block, BlockGrowEvent>() {
-			@Override
-			@Nullable
-			public Block get(final BlockGrowEvent e) {
-				return e.getBlock();
-			}
-		}, -1);
+		EventValues.registerEventValue(BlockGrowEvent.class, Block.class,
+			event -> new BlockStateBlock(event.getNewState()));
+		EventValues.registerEventValue(BlockGrowEvent.class, Block.class, BlockEvent::getBlock, TIME_PAST);
 		// BlockDamageEvent
-		EventValues.registerEventValue(BlockDamageEvent.class, Player.class, new Getter<Player, BlockDamageEvent>() {
-			@Override
-			@Nullable
-			public Player get(final BlockDamageEvent e) {
-				return e.getPlayer();
-			}
-		}, 0);
+		EventValues.registerEventValue(BlockDamageEvent.class, Player.class, BlockDamageEvent::getPlayer);
 		// BlockBreakEvent
-		EventValues.registerEventValue(BlockBreakEvent.class, Player.class, new Getter<Player, BlockBreakEvent>() {
-			@Override
-			@Nullable
-			public Player get(final BlockBreakEvent e) {
-				return e.getPlayer();
-			}
-		}, 0);
-		EventValues.registerEventValue(BlockBreakEvent.class, Block.class, new Getter<Block, BlockBreakEvent>() {
-			@Override
-			@Nullable
-			public Block get(final BlockBreakEvent e) {
-				return e.getBlock();
-			}
-		}, -1);
-		EventValues.registerEventValue(BlockBreakEvent.class, Block.class, new Getter<Block, BlockBreakEvent>() {
-			@Override
-			public Block get(final BlockBreakEvent e) {
-				return new DelayedChangeBlock(e.getBlock());
-			}
-		}, 0);
-		EventValues.registerEventValue(BlockBreakEvent.class, Block.class, new Getter<Block, BlockBreakEvent>() {
-			@Override
-			public Block get(final BlockBreakEvent e) {
-				final BlockState s = e.getBlock().getState();
-				s.setType(s.getType() == Material.ICE ? Material.WATER : Material.AIR);
-				s.setRawData((byte) 0);
-				return new BlockStateBlock(s, true);
-			}
-		}, 1);
+		EventValues.registerEventValue(BlockBreakEvent.class, Player.class, BlockBreakEvent::getPlayer);
+		EventValues.registerEventValue(BlockBreakEvent.class, Block.class, BlockEvent::getBlock, TIME_PAST);
+		EventValues.registerEventValue(BlockBreakEvent.class, Block.class, event -> new DelayedChangeBlock(event.getBlock()));
 		// BlockFromToEvent
-		EventValues.registerEventValue(BlockFromToEvent.class, Block.class, new Getter<Block, BlockFromToEvent>() {
-			@Override
-			@Nullable
-			public Block get(final BlockFromToEvent e) {
-				return e.getToBlock();
-			}
-		}, 1);
+		EventValues.registerEventValue(BlockFromToEvent.class, Block.class, BlockFromToEvent::getToBlock, TIME_FUTURE);
 		// BlockIgniteEvent
-		EventValues.registerEventValue(BlockIgniteEvent.class, Player.class, new Getter<Player, BlockIgniteEvent>() {
-			@Override
-			@Nullable
-			public Player get(final BlockIgniteEvent e) {
-				return e.getPlayer();
-			}
-		}, 0);
-		EventValues.registerEventValue(BlockIgniteEvent.class, Block.class, new Getter<Block, BlockIgniteEvent>() {
-			@Override
-			@Nullable
-			public Block get(final BlockIgniteEvent e) {
-				return e.getIgnitingBlock();
-			}
-		}, 0);
+		EventValues.registerEventValue(BlockIgniteEvent.class, Player.class, BlockIgniteEvent::getPlayer);
+		EventValues.registerEventValue(BlockIgniteEvent.class, Block.class, BlockIgniteEvent::getBlock);
 		// BlockDispenseEvent
-		EventValues.registerEventValue(BlockDispenseEvent.class, ItemStack.class, new Getter<ItemStack, BlockDispenseEvent>() {
-			@Override
-			@Nullable
-			public ItemStack get(final BlockDispenseEvent e) {
-				return e.getItem();
-			}
-		}, 0);
+		EventValues.registerEventValue(BlockDispenseEvent.class, ItemStack.class, BlockDispenseEvent::getItem);
 		// BlockCanBuildEvent
-		EventValues.registerEventValue(BlockCanBuildEvent.class, Block.class, new Getter<Block, BlockCanBuildEvent>() {
-			@Override
-			@Nullable
-			public Block get(final BlockCanBuildEvent e) {
-				return e.getBlock();
-			}
-		}, -1);
-		EventValues.registerEventValue(BlockCanBuildEvent.class, Block.class, new Getter<Block, BlockCanBuildEvent>() {
-			@Override
-			public Block get(final BlockCanBuildEvent e) {
-				final BlockState s = e.getBlock().getState();
-				s.setType(e.getMaterial());
-				return new BlockStateBlock(s, true);
-			}
-		}, 0);
+		EventValues.registerEventValue(BlockCanBuildEvent.class, Block.class, BlockEvent::getBlock, TIME_PAST);
+		EventValues.registerEventValue(BlockCanBuildEvent.class, Block.class, event -> {
+			BlockState state = event.getBlock().getState();
+			state.setType(event.getMaterial());
+			return new BlockStateBlock(state, true);
+		});
 		// BlockCanBuildEvent#getPlayer was added in 1.13
 		if (Skript.methodExists(BlockCanBuildEvent.class, "getPlayer")) {
-			EventValues.registerEventValue(BlockCanBuildEvent.class, Player.class, new Getter<Player, BlockCanBuildEvent>() {
-				@Override
-				@Nullable
-				public Player get(final BlockCanBuildEvent e) {
-					return e.getPlayer();
-				}
-			}, 0);
+			EventValues.registerEventValue(BlockCanBuildEvent.class, Player.class, BlockCanBuildEvent::getPlayer);
 		}
 		// SignChangeEvent
-		EventValues.registerEventValue(SignChangeEvent.class, Player.class, new Getter<Player, SignChangeEvent>() {
-			@Override
-			@Nullable
-			public Player get(final SignChangeEvent e) {
-				return e.getPlayer();
-			}
-		}, 0);
-		EventValues.registerEventValue(SignChangeEvent.class, String[].class, new Getter<String[], SignChangeEvent>() {
-			@Override
-			@Nullable
-			public String[] get(SignChangeEvent event) {
-				return event.getLines();
-			}
-		}, EventValues.TIME_NOW);
+		EventValues.registerEventValue(SignChangeEvent.class, Player.class, SignChangeEvent::getPlayer);
+		EventValues.registerEventValue(SignChangeEvent.class, String[].class, SignChangeEvent::getLines);
 
 		// === EntityEvents ===
-		EventValues.registerEventValue(EntityEvent.class, Entity.class, new Getter<Entity, EntityEvent>() {
-			@Override
-			@Nullable
-			public Entity get(final EntityEvent e) {
-				return e.getEntity();
-			}
-		}, 0, "Use 'attacker' and/or 'victim' in damage/death events", EntityDamageEvent.class, EntityDeathEvent.class);
-		EventValues.registerEventValue(EntityEvent.class, CommandSender.class, new Getter<CommandSender, EntityEvent>() {
-			@Override
-			@Nullable
-			public CommandSender get(final EntityEvent e) {
-				return e.getEntity();
-			}
-		}, 0, "Use 'attacker' and/or 'victim' in damage/death events", EntityDamageEvent.class, EntityDeathEvent.class);
-		EventValues.registerEventValue(EntityEvent.class, World.class, new Getter<World, EntityEvent>() {
-			@Override
-			@Nullable
-			public World get(final EntityEvent e) {
-				return e.getEntity().getWorld();
-			}
-		}, 0);
-		EventValues.registerEventValue(EntityEvent.class, Location.class, new Getter<Location, EntityEvent>() {
-			@Override
-			@Nullable
-			public Location get(final EntityEvent e) {
-				return e.getEntity().getLocation();
-			}
-		}, 0);
+		EventValues.registerEventValue(EntityEvent.class, Entity.class, EntityEvent::getEntity, TIME_NOW,
+			"Use 'attacker' and/or 'victim' in damage/death events", EntityDamageEvent.class, EntityDeathEvent.class);
+		EventValues.registerEventValue(EntityEvent.class, CommandSender.class, EntityEvent::getEntity, TIME_NOW,
+			"Use 'attacker' and/or 'victim' in damage/death events", EntityDamageEvent.class, EntityDeathEvent.class);
+		EventValues.registerEventValue(EntityEvent.class, World.class, event -> event.getEntity().getWorld());
+		EventValues.registerEventValue(EntityEvent.class, Location.class, event -> event.getEntity().getLocation());
 		// EntityDamageEvent
-		EventValues.registerEventValue(EntityDamageEvent.class, DamageCause.class, new Getter<DamageCause, EntityDamageEvent>() {
-			@Override
-			@Nullable
-			public DamageCause get(final EntityDamageEvent e) {
-				return e.getCause();
-			}
-		}, 0);
-		EventValues.registerEventValue(EntityDamageByEntityEvent.class, Projectile.class, new Getter<Projectile, EntityDamageByEntityEvent>() {
-			@Override
-			@Nullable
-			public Projectile get(final EntityDamageByEntityEvent e) {
-				if (e.getDamager() instanceof Projectile)
-					return (Projectile) e.getDamager();
-				return null;
-			}
-		}, 0);
+		EventValues.registerEventValue(EntityDamageEvent.class, DamageCause.class, EntityDamageEvent::getCause);
+		EventValues.registerEventValue(EntityDamageByEntityEvent.class, Projectile.class, event -> {
+			if (event.getDamager() instanceof Projectile projectile)
+				return projectile;
+			return null;
+		});
 		// EntityDeathEvent
-		EventValues.registerEventValue(EntityDeathEvent.class, ItemStack[].class, new Getter<ItemStack[], EntityDeathEvent>() {
-			@Override
-			@Nullable
-			public ItemStack[] get(EntityDeathEvent event) {
-				return event.getDrops().toArray(new ItemStack[0]);
-			}
-		}, EventValues.TIME_NOW);
-		EventValues.registerEventValue(EntityDeathEvent.class, Projectile.class, new Getter<Projectile, EntityDeathEvent>() {
-			@Override
-			@Nullable
-			public Projectile get(final EntityDeathEvent e) {
-				final EntityDamageEvent ldc = e.getEntity().getLastDamageCause();
-				if (ldc instanceof EntityDamageByEntityEvent && ((EntityDamageByEntityEvent) ldc).getDamager() instanceof Projectile)
-					return (Projectile) ((EntityDamageByEntityEvent) ldc).getDamager();
-				return null;
-			}
-		}, 0);
-		EventValues.registerEventValue(EntityDeathEvent.class, DamageCause.class, new Getter<DamageCause, EntityDeathEvent>() {
-			@Override
-			@Nullable
-			public DamageCause get(final EntityDeathEvent e) {
-				final EntityDamageEvent ldc = e.getEntity().getLastDamageCause();
-				return ldc == null ? null : ldc.getCause();
-			}
-		}, 0);
+		EventValues.registerEventValue(EntityDeathEvent.class, ItemStack[].class, event -> event.getDrops().toArray(new ItemStack[0]));
+		EventValues.registerEventValue(EntityDeathEvent.class, Projectile.class, event -> {
+			EntityDamageEvent damageEvent = event.getEntity().getLastDamageCause();
+			if (damageEvent instanceof EntityDamageByEntityEvent entityEvent && entityEvent.getDamager() instanceof Projectile projectile)
+				return projectile;
+			return null;
+		});
+		EventValues.registerEventValue(EntityDeathEvent.class, DamageCause.class, event -> {
+			EntityDamageEvent damageEvent = event.getEntity().getLastDamageCause();
+			return damageEvent == null ? null : damageEvent.getCause();
+		});
+
+		// Entity Potion Effect
+		EventValues.registerEventValue(EntityPotionEffectEvent.class, PotionEffect.class, EntityPotionEffectEvent::getOldEffect, TIME_PAST);
+		EventValues.registerEventValue(EntityPotionEffectEvent.class, PotionEffect.class, EntityPotionEffectEvent::getNewEffect);
+		EventValues.registerEventValue(EntityPotionEffectEvent.class, PotionEffectType.class, EntityPotionEffectEvent::getModifiedType);
+		EventValues.registerEventValue(EntityPotionEffectEvent.class, EntityPotionEffectEvent.Cause.class, EntityPotionEffectEvent::getCause);
+
 		// ProjectileHitEvent
 		// ProjectileHitEvent#getHitBlock was added in 1.11
 		if (Skript.methodExists(ProjectileHitEvent.class, "getHitBlock"))
-			EventValues.registerEventValue(ProjectileHitEvent.class, Block.class, new Getter<Block, ProjectileHitEvent>() {
-				@Nullable
-				@Override
-				public Block get(ProjectileHitEvent e) {
-					return e.getHitBlock();
-				}
-			}, 0);
-		EventValues.registerEventValue(ProjectileHitEvent.class, Entity.class, new Getter<Entity, ProjectileHitEvent>() {
-			@Override
-			@Nullable
-			public Entity get(final ProjectileHitEvent e) {
-				assert false;
-				return e.getEntity();
-			}
-		}, 0, "Use 'projectile' and/or 'shooter' in projectile hit events", ProjectileHitEvent.class);
-		EventValues.registerEventValue(ProjectileHitEvent.class, Projectile.class, new Getter<Projectile, ProjectileHitEvent>() {
-			@Override
-			@Nullable
-			public Projectile get(final ProjectileHitEvent e) {
-				return e.getEntity();
-			}
-		}, 0);
+			EventValues.registerEventValue(ProjectileHitEvent.class, Block.class, ProjectileHitEvent::getHitBlock);
+		EventValues.registerEventValue(ProjectileHitEvent.class, Entity.class, event -> {
+			assert false;
+			return event.getEntity();
+		}, TIME_NOW, "Use 'projectile' and/or 'shooter' in projectile hit events", ProjectileHitEvent.class);
+		EventValues.registerEventValue(ProjectileHitEvent.class, Projectile.class, ProjectileHitEvent::getEntity);
 		if (Skript.methodExists(ProjectileHitEvent.class, "getHitBlockFace")) {
-			EventValues.registerEventValue(ProjectileHitEvent.class, Direction.class, new Getter<Direction, ProjectileHitEvent>() {
-				@Override
-				@Nullable
-				public Direction get(final ProjectileHitEvent e) {
-					BlockFace theHitFace = e.getHitBlockFace();
-					if (theHitFace == null) return null;
-					return new Direction(theHitFace, 1);
-				}
-			}, 0);
+			EventValues.registerEventValue(ProjectileHitEvent.class, Direction.class, event -> {
+				BlockFace theHitFace = event.getHitBlockFace();
+				if (theHitFace == null) return null;
+				return new Direction(theHitFace, TIME_FUTURE);
+			});
 		}
 		// ProjectileLaunchEvent
-		EventValues.registerEventValue(ProjectileLaunchEvent.class, Entity.class, new Getter<Entity, ProjectileLaunchEvent>() {
-			@Override
-			@Nullable
-			public Entity get(final ProjectileLaunchEvent e) {
-				assert false;
-				return e.getEntity();
-			}
-		}, 0, "Use 'projectile' and/or 'shooter' in shoot events", ProjectileLaunchEvent.class);
+		EventValues.registerEventValue(ProjectileLaunchEvent.class, Entity.class, event -> {
+			assert false;
+			return event.getEntity();
+		}, TIME_NOW, "Use 'projectile' and/or 'shooter' in shoot events", ProjectileLaunchEvent.class);
 		//ProjectileCollideEvent
 		if (Skript.classExists("com.destroystokyo.paper.event.entity.ProjectileCollideEvent")) {
-			EventValues.registerEventValue(ProjectileCollideEvent.class, Projectile.class, new Getter<Projectile, ProjectileCollideEvent>() {
-				@Nullable
-				@Override
-				public Projectile get(ProjectileCollideEvent evt) {
-					return evt.getEntity();
-				}
-			}, 0);
-			EventValues.registerEventValue(ProjectileCollideEvent.class, Entity.class, new Getter<Entity, ProjectileCollideEvent>() {
-				@Nullable
-				@Override
-				public Entity get(ProjectileCollideEvent evt) {
-					return evt.getCollidedWith();
-				}
-			}, 0);
+			EventValues.registerEventValue(ProjectileCollideEvent.class, Projectile.class, ProjectileCollideEvent::getEntity);
+			EventValues.registerEventValue(ProjectileCollideEvent.class, Entity.class, ProjectileCollideEvent::getCollidedWith);
 		}
-		EventValues.registerEventValue(ProjectileLaunchEvent.class, Projectile.class, new Getter<Projectile, ProjectileLaunchEvent>() {
-			@Override
-			@Nullable
-			public Projectile get(final ProjectileLaunchEvent e) {
-				return e.getEntity();
-			}
-		}, 0);
+		EventValues.registerEventValue(ProjectileLaunchEvent.class, Projectile.class, ProjectileLaunchEvent::getEntity);
 		// EntityTameEvent
-		EventValues.registerEventValue(EntityTameEvent.class, Entity.class, new Getter<Entity, EntityTameEvent>() {
-			@Override
-			@Nullable
-			public Entity get(final EntityTameEvent e) {
-				return e.getEntity();
-			}
-		}, 0);
+		EventValues.registerEventValue(EntityTameEvent.class, Entity.class, EntityTameEvent::getEntity);
 
 		// EntityTeleportEvent
-		EventValues.registerEventValue(EntityTeleportEvent.class, Location.class, new Getter<Location, EntityTeleportEvent>() {
-			@Override
-			public @Nullable Location get(EntityTeleportEvent event) {
-				return event.getFrom();
-			}
-		}, EventValues.TIME_PAST);
-		EventValues.registerEventValue(EntityTeleportEvent.class, Location.class, new Getter<Location, EntityTeleportEvent>() {
-			@Override
-			public @Nullable Location get(EntityTeleportEvent event) {
-				return event.getTo();
-			}
-		}, EventValues.TIME_NOW);
+		EventValues.registerEventValue(EntityTeleportEvent.class, Location.class, EntityTeleportEvent::getFrom, TIME_PAST);
+		EventValues.registerEventValue(EntityTeleportEvent.class, Location.class, EntityTeleportEvent::getTo);
 
 		// EntityChangeBlockEvent
-		EventValues.registerEventValue(EntityChangeBlockEvent.class, Block.class, new Getter<Block, EntityChangeBlockEvent>() {
-			@Override
-			@Nullable
-			public Block get(EntityChangeBlockEvent event) {
-				return event.getBlock();
-			}
-		}, EventValues.TIME_PAST);
-		EventValues.registerEventValue(EntityChangeBlockEvent.class, Block.class, new Getter<Block, EntityChangeBlockEvent>() {
-			@Override
-			@Nullable
-			public Block get(EntityChangeBlockEvent event) {
-				return event.getBlock();
-			}
-		}, EventValues.TIME_NOW);
-		EventValues.registerEventValue(EntityChangeBlockEvent.class, BlockData.class, new Getter<BlockData, EntityChangeBlockEvent>() {
-			@Override
-			@Nullable
-			public BlockData get(EntityChangeBlockEvent event) {
-				return event.getBlockData();
-			}
-		}, EventValues.TIME_NOW);
-		EventValues.registerEventValue(EntityChangeBlockEvent.class, BlockData.class, new Getter<BlockData, EntityChangeBlockEvent>() {
-			@Override
-			@Nullable
-			public BlockData get(EntityChangeBlockEvent event) {
-				return event.getBlockData();
-			}
-		}, EventValues.TIME_FUTURE);
+		EventValues.registerEventValue(EntityChangeBlockEvent.class, Block.class, EntityChangeBlockEvent::getBlock, TIME_PAST);
+		EventValues.registerEventValue(EntityChangeBlockEvent.class, Block.class, EntityChangeBlockEvent::getBlock);
+		EventValues.registerEventValue(EntityChangeBlockEvent.class, BlockData.class, EntityChangeBlockEvent::getBlockData);
+		EventValues.registerEventValue(EntityChangeBlockEvent.class, BlockData.class, EntityChangeBlockEvent::getBlockData, TIME_FUTURE);
 
 		// AreaEffectCloudApplyEvent
-		EventValues.registerEventValue(AreaEffectCloudApplyEvent.class, LivingEntity[].class, new Getter<LivingEntity[], AreaEffectCloudApplyEvent>() {
-			@Override
-			@Nullable
-			public LivingEntity[] get(AreaEffectCloudApplyEvent event) {
-				return event.getAffectedEntities().toArray(new LivingEntity[0]);
-			}
-		}, EventValues.TIME_NOW);
-		EventValues.registerEventValue(AreaEffectCloudApplyEvent.class, PotionEffectType.class, new Getter<PotionEffectType, AreaEffectCloudApplyEvent>() {
+		EventValues.registerEventValue(AreaEffectCloudApplyEvent.class, LivingEntity[].class,
+			event -> event.getAffectedEntities().toArray(new LivingEntity[0]));
+		EventValues.registerEventValue(AreaEffectCloudApplyEvent.class, PotionEffectType.class, new Converter<>() {
 			private final boolean HAS_POTION_TYPE_METHOD = Skript.methodExists(AreaEffectCloud.class, "getBasePotionType");
+
 			@Override
-			@Nullable
-			public PotionEffectType get(AreaEffectCloudApplyEvent e) {
+			public PotionEffectType convert(AreaEffectCloudApplyEvent event) {
 				// TODO needs to be reworked to support multiple values (there can be multiple potion effects)
 				if (HAS_POTION_TYPE_METHOD) {
-					PotionType base = e.getEntity().getBasePotionType();
+					PotionType base = event.getEntity().getBasePotionType();
 					if (base != null)
 						return base.getEffectType();
 				} else {
-					return e.getEntity().getBasePotionData().getType().getEffectType();
+					return event.getEntity().getBasePotionData().getType().getEffectType();
 				}
 				return null;
 			}
-		}, 0);
+		});
 		// ItemSpawnEvent
-		EventValues.registerEventValue(ItemSpawnEvent.class, ItemStack.class, new Getter<ItemStack, ItemSpawnEvent>() {
-			@Override
-			@Nullable
-			public ItemStack get(final ItemSpawnEvent e) {
-				return e.getEntity().getItemStack();
-			}
-		}, 0);
+		EventValues.registerEventValue(ItemSpawnEvent.class, ItemStack.class, event -> event.getEntity().getItemStack());
 		// LightningStrikeEvent
-		EventValues.registerEventValue(LightningStrikeEvent.class, Entity.class, new Getter<Entity, LightningStrikeEvent>() {
-			@Override
-			public Entity get(LightningStrikeEvent event) {
-				return event.getLightning();
-			}
-		}, 0);
+		EventValues.registerEventValue(LightningStrikeEvent.class, Entity.class, LightningStrikeEvent::getLightning);
 		// EndermanAttackPlayerEvent
 		if (Skript.classExists("com.destroystokyo.paper.event.entity.EndermanAttackPlayerEvent")) {
-			EventValues.registerEventValue(EndermanAttackPlayerEvent.class, Player.class, new Getter<Player, EndermanAttackPlayerEvent>() {
-				@Override
-				public Player get(EndermanAttackPlayerEvent event) {
-					return event.getPlayer();
-				}
-			}, EventValues.TIME_NOW);
+			EventValues.registerEventValue(EndermanAttackPlayerEvent.class, Player.class, EndermanAttackPlayerEvent::getPlayer);
 		}
 
 		// --- PlayerEvents ---
-		EventValues.registerEventValue(PlayerEvent.class, Player.class, new Getter<Player, PlayerEvent>() {
-			@Override
-			@Nullable
-			public Player get(final PlayerEvent e) {
-				return e.getPlayer();
-			}
-		}, 0);
-		EventValues.registerEventValue(PlayerEvent.class, World.class, new Getter<World, PlayerEvent>() {
-			@Override
-			@Nullable
-			public World get(final PlayerEvent e) {
-				return e.getPlayer().getWorld();
-			}
-		}, 0);
+		EventValues.registerEventValue(PlayerEvent.class, Player.class, PlayerEvent::getPlayer);
+		EventValues.registerEventValue(PlayerEvent.class, World.class, event -> event.getPlayer().getWorld());
 		// PlayerBedEnterEvent
-		EventValues.registerEventValue(PlayerBedEnterEvent.class, Block.class, new Getter<Block, PlayerBedEnterEvent>() {
-			@Override
-			@Nullable
-			public Block get(final PlayerBedEnterEvent e) {
-				return e.getBed();
-			}
-		}, 0);
+		EventValues.registerEventValue(PlayerBedEnterEvent.class, Block.class, PlayerBedEnterEvent::getBed);
 		// PlayerBedLeaveEvent
-		EventValues.registerEventValue(PlayerBedLeaveEvent.class, Block.class, new Getter<Block, PlayerBedLeaveEvent>() {
-			@Override
-			@Nullable
-			public Block get(final PlayerBedLeaveEvent e) {
-				return e.getBed();
-			}
-		}, 0);
+		EventValues.registerEventValue(PlayerBedLeaveEvent.class, Block.class, PlayerBedLeaveEvent::getBed);
 		// PlayerBucketEvents
-		EventValues.registerEventValue(PlayerBucketFillEvent.class, Block.class, new Getter<Block, PlayerBucketFillEvent>() {
-			@Override
-			@Nullable
-			public Block get(final PlayerBucketFillEvent e) {
-				return e.getBlockClicked();
-			}
-		}, 0);
-		EventValues.registerEventValue(PlayerBucketFillEvent.class, Block.class, new Getter<Block, PlayerBucketFillEvent>() {
-			@Override
-			@Nullable
-			public Block get(final PlayerBucketFillEvent e) {
-				final BlockState s = e.getBlockClicked().getState();
-				s.setType(Material.AIR);
-				s.setRawData((byte) 0);
-				return new BlockStateBlock(s, true);
-			}
-		}, 1);
-		EventValues.registerEventValue(PlayerBucketEmptyEvent.class, Block.class, new Getter<Block, PlayerBucketEmptyEvent>() {
-			@Override
-			@Nullable
-			public Block get(final PlayerBucketEmptyEvent e) {
-				return e.getBlockClicked().getRelative(e.getBlockFace());
-			}
-		}, -1);
-		EventValues.registerEventValue(PlayerBucketEmptyEvent.class, Block.class, new Getter<Block, PlayerBucketEmptyEvent>() {
-			@Override
-			public Block get(final PlayerBucketEmptyEvent e) {
-				final BlockState s = e.getBlockClicked().getRelative(e.getBlockFace()).getState();
-				s.setType(e.getBucket() == Material.WATER_BUCKET ? Material.WATER : Material.LAVA);
-				s.setRawData((byte) 0);
-				return new BlockStateBlock(s, true);
-			}
-		}, 0);
+		EventValues.registerEventValue(PlayerBucketFillEvent.class, Block.class, PlayerBucketEvent::getBlockClicked);
+		EventValues.registerEventValue(PlayerBucketFillEvent.class, Block.class, event -> {
+			BlockState state = event.getBlockClicked().getState();
+			state.setType(Material.AIR);
+			state.setRawData((byte) 0);
+			return new BlockStateBlock(state, true);
+		}, TIME_FUTURE);
+		EventValues.registerEventValue(PlayerBucketEmptyEvent.class, Block.class,
+			event -> event.getBlockClicked().getRelative(event.getBlockFace()), TIME_PAST);
+		EventValues.registerEventValue(PlayerBucketEmptyEvent.class, Block.class, event -> {
+			BlockState state = event.getBlockClicked().getRelative(event.getBlockFace()).getState();
+			state.setType(event.getBucket() == Material.WATER_BUCKET ? Material.WATER : Material.LAVA);
+			state.setRawData((byte) 0);
+			return new BlockStateBlock(state, true);
+		});
 		// PlayerDropItemEvent
-		EventValues.registerEventValue(PlayerDropItemEvent.class, Player.class, new Getter<Player, PlayerDropItemEvent>() {
-			@Override
-			@Nullable
-			public Player get(PlayerDropItemEvent e) {
-				return e.getPlayer();
-			}
-		}, 0);
-		EventValues.registerEventValue(PlayerDropItemEvent.class, Item.class, new Getter<Item, PlayerDropItemEvent>() {
-			@Override
-			@Nullable
-			public Item get(final PlayerDropItemEvent e) {
-				return e.getItemDrop();
-			}
-		}, 0);
-		EventValues.registerEventValue(PlayerDropItemEvent.class, ItemStack.class, new Getter<ItemStack, PlayerDropItemEvent>() {
-			@Override
-			@Nullable
-			public ItemStack get(final PlayerDropItemEvent e) {
-				return e.getItemDrop().getItemStack();
-			}
-		}, 0);
+		EventValues.registerEventValue(PlayerDropItemEvent.class, Player.class, PlayerEvent::getPlayer);
+		EventValues.registerEventValue(PlayerDropItemEvent.class, Item.class, PlayerDropItemEvent::getItemDrop);
+		EventValues.registerEventValue(PlayerDropItemEvent.class, ItemStack.class, event -> event.getItemDrop().getItemStack());
 		// EntityDropItemEvent
-		EventValues.registerEventValue(EntityDropItemEvent.class, Item.class, new Getter<Item, EntityDropItemEvent>() {
-			@Override
-			public Item get(EntityDropItemEvent event) {
-				return event.getItemDrop();
-			}
-		}, EventValues.TIME_NOW);
-		EventValues.registerEventValue(EntityDropItemEvent.class, ItemStack.class, new Getter<ItemStack, EntityDropItemEvent>() {
-			@Override
-			public ItemStack get(EntityDropItemEvent event) {
-				return event.getItemDrop().getItemStack();
-			}
-		}, EventValues.TIME_NOW);
+		EventValues.registerEventValue(EntityDropItemEvent.class, Item.class, EntityDropItemEvent::getItemDrop);
+		EventValues.registerEventValue(EntityDropItemEvent.class, ItemStack.class, event -> event.getItemDrop().getItemStack());
 		// PlayerPickupItemEvent
-		EventValues.registerEventValue(PlayerPickupItemEvent.class, Player.class, new Getter<Player, PlayerPickupItemEvent>() {
-			@Override
-			@Nullable
-			public Player get(PlayerPickupItemEvent e) {
-				return e.getPlayer();
-			}
-		}, 0);
-		EventValues.registerEventValue(PlayerPickupItemEvent.class, Item.class, new Getter<Item, PlayerPickupItemEvent>() {
-			@Override
-			@Nullable
-			public Item get(final PlayerPickupItemEvent e) {
-				return e.getItem();
-			}
-		}, 0);
-		EventValues.registerEventValue(PlayerPickupItemEvent.class, ItemStack.class, new Getter<ItemStack, PlayerPickupItemEvent>() {
-			@Override
-			@Nullable
-			public ItemStack get(final PlayerPickupItemEvent e) {
-				return e.getItem().getItemStack();
-			}
-		}, 0);
+		EventValues.registerEventValue(PlayerPickupItemEvent.class, Player.class, PlayerEvent::getPlayer);
+		EventValues.registerEventValue(PlayerPickupItemEvent.class, Item.class, PlayerPickupItemEvent::getItem);
+		EventValues.registerEventValue(PlayerPickupItemEvent.class, ItemStack.class, event -> event.getItem().getItemStack());
 		// EntityPickupItemEvent
-		EventValues.registerEventValue(EntityPickupItemEvent.class, Entity.class, new Getter<Entity, EntityPickupItemEvent>() {
-			@Override
-			public @Nullable Entity get(EntityPickupItemEvent e) {
-				return e.getEntity();
-			}
-		}, 0);
-		EventValues.registerEventValue(EntityPickupItemEvent.class, Item.class, new Getter<Item, EntityPickupItemEvent>() {
-			@Override
-			@Nullable
-			public Item get(final EntityPickupItemEvent e) {
-				return e.getItem();
-			}
-		}, 0);
-		EventValues.registerEventValue(EntityPickupItemEvent.class, ItemType.class, new Getter<ItemType, EntityPickupItemEvent>() {
-			@Override
-			@Nullable
-			public ItemType get(final EntityPickupItemEvent e) {
-				return new ItemType(e.getItem().getItemStack());
-			}
-		}, 0);
+		EventValues.registerEventValue(EntityPickupItemEvent.class, Entity.class, EntityPickupItemEvent::getEntity);
+		EventValues.registerEventValue(EntityPickupItemEvent.class, Item.class, EntityPickupItemEvent::getItem);
+		EventValues.registerEventValue(EntityPickupItemEvent.class, ItemType.class, event -> new ItemType(event.getItem().getItemStack()));
 		// PlayerItemConsumeEvent
-		EventValues.registerEventValue(PlayerItemConsumeEvent.class, ItemStack.class, new Getter<ItemStack, PlayerItemConsumeEvent>() {
-			@Override
-			@Nullable
-			public ItemStack get(final PlayerItemConsumeEvent e) {
-				return e.getItem();
-			}
-		}, 0);
+		EventValues.registerEventValue(PlayerItemConsumeEvent.class, ItemStack.class, PlayerItemConsumeEvent::getItem);
 		// PlayerItemBreakEvent
-		EventValues.registerEventValue(PlayerItemBreakEvent.class, ItemStack.class, new Getter<ItemStack, PlayerItemBreakEvent>() {
-			@Override
-			@Nullable
-			public ItemStack get(final PlayerItemBreakEvent e) {
-				return e.getBrokenItem();
-			}
-		}, 0);
+		EventValues.registerEventValue(PlayerItemBreakEvent.class, ItemStack.class, PlayerItemBreakEvent::getBrokenItem);
 		// PlayerInteractEntityEvent
-		EventValues.registerEventValue(PlayerInteractEntityEvent.class, Entity.class, new Getter<Entity, PlayerInteractEntityEvent>() {
-			@Override
-			@Nullable
-			public Entity get(final PlayerInteractEntityEvent e) {
-				return e.getRightClicked();
-			}
-		}, 0);
-		EventValues.registerEventValue(PlayerInteractEntityEvent.class, ItemStack.class, new Getter<ItemStack, PlayerInteractEntityEvent>() {
-			@Override
-			@Nullable
-			public ItemStack get(final PlayerInteractEntityEvent e) {
-				EquipmentSlot hand = e.getHand();
-				if (hand == EquipmentSlot.HAND)
-					return e.getPlayer().getInventory().getItemInMainHand();
-				else if (hand == EquipmentSlot.OFF_HAND)
-					return e.getPlayer().getInventory().getItemInOffHand();
-				else
-					return null;
-			}
-		}, 0);
+		EventValues.registerEventValue(PlayerInteractEntityEvent.class, Entity.class, PlayerInteractEntityEvent::getRightClicked);
+		EventValues.registerEventValue(PlayerInteractEntityEvent.class, ItemStack.class, event -> {
+			EquipmentSlot hand = event.getHand();
+			if (hand == EquipmentSlot.HAND)
+				return event.getPlayer().getInventory().getItemInMainHand();
+			else if (hand == EquipmentSlot.OFF_HAND)
+				return event.getPlayer().getInventory().getItemInOffHand();
+			else
+				return null;
+		});
 		// PlayerInteractEvent
-		EventValues.registerEventValue(PlayerInteractEvent.class, ItemStack.class, new Getter<ItemStack, PlayerInteractEvent>() {
-			@Override
-			@Nullable
-			public ItemStack get(final PlayerInteractEvent e) {
-				return e.getItem();
-			}
-		}, 0);
-		EventValues.registerEventValue(PlayerInteractEvent.class, Block.class, new Getter<Block, PlayerInteractEvent>() {
-			@Override
-			@Nullable
-			public Block get(final PlayerInteractEvent e) {
-				return e.getClickedBlock();
-			}
-		}, 0);
-		EventValues.registerEventValue(PlayerInteractEvent.class, Direction.class, new Getter<Direction, PlayerInteractEvent>() {
-			@Override
-			@Nullable
-			public Direction get(final PlayerInteractEvent e) {
-				return new Direction(new double[] {e.getBlockFace().getModX(), e.getBlockFace().getModY(), e.getBlockFace().getModZ()});
-			}
-		}, 0);
+		EventValues.registerEventValue(PlayerInteractEvent.class, ItemStack.class, PlayerInteractEvent::getItem);
+		EventValues.registerEventValue(PlayerInteractEvent.class, Block.class, PlayerInteractEvent::getClickedBlock);
+		EventValues.registerEventValue(PlayerInteractEvent.class, Direction.class,
+			event -> new Direction(new double[]{event.getBlockFace().getModX(), event.getBlockFace().getModY(), event.getBlockFace().getModZ()}));
 		// PlayerShearEntityEvent
-		EventValues.registerEventValue(PlayerShearEntityEvent.class, Entity.class, new Getter<Entity, PlayerShearEntityEvent>() {
-			@Override
-			@Nullable
-			public Entity get(final PlayerShearEntityEvent e) {
-				return e.getEntity();
-			}
-		}, 0);
+		EventValues.registerEventValue(PlayerShearEntityEvent.class, Entity.class, PlayerShearEntityEvent::getEntity);
 		// PlayerMoveEvent
-		EventValues.registerEventValue(PlayerMoveEvent.class, Block.class, new Getter<Block, PlayerMoveEvent>() {
-			@Override
-			public Block get(PlayerMoveEvent event) {
-				return event.getTo().clone().subtract(0, 0.5, 0).getBlock();
-			}
-		}, EventValues.TIME_NOW);
-		EventValues.registerEventValue(PlayerMoveEvent.class, Location.class, new Getter<Location, PlayerMoveEvent>() {
-			@Override
-			public Location get(PlayerMoveEvent event) {
-				return event.getFrom();
-			}
-		}, EventValues.TIME_PAST);
-		EventValues.registerEventValue(PlayerMoveEvent.class, Location.class, new Getter<Location, PlayerMoveEvent>() {
-			@Override
-			public Location get(PlayerMoveEvent event) {
-				return event.getTo();
-			}
-		}, EventValues.TIME_NOW);
-		EventValues.registerEventValue(PlayerMoveEvent.class, Chunk.class, new Getter<Chunk, PlayerMoveEvent>() {
-			@Override
-			public Chunk get(PlayerMoveEvent event) {
-				return event.getFrom().getChunk();
-			}
-		}, EventValues.TIME_PAST);
-		EventValues.registerEventValue(PlayerMoveEvent.class, Chunk.class, new Getter<Chunk, PlayerMoveEvent>() {
-			@Override
-			public Chunk get(PlayerMoveEvent event) {
-				return event.getTo().getChunk();
-			}
-		}, EventValues.TIME_NOW);
+		EventValues.registerEventValue(PlayerMoveEvent.class, Block.class,
+			event -> event.getTo().clone().subtract(0, 0.5, 0).getBlock());
+		EventValues.registerEventValue(PlayerMoveEvent.class, Location.class, PlayerMoveEvent::getFrom, TIME_PAST);
+		EventValues.registerEventValue(PlayerMoveEvent.class, Location.class, PlayerMoveEvent::getTo);
+		EventValues.registerEventValue(PlayerMoveEvent.class, Chunk.class, event -> event.getFrom().getChunk(), TIME_PAST);
+		EventValues.registerEventValue(PlayerMoveEvent.class, Chunk.class, event -> event.getTo().getChunk());
 		// PlayerItemDamageEvent
-		EventValues.registerEventValue(PlayerItemDamageEvent.class, ItemStack.class, new Getter<ItemStack, PlayerItemDamageEvent>() {
-			@Override
-			public ItemStack get(PlayerItemDamageEvent event) {
-				return event.getItem();
-			}
-		}, 0);
+		EventValues.registerEventValue(PlayerItemDamageEvent.class, ItemStack.class, PlayerItemDamageEvent::getItem);
 		//PlayerItemMendEvent
-		EventValues.registerEventValue(PlayerItemMendEvent.class, Player.class, new Getter<Player, PlayerItemMendEvent>() {
-			@Override
-			@Nullable
-			public Player get(PlayerItemMendEvent e) {
-				return e.getPlayer();
-			}
-		}, 0);
-		EventValues.registerEventValue(PlayerItemMendEvent.class, ItemStack.class, new Getter<ItemStack, PlayerItemMendEvent>() {
-			@Override
-			@Nullable
-			public ItemStack get(PlayerItemMendEvent e) {
-				return e.getItem();
-			}
-		}, 0);
-		EventValues.registerEventValue(PlayerItemMendEvent.class, Entity.class, new Getter<Entity, PlayerItemMendEvent>() {
-			@Override
-			@Nullable
-			public Entity get(PlayerItemMendEvent e) {
-				return e.getExperienceOrb();
-			}
-		}, 0);
+		EventValues.registerEventValue(PlayerItemMendEvent.class, Player.class, PlayerEvent::getPlayer);
+		EventValues.registerEventValue(PlayerItemMendEvent.class, ItemStack.class, PlayerItemMendEvent::getItem);
+		EventValues.registerEventValue(PlayerItemMendEvent.class, Entity.class, PlayerItemMendEvent::getExperienceOrb);
 
 		// --- HangingEvents ---
 
 		// Note: will not work in HangingEntityBreakEvent due to event-entity being parsed as HangingBreakByEntityEvent#getRemover() from code down below
-		EventValues.registerEventValue(HangingEvent.class, Hanging.class, new Getter<Hanging, HangingEvent>() {
-			@Override
-			@Nullable
-			public Hanging get(final HangingEvent e) {
-				return e.getEntity();
-			}
-		}, 0);
-		EventValues.registerEventValue(HangingEvent.class, World.class, new Getter<World, HangingEvent>() {
-			@Override
-			@Nullable
-			public World get(final HangingEvent e) {
-				return e.getEntity().getWorld();
-			}
-		}, 0);
-		EventValues.registerEventValue(HangingEvent.class, Location.class, new Getter<Location, HangingEvent>() {
-			@Override
-			@Nullable
-			public Location get(final HangingEvent e) {
-				return e.getEntity().getLocation();
-			}
-		}, 0);
+		EventValues.registerEventValue(HangingEvent.class, Hanging.class, HangingEvent::getEntity);
+		EventValues.registerEventValue(HangingEvent.class, World.class, event -> event.getEntity().getWorld());
+		EventValues.registerEventValue(HangingEvent.class, Location.class, event -> event.getEntity().getLocation());
 
 		// HangingBreakEvent
-		EventValues.registerEventValue(HangingBreakEvent.class, Entity.class, new Getter<Entity, HangingBreakEvent>() {
-			@Nullable
-			@Override
-			public Entity get(HangingBreakEvent e) {
-				if (e instanceof HangingBreakByEntityEvent)
-					return ((HangingBreakByEntityEvent) e).getRemover();
-				return null;
-			}
-		}, 0);
+		EventValues.registerEventValue(HangingBreakEvent.class, Entity.class, event -> {
+			if (event instanceof HangingBreakByEntityEvent hangingBreakByEntityEvent)
+				return hangingBreakByEntityEvent.getRemover();
+			return null;
+		});
 		// HangingPlaceEvent
-		EventValues.registerEventValue(HangingPlaceEvent.class, Player.class, new Getter<Player, HangingPlaceEvent>() {
-			@Override
-			@Nullable
-			public Player get(final HangingPlaceEvent e) {
-				return e.getPlayer();
-			}
-		}, 0);
+		EventValues.registerEventValue(HangingPlaceEvent.class, Player.class, HangingPlaceEvent::getPlayer);
 
 		// --- VehicleEvents ---
-		EventValues.registerEventValue(VehicleEvent.class, Vehicle.class, new Getter<Vehicle, VehicleEvent>() {
-			@Override
-			@Nullable
-			public Vehicle get(final VehicleEvent e) {
-				return e.getVehicle();
-			}
-		}, 0);
-		EventValues.registerEventValue(VehicleEvent.class, World.class, new Getter<World, VehicleEvent>() {
-			@Override
-			@Nullable
-			public World get(final VehicleEvent e) {
-				return e.getVehicle().getWorld();
-			}
-		}, 0);
-		EventValues.registerEventValue(VehicleExitEvent.class, LivingEntity.class, new Getter<LivingEntity, VehicleExitEvent>() {
-			@Override
-			@Nullable
-			public LivingEntity get(final VehicleExitEvent e) {
-				return e.getExited();
-			}
-		}, 0);
+		EventValues.registerEventValue(VehicleEvent.class, Vehicle.class, VehicleEvent::getVehicle);
+		EventValues.registerEventValue(VehicleEvent.class, World.class, event -> event.getVehicle().getWorld());
+		EventValues.registerEventValue(VehicleExitEvent.class, LivingEntity.class, VehicleExitEvent::getExited);
 
-		EventValues.registerEventValue(VehicleEnterEvent.class, Entity.class, new Getter<Entity, VehicleEnterEvent>() {
-			@Nullable
-			@Override
-			public Entity get(VehicleEnterEvent e) {
-				return e.getEntered();
-			}
-		}, 0);
+		EventValues.registerEventValue(VehicleEnterEvent.class, Entity.class, VehicleEnterEvent::getEntered);
 
 		// We could error here instead but it's preferable to not do it in this case
-		EventValues.registerEventValue(VehicleDamageEvent.class, Entity.class, new Getter<Entity, VehicleDamageEvent>() {
-			@Nullable
-			@Override
-			public Entity get(VehicleDamageEvent e) {
-				return e.getAttacker();
-			}
-		}, 0);
+		EventValues.registerEventValue(VehicleDamageEvent.class, Entity.class, VehicleDamageEvent::getAttacker);
 
-		EventValues.registerEventValue(VehicleDestroyEvent.class, Entity.class, new Getter<Entity, VehicleDestroyEvent>() {
-			@Nullable
-			@Override
-			public Entity get(VehicleDestroyEvent e) {
-				return e.getAttacker();
-			}
-		}, 0);
+		EventValues.registerEventValue(VehicleDestroyEvent.class, Entity.class, VehicleDestroyEvent::getAttacker);
 
-		EventValues.registerEventValue(VehicleEvent.class, Entity.class, new Getter<Entity, VehicleEvent>() {
-			@Override
-			@Nullable
-			public Entity get(final VehicleEvent e) {
-				return e.getVehicle().getPassenger();
-			}
-		}, 0);
+		EventValues.registerEventValue(VehicleEvent.class, Entity.class, event -> event.getVehicle().getPassenger());
 
 
 		// === CommandEvents ===
 		// PlayerCommandPreprocessEvent is a PlayerEvent
-		EventValues.registerEventValue(ServerCommandEvent.class, CommandSender.class, new Getter<CommandSender, ServerCommandEvent>() {
-			@Override
-			@Nullable
-			public CommandSender get(final ServerCommandEvent e) {
-				return e.getSender();
-			}
-		}, 0);
-		EventValues.registerEventValue(CommandEvent.class, String[].class, new Getter<String[], CommandEvent>() {
-			@Override
-			public String[] get(CommandEvent event) {
-				return event.getArgs();
-			}
-		}, EventValues.TIME_NOW);
-		EventValues.registerEventValue(CommandEvent.class, CommandSender.class, new Getter<CommandSender, CommandEvent>() {
-			@Override
-			public CommandSender get(final CommandEvent e) {
-				return e.getSender();
-			}
-		}, 0);
-		EventValues.registerEventValue(CommandEvent.class, World.class, new Getter<World, CommandEvent>() {
-			@Override
-			@Nullable
-			public World get(final CommandEvent e) {
-				return e.getSender() instanceof Player ? ((Player) e.getSender()).getWorld() : null;
-			}
-		}, 0);
+		EventValues.registerEventValue(ServerCommandEvent.class, CommandSender.class, ServerCommandEvent::getSender);
+		EventValues.registerEventValue(CommandEvent.class, String[].class, CommandEvent::getArgs);
+		EventValues.registerEventValue(CommandEvent.class, CommandSender.class, CommandEvent::getSender);
+		EventValues.registerEventValue(CommandEvent.class, World.class, e -> e.getSender() instanceof Player ? ((Player) e.getSender()).getWorld() : null);
+		EventValues.registerEventValue(CommandEvent.class, Block.class,
+			event -> event.getSender() instanceof BlockCommandSender sender ? sender.getBlock() : null);
 
 		// === ServerEvents ===
 		// Script load/unload event
-		EventValues.registerEventValue(ScriptEvent.class, CommandSender.class, new Getter<CommandSender, ScriptEvent>() {
-			@Nullable
-			@Override
-			public CommandSender get(ScriptEvent e) {
-				return Bukkit.getConsoleSender();
-			}
-		}, 0);
+		EventValues.registerEventValue(ScriptEvent.class, CommandSender.class, event -> Bukkit.getConsoleSender());
 		// Server load event
-		EventValues.registerEventValue(SkriptStartEvent.class, CommandSender.class, new Getter<CommandSender, SkriptStartEvent>() {
-			@Nullable
-			@Override
-			public CommandSender get(SkriptStartEvent e) {
-				return Bukkit.getConsoleSender();
-			}
-		}, 0);
+		EventValues.registerEventValue(SkriptStartEvent.class, CommandSender.class, event -> Bukkit.getConsoleSender());
 		// Server stop event
-		EventValues.registerEventValue(SkriptStopEvent.class, CommandSender.class, new Getter<CommandSender, SkriptStopEvent>() {
-			@Nullable
-			@Override
-			public CommandSender get(SkriptStopEvent e) {
-				return Bukkit.getConsoleSender();
-			}
-		}, 0);
+		EventValues.registerEventValue(SkriptStopEvent.class, CommandSender.class, event -> Bukkit.getConsoleSender());
 
 		// === InventoryEvents ===
 		// InventoryClickEvent
-		EventValues.registerEventValue(InventoryClickEvent.class, Player.class, new Getter<Player, InventoryClickEvent>() {
-			@Override
-			@Nullable
-			public Player get(final InventoryClickEvent e) {
-				return e.getWhoClicked() instanceof Player ? (Player) e.getWhoClicked() : null;
-			}
-		}, 0);
-		EventValues.registerEventValue(InventoryClickEvent.class, World.class, new Getter<World, InventoryClickEvent>() {
-			@Override
-			@Nullable
-			public World get(final InventoryClickEvent e) {
-				return e.getWhoClicked().getWorld();
-			}
-		}, 0);
-		EventValues.registerEventValue(InventoryClickEvent.class, ItemStack.class, new Getter<ItemStack, InventoryClickEvent>() {
-			@Override
-			@Nullable
-			public ItemStack get(final InventoryClickEvent e) {
-				if (e instanceof CraftItemEvent)
-					return ((CraftItemEvent) e).getRecipe().getResult();
-				return e.getCurrentItem();
-			}
-		}, 0);
-		EventValues.registerEventValue(InventoryClickEvent.class, Slot.class, new Getter<Slot, InventoryClickEvent>() {
-			@SuppressWarnings("null")
-			@Override
-			@Nullable
-			public Slot get(final InventoryClickEvent e) {
-				Inventory invi = e.getClickedInventory(); // getInventory is WRONG and dangerous
-				if (invi == null)
-					return null;
-				int slotIndex = e.getSlot();
-
+		EventValues.registerEventValue(InventoryClickEvent.class, Player.class,
+			event -> event.getWhoClicked() instanceof Player player ? player : null);
+		EventValues.registerEventValue(InventoryClickEvent.class, World.class, event -> event.getWhoClicked().getWorld());
+		EventValues.registerEventValue(InventoryClickEvent.class, ItemStack.class, event -> {
+			if (event instanceof CraftItemEvent craftItemEvent)
+				return craftItemEvent.getRecipe().getResult();
+			return event.getCurrentItem();
+		});
+		EventValues.registerEventValue(InventoryClickEvent.class, Slot.class, event -> {
+			Inventory invi = event.getClickedInventory(); // getInventory is WRONG and dangerous
+			if (invi == null)
+				return null;
+			int slotIndex = event.getSlot();
+
+			// Not all indices point to inventory slots. Equipment, for example
+			if (invi instanceof PlayerInventory itemStacks && slotIndex >= 36) {
+				return new ch.njol.skript.util.slot.EquipmentSlot(itemStacks.getHolder(), slotIndex);
+			} else {
+				return new InventorySlot(invi, slotIndex, event.getRawSlot());
+			}
+		});
+		EventValues.registerEventValue(InventoryClickEvent.class, InventoryAction.class, InventoryClickEvent::getAction);
+		EventValues.registerEventValue(InventoryClickEvent.class, ClickType.class, InventoryClickEvent::getClick);
+		EventValues.registerEventValue(InventoryClickEvent.class, Inventory.class, InventoryClickEvent::getClickedInventory);
+		// InventoryDragEvent
+		EventValues.registerEventValue(InventoryDragEvent.class, Player.class,
+			event -> event.getWhoClicked() instanceof Player player ? player : null);
+		EventValues.registerEventValue(InventoryDragEvent.class, World.class, event -> event.getWhoClicked().getWorld());
+		EventValues.registerEventValue(InventoryDragEvent.class, ItemStack.class, InventoryDragEvent::getOldCursor, TIME_PAST);
+		EventValues.registerEventValue(InventoryDragEvent.class, ItemStack.class, InventoryDragEvent::getCursor);
+		EventValues.registerEventValue(InventoryDragEvent.class, ItemStack[].class,
+			event -> event.getNewItems().values().toArray(new ItemStack[0]));
+		EventValues.registerEventValue(InventoryDragEvent.class, Slot[].class, event -> {
+			List<Slot> slots = new ArrayList<>(event.getRawSlots().size());
+			InventoryView view = event.getView();
+			for (Integer rawSlot : event.getRawSlots()) {
+				Inventory inventory = InventoryUtils.getInventory(view, rawSlot);
+				Integer slot = InventoryUtils.convertSlot(view, rawSlot);
+				if (inventory == null || slot == null)
+					continue;
 				// Not all indices point to inventory slots. Equipment, for example
-				if (invi instanceof PlayerInventory && slotIndex >= 36) {
-					return new ch.njol.skript.util.slot.EquipmentSlot(((PlayerInventory) invi).getHolder(), slotIndex);
+				if (inventory instanceof PlayerInventory && slot >= 36) {
+					slots.add(new ch.njol.skript.util.slot.EquipmentSlot(((PlayerInventory) view.getBottomInventory()).getHolder(), slot));
 				} else {
-					return new InventorySlot(invi, slotIndex, e.getRawSlot());
-				}
-			}
-		}, 0);
-		EventValues.registerEventValue(InventoryClickEvent.class, InventoryAction.class, new Getter<InventoryAction, InventoryClickEvent>() {
-			@Override
-			@Nullable
-			public InventoryAction get(final InventoryClickEvent e) {
-				return e.getAction();
-			}
-		}, 0);
-		EventValues.registerEventValue(InventoryClickEvent.class, ClickType.class, new Getter<ClickType, InventoryClickEvent>() {
-			@Override
-			@Nullable
-			public ClickType get(final InventoryClickEvent e) {
-				return e.getClick();
-			}
-		}, 0);
-		EventValues.registerEventValue(InventoryClickEvent.class, Inventory.class, new Getter<Inventory, InventoryClickEvent>() {
-			@Override
-			@Nullable
-			public Inventory get(final InventoryClickEvent e) {
-				return e.getClickedInventory();
-			}
-		}, 0);
-		// InventoryDragEvent
-		EventValues.registerEventValue(InventoryDragEvent.class, Player.class, new Getter<Player, InventoryDragEvent>() {
-			@Override
-			@Nullable
-			public Player get(InventoryDragEvent event) {
-				return event.getWhoClicked() instanceof Player ? (Player) event.getWhoClicked() : null;
-			}
-		}, EventValues.TIME_NOW);
-		EventValues.registerEventValue(InventoryDragEvent.class, World.class, new Getter<World, InventoryDragEvent>() {
-			@Override
-			@Nullable
-			public World get(InventoryDragEvent event) {
-				return event.getWhoClicked().getWorld();
-			}
-		}, EventValues.TIME_NOW);
-		EventValues.registerEventValue(InventoryDragEvent.class, ItemStack.class, new Getter<ItemStack, InventoryDragEvent>() {
-			@Override
-			@Nullable
-			public ItemStack get(InventoryDragEvent event) {
-				return event.getOldCursor();
-			}
-		}, EventValues.TIME_PAST);
-		EventValues.registerEventValue(InventoryDragEvent.class, ItemStack.class, new Getter<ItemStack, InventoryDragEvent>() {
-			@Override
-			@Nullable
-			public ItemStack get(InventoryDragEvent event) {
-				return event.getCursor();
-			}
-		}, EventValues.TIME_NOW);
-		EventValues.registerEventValue(InventoryDragEvent.class, ItemStack[].class, new Getter<ItemStack[], InventoryDragEvent>() {
-			@Override
-			@Nullable
-			public ItemStack[] get(InventoryDragEvent event) {
-				return event.getNewItems().values().toArray(new ItemStack[0]);
-			}
-		}, EventValues.TIME_NOW);
-		EventValues.registerEventValue(InventoryDragEvent.class, Slot[].class, new Getter<Slot[], InventoryDragEvent>() {
-			@Override
-			@Nullable
-			public Slot[] get(InventoryDragEvent event) {
-				List<Slot> slots = new ArrayList<>(event.getRawSlots().size());
-				InventoryView view = event.getView();
-				for (Integer rawSlot : event.getRawSlots()) {
-					Inventory inventory = InventoryUtils.getInventory(view, rawSlot);
-					Integer slot = InventoryUtils.convertSlot(view, rawSlot);
-					if (inventory == null || slot == null)
-						continue;
-					// Not all indices point to inventory slots. Equipment, for example
-					if (inventory instanceof PlayerInventory && slot >= 36) {
-						slots.add(new ch.njol.skript.util.slot.EquipmentSlot(((PlayerInventory) view.getBottomInventory()).getHolder(), slot));
-					} else {
-						slots.add(new InventorySlot(inventory, slot));
-					}
+					slots.add(new InventorySlot(inventory, slot));
 				}
-				return slots.toArray(new Slot[0]);
 			}
-		}, EventValues.TIME_NOW);
-		EventValues.registerEventValue(InventoryDragEvent.class, ClickType.class, new Getter<ClickType, InventoryDragEvent>() {
-			@Override
-			@Nullable
-			public ClickType get(InventoryDragEvent event) {
-				return event.getType() == DragType.EVEN ? ClickType.LEFT : ClickType.RIGHT;
-			}
-		}, EventValues.TIME_NOW);
-		EventValues.registerEventValue(InventoryDragEvent.class, Inventory[].class, new Getter<Inventory[], InventoryDragEvent>() {
-			@Override
-			@Nullable
-			public Inventory[] get(InventoryDragEvent event) {
-				Set<Inventory> inventories = new HashSet<>();
-				InventoryView view = event.getView();
-				for (Integer rawSlot : event.getRawSlots()) {
-					Inventory inventory = InventoryUtils.getInventory(view, rawSlot);
-					if (inventory != null)
-						inventories.add(inventory);
-				}
-				return inventories.toArray(new Inventory[0]);
-			}
-		}, EventValues.TIME_NOW);
+			return slots.toArray(new Slot[0]);
+		});
+		EventValues.registerEventValue(InventoryDragEvent.class, ClickType.class, event -> event.getType() == DragType.EVEN ? ClickType.LEFT : ClickType.RIGHT);
+		EventValues.registerEventValue(InventoryDragEvent.class, Inventory[].class, event -> {
+			Set<Inventory> inventories = new HashSet<>();
+			InventoryView view = event.getView();
+			for (Integer rawSlot : event.getRawSlots()) {
+				Inventory inventory = InventoryUtils.getInventory(view, rawSlot);
+				if (inventory != null)
+					inventories.add(inventory);
+			}
+			return inventories.toArray(new Inventory[0]);
+		});
 		// PrepareAnvilEvent
-		EventValues.registerEventValue(PrepareAnvilEvent.class, ItemStack.class, new Getter<ItemStack, PrepareAnvilEvent>() {
-			@Override
-			@Nullable
-			public ItemStack get(PrepareAnvilEvent e) {
-				return e.getResult();
-			}
-		}, EventValues.TIME_NOW);
-		EventValues.registerEventValue(PrepareAnvilEvent.class, Inventory.class, new Getter<Inventory, PrepareAnvilEvent>() {
-			@Override
-			@Nullable
-			public Inventory get(PrepareAnvilEvent e) {
-				return e.getInventory();
-			}
-		}, EventValues.TIME_NOW);
+		if (Skript.classExists("com.destroystokyo.paper.event.inventory.PrepareResultEvent"))
+			EventValues.registerEventValue(PrepareAnvilEvent.class, ItemStack.class, PrepareResultEvent::getResult);
+		EventValues.registerEventValue(PrepareAnvilEvent.class, Inventory.class, PrepareAnvilEvent::getInventory);
 		// AnvilDamagedEvent
 		if (Skript.classExists("com.destroystokyo.paper.event.block.AnvilDamagedEvent")) {
-			EventValues.registerEventValue(AnvilDamagedEvent.class, Inventory.class, new Getter<Inventory, AnvilDamagedEvent>() {
-				@Override
-				@Nullable
-				public Inventory get(AnvilDamagedEvent e) {
-					return e.getInventory();
-				}
-			}, EventValues.TIME_NOW);
+			EventValues.registerEventValue(AnvilDamagedEvent.class, Inventory.class, AnvilDamagedEvent::getInventory);
 		}
 		//BlockFertilizeEvent
-		EventValues.registerEventValue(BlockFertilizeEvent.class, Player.class, new Getter<Player, BlockFertilizeEvent>() {
-			@Nullable
-			@Override
-			public Player get(BlockFertilizeEvent event) {
-				return event.getPlayer();
-			}
-		}, 0);
-		EventValues.registerEventValue(BlockFertilizeEvent.class, Block[].class, new Getter<Block[], BlockFertilizeEvent>() {
-			@Nullable
-			@Override
-			public Block[] get(BlockFertilizeEvent event) {
-				return event.getBlocks().stream()
-					.map(BlockState::getBlock)
-					.toArray(Block[]::new);
-			}
-		}, EventValues.TIME_NOW);
+		EventValues.registerEventValue(BlockFertilizeEvent.class, Player.class, BlockFertilizeEvent::getPlayer);
+		EventValues.registerEventValue(BlockFertilizeEvent.class, Block[].class, event -> event.getBlocks().stream()
+			.map(BlockState::getBlock)
+			.toArray(Block[]::new));
 		// PrepareItemCraftEvent
-		EventValues.registerEventValue(PrepareItemCraftEvent.class, Slot.class, new Getter<Slot, PrepareItemCraftEvent>() {
-			@Override
-			public Slot get(final PrepareItemCraftEvent e) {
-				return new InventorySlot(e.getInventory(), 0);
-			}
-		}, 0);
-		EventValues.registerEventValue(PrepareItemCraftEvent.class, ItemStack.class, new Getter<ItemStack, PrepareItemCraftEvent>() {
-			@Override
-			public ItemStack get(PrepareItemCraftEvent e) {
-				ItemStack item = e.getInventory().getResult();
-				return item != null ? item : AIR_IS;
-			}
-		}, 0);
-		EventValues.registerEventValue(PrepareItemCraftEvent.class, Inventory.class, new Getter<Inventory, PrepareItemCraftEvent>() {
-			@Override
-			public Inventory get(PrepareItemCraftEvent e) {
-				return e.getInventory();
-			}
-		}, 0);
-		EventValues.registerEventValue(PrepareItemCraftEvent.class, Player.class, new Getter<Player, PrepareItemCraftEvent>() {
-			@Override
-			@Nullable
-			public Player get(final PrepareItemCraftEvent e) {
-				List<HumanEntity> viewers = e.getInventory().getViewers(); // Get all viewers
-				if (viewers.size() == 0) // ... if we don't have any
-					return null;
-				HumanEntity first = viewers.get(0); // Get first viewer and hope it is crafter
-				if (first instanceof Player) // Needs to be player... Usually it is
-					return (Player) first;
+		EventValues.registerEventValue(PrepareItemCraftEvent.class, Slot.class, event -> new InventorySlot(event.getInventory(), 0));
+		EventValues.registerEventValue(PrepareItemCraftEvent.class, ItemStack.class, event -> {
+			ItemStack item = event.getInventory().getResult();
+			return item != null ? item : AIR_IS;
+		});
+		EventValues.registerEventValue(PrepareItemCraftEvent.class, Inventory.class, PrepareItemCraftEvent::getInventory);
+		EventValues.registerEventValue(PrepareItemCraftEvent.class, Player.class, event -> {
+			List<HumanEntity> viewers = event.getInventory().getViewers(); // Get all viewers
+			if (viewers.isEmpty()) // ... if we don't have any
 				return null;
-			}
-		}, 0);
+			HumanEntity first = viewers.get(0); // Get first viewer and hope it is crafter
+			if (first instanceof Player player) // Needs to be player... Usually it is
+				return player;
+			return null;
+		});
 		// CraftEvents - recipe namespaced key strings
-		EventValues.registerEventValue(CraftItemEvent.class, String.class, new Getter<String, CraftItemEvent>() {
-			@Nullable
-			@Override
-			public String get(CraftItemEvent e) {
-				Recipe recipe = e.getRecipe();
-				if (recipe instanceof Keyed)
-					return ((Keyed) recipe).getKey().toString();
-				return null;
-			}
-		}, 0);
-		EventValues.registerEventValue(PrepareItemCraftEvent.class, String.class, new Getter<String, PrepareItemCraftEvent>() {
-			@Nullable
-			@Override
-			public String get(PrepareItemCraftEvent e) {
-				Recipe recipe = e.getRecipe();
-				if (recipe instanceof Keyed)
-					return ((Keyed) recipe).getKey().toString();
-				return null;
-			}
-		}, 0);
+		EventValues.registerEventValue(CraftItemEvent.class, String.class, event -> {
+			Recipe recipe = event.getRecipe();
+			if (recipe instanceof Keyed keyed)
+				return keyed.getKey().toString();
+			return null;
+		});
+		EventValues.registerEventValue(PrepareItemCraftEvent.class, String.class, event -> {
+			Recipe recipe = event.getRecipe();
+			if (recipe instanceof Keyed keyed)
+				return keyed.getKey().toString();
+			return null;
+		});
 		// CraftItemEvent
-		EventValues.registerEventValue(CraftItemEvent.class, ItemStack.class, new Getter<ItemStack, CraftItemEvent>() {
-			@Override
-			@Nullable
-			public ItemStack get(CraftItemEvent e) {
-				return e.getRecipe().getResult();
-			}
-		}, 0);
+		EventValues.registerEventValue(CraftItemEvent.class, ItemStack.class, event -> event.getRecipe().getResult());
 		//InventoryOpenEvent
-		EventValues.registerEventValue(InventoryOpenEvent.class, Player.class, new Getter<Player, InventoryOpenEvent>() {
-			@Override
-			@Nullable
-			public Player get(final InventoryOpenEvent e) {
-				return (Player) e.getPlayer();
-			}
-		}, 0);
-		EventValues.registerEventValue(InventoryOpenEvent.class, Inventory.class, new Getter<Inventory, InventoryOpenEvent>() {
-			@Override
-			@Nullable
-			public Inventory get(final InventoryOpenEvent e) {
-				return e.getInventory();
-			}
-		}, 0);
+		EventValues.registerEventValue(InventoryOpenEvent.class, Player.class, event -> (Player) event.getPlayer());
+		EventValues.registerEventValue(InventoryOpenEvent.class, Inventory.class, InventoryEvent::getInventory);
 		//InventoryCloseEvent
-		EventValues.registerEventValue(InventoryCloseEvent.class, Player.class, new Getter<Player, InventoryCloseEvent>() {
-			@Override
-			@Nullable
-			public Player get(final InventoryCloseEvent e) {
-				return (Player) e.getPlayer();
-			}
-		}, 0);
-		EventValues.registerEventValue(InventoryCloseEvent.class, Inventory.class, new Getter<Inventory, InventoryCloseEvent>() {
-			@Override
-			@Nullable
-			public Inventory get(final InventoryCloseEvent e) {
-				return e.getInventory();
-			}
-		}, 0);
+		EventValues.registerEventValue(InventoryCloseEvent.class, Player.class, event -> (Player) event.getPlayer());
+		EventValues.registerEventValue(InventoryCloseEvent.class, Inventory.class, InventoryEvent::getInventory);
 		if (Skript.classExists("org.bukkit.event.inventory.InventoryCloseEvent$Reason"))
-			EventValues.registerEventValue(InventoryCloseEvent.class, InventoryCloseEvent.Reason.class, new Getter<InventoryCloseEvent.Reason, InventoryCloseEvent>() {
-				@Override
-				public InventoryCloseEvent.Reason get(InventoryCloseEvent event) {
-					return event.getReason();
-				}
-			}, EventValues.TIME_NOW);
+			EventValues.registerEventValue(InventoryCloseEvent.class, InventoryCloseEvent.Reason.class, InventoryCloseEvent::getReason);
 		//InventoryPickupItemEvent
-		EventValues.registerEventValue(InventoryPickupItemEvent.class, Inventory.class, new Getter<Inventory, InventoryPickupItemEvent>() {
-			@Nullable
-			@Override
-			public Inventory get(InventoryPickupItemEvent event) {
-				return event.getInventory();
-			}
-		}, 0);
-		EventValues.registerEventValue(InventoryPickupItemEvent.class, Item.class, new Getter<Item, InventoryPickupItemEvent>() {
-			@Nullable
-			@Override
-			public Item get(InventoryPickupItemEvent event) {
-				return event.getItem();
-			}
-		}, 0);
-		EventValues.registerEventValue(InventoryPickupItemEvent.class, ItemStack.class, new Getter<ItemStack, InventoryPickupItemEvent>() {
-			@Nullable
-			@Override
-			public ItemStack get(InventoryPickupItemEvent event) {
-				return event.getItem().getItemStack();
-			}
-		}, 0);
+		EventValues.registerEventValue(InventoryPickupItemEvent.class, Inventory.class, InventoryPickupItemEvent::getInventory);
+		EventValues.registerEventValue(InventoryPickupItemEvent.class, Item.class, InventoryPickupItemEvent::getItem);
+		EventValues.registerEventValue(InventoryPickupItemEvent.class, ItemStack.class, event -> event.getItem().getItemStack());
 		//PortalCreateEvent
-		EventValues.registerEventValue(PortalCreateEvent.class, World.class, new Getter<World, PortalCreateEvent>() {
-			@Override
-			@Nullable
-			public World get(final PortalCreateEvent e) {
-				return e.getWorld();
-			}
-		}, 0);
-		EventValues.registerEventValue(PortalCreateEvent.class, Block[].class, new Getter<Block[], PortalCreateEvent>() {
-			@Override
-			@Nullable
-			public Block[] get(PortalCreateEvent event) {
-				return event.getBlocks().stream()
-					.map(BlockState::getBlock)
-					.toArray(Block[]::new);
-			}
-		}, EventValues.TIME_NOW);
+		EventValues.registerEventValue(PortalCreateEvent.class, World.class, WorldEvent::getWorld);
+		EventValues.registerEventValue(PortalCreateEvent.class, Block[].class, event -> event.getBlocks().stream()
+			.map(BlockState::getBlock)
+			.toArray(Block[]::new));
 		if (Skript.methodExists(PortalCreateEvent.class, "getEntity")) { // Minecraft 1.14+
-			EventValues.registerEventValue(PortalCreateEvent.class, Entity.class, new Getter<Entity, PortalCreateEvent>() {
-				@Override
-				@Nullable
-				public Entity get(final PortalCreateEvent e) {
-					return e.getEntity();
-				}
-			}, 0);
+			EventValues.registerEventValue(PortalCreateEvent.class, Entity.class, PortalCreateEvent::getEntity);
 		}
 		//PlayerEditBookEvent
-		EventValues.registerEventValue(PlayerEditBookEvent.class, ItemStack.class, new Getter<ItemStack, PlayerEditBookEvent>() {
-			@Override
-			public ItemStack get(PlayerEditBookEvent event) {
-				ItemStack book = new ItemStack(Material.WRITABLE_BOOK);
-				book.setItemMeta(event.getPreviousBookMeta());
-				return book;
-			}
-		}, EventValues.TIME_PAST);
-		EventValues.registerEventValue(PlayerEditBookEvent.class, ItemStack.class, new Getter<ItemStack, PlayerEditBookEvent>() {
-			@Override
-			public ItemStack get(PlayerEditBookEvent event) {
-				ItemStack book = new ItemStack(Material.WRITABLE_BOOK);
-				book.setItemMeta(event.getNewBookMeta());
-				return book;
-			}
-		}, EventValues.TIME_NOW);
-		EventValues.registerEventValue(PlayerEditBookEvent.class, String[].class, new Getter<String[], PlayerEditBookEvent>() {
-			@Override
-			public String[] get(PlayerEditBookEvent event) {
-				return event.getPreviousBookMeta().getPages().toArray(new String[0]);
-			}
-		}, EventValues.TIME_PAST);
-		EventValues.registerEventValue(PlayerEditBookEvent.class, String[].class, new Getter<String[], PlayerEditBookEvent>() {
-			@Override
-			public String[] get(PlayerEditBookEvent event) {
-				return event.getNewBookMeta().getPages().toArray(new String[0]);
-			}
-		}, EventValues.TIME_NOW);
+		EventValues.registerEventValue(PlayerEditBookEvent.class, ItemStack.class, event -> {
+			ItemStack book = new ItemStack(Material.WRITABLE_BOOK);
+			book.setItemMeta(event.getPreviousBookMeta());
+			return book;
+		}, TIME_PAST);
+		EventValues.registerEventValue(PlayerEditBookEvent.class, ItemStack.class, event -> {
+			ItemStack book = new ItemStack(Material.WRITABLE_BOOK);
+			book.setItemMeta(event.getNewBookMeta());
+			return book;
+		});
+		EventValues.registerEventValue(PlayerEditBookEvent.class, String[].class,
+			event -> event.getPreviousBookMeta().getPages().toArray(new String[0]), TIME_PAST);
+		EventValues.registerEventValue(PlayerEditBookEvent.class, String[].class,
+			event -> event.getNewBookMeta().getPages().toArray(new String[0]));
 		//ItemDespawnEvent
-		EventValues.registerEventValue(ItemDespawnEvent.class, Item.class, new Getter<Item, ItemDespawnEvent>() {
-			@Override
-			@Nullable
-			public Item get(ItemDespawnEvent e) {
-				return e.getEntity();
-			}
-		}, 0);
-		EventValues.registerEventValue(ItemDespawnEvent.class, ItemStack.class, new Getter<ItemStack, ItemDespawnEvent>() {
-			@Override
-			@Nullable
-			public ItemStack get(ItemDespawnEvent e) {
-				return e.getEntity().getItemStack();
-			}
-		}, 0);
+		EventValues.registerEventValue(ItemDespawnEvent.class, Item.class, ItemDespawnEvent::getEntity);
+		EventValues.registerEventValue(ItemDespawnEvent.class, ItemStack.class, event -> event.getEntity().getItemStack());
 		//ItemMergeEvent
-		EventValues.registerEventValue(ItemMergeEvent.class, Item.class, new Getter<Item, ItemMergeEvent>() {
-			@Override
-			@Nullable
-			public Item get(ItemMergeEvent e) {
-				return e.getEntity();
-			}
-		}, 0);
-		EventValues.registerEventValue(ItemMergeEvent.class, Item.class, new Getter<Item, ItemMergeEvent>() {
-			@Override
-			@Nullable
-			public Item get(ItemMergeEvent e) {
-				return e.getTarget();
-			}
-		}, 1);
-		EventValues.registerEventValue(ItemMergeEvent.class, ItemStack.class, new Getter<ItemStack, ItemMergeEvent>() {
-			@Override
-			@Nullable
-			public ItemStack get(ItemMergeEvent e) {
-				return e.getEntity().getItemStack();
-			}
-		}, 0);
+		EventValues.registerEventValue(ItemMergeEvent.class, Item.class, ItemMergeEvent::getEntity);
+		EventValues.registerEventValue(ItemMergeEvent.class, Item.class, ItemMergeEvent::getTarget, TIME_FUTURE);
+		EventValues.registerEventValue(ItemMergeEvent.class, ItemStack.class, event -> event.getEntity().getItemStack());
 		//PlayerTeleportEvent
-		EventValues.registerEventValue(PlayerTeleportEvent.class, TeleportCause.class, new Getter<TeleportCause, PlayerTeleportEvent>() {
-			@Override
-			@Nullable
-			public TeleportCause get(final PlayerTeleportEvent e) {
-				return e.getCause();
-			}
-		}, 0);
+		EventValues.registerEventValue(PlayerTeleportEvent.class, TeleportCause.class, PlayerTeleportEvent::getCause);
 		//EntityMoveEvent
 		if (Skript.classExists("io.papermc.paper.event.entity.EntityMoveEvent")) {
-			EventValues.registerEventValue(EntityMoveEvent.class, Location.class, new Getter<Location, EntityMoveEvent>() {
-				@Override
-				@Nullable
-				public Location get(EntityMoveEvent e) {
-					return e.getFrom();
-				}
-			}, EventValues.TIME_NOW);
-			EventValues.registerEventValue(EntityMoveEvent.class, Location.class, new Getter<Location, EntityMoveEvent>() {
-				@Override
-				@Nullable
-				public Location get(EntityMoveEvent e) {
-					return e.getTo();
-				}
-			}, EventValues.TIME_FUTURE);
+			EventValues.registerEventValue(EntityMoveEvent.class, Location.class, EntityMoveEvent::getFrom);
+			EventValues.registerEventValue(EntityMoveEvent.class, Location.class, EntityMoveEvent::getTo, TIME_FUTURE);
 		}
 		//PlayerToggleFlightEvent
-		EventValues.registerEventValue(PlayerToggleFlightEvent.class, Player.class, new Getter<Player, PlayerToggleFlightEvent>() {
-			@Override
-			@Nullable
-			public Player get(PlayerToggleFlightEvent e) {
-				return e.getPlayer();
-			}
-		}, 0);
+		EventValues.registerEventValue(PlayerToggleFlightEvent.class, Player.class, PlayerEvent::getPlayer);
 		//CreatureSpawnEvent
-		EventValues.registerEventValue(CreatureSpawnEvent.class, SpawnReason.class, new Getter<SpawnReason, CreatureSpawnEvent>() {
-			@Override
-			@Nullable
-			public SpawnReason get(CreatureSpawnEvent e) {
-				return e.getSpawnReason();
-			}
-		}, 0);
+		EventValues.registerEventValue(CreatureSpawnEvent.class, SpawnReason.class, CreatureSpawnEvent::getSpawnReason);
 		//FireworkExplodeEvent
-		EventValues.registerEventValue(FireworkExplodeEvent.class, Firework.class, new Getter<Firework, FireworkExplodeEvent>() {
-			@Override
-			@Nullable
-			public Firework get(FireworkExplodeEvent e) {
-				return e.getEntity();
-			}
-		}, 0);
-		EventValues.registerEventValue(FireworkExplodeEvent.class, FireworkEffect.class, new Getter<FireworkEffect, FireworkExplodeEvent>() {
-			@Override
-			@Nullable
-			public FireworkEffect get(FireworkExplodeEvent e) {
-				List<FireworkEffect> effects = e.getEntity().getFireworkMeta().getEffects();
-				if (effects.size() == 0)
-					return null;
-				return effects.get(0);
+		EventValues.registerEventValue(FireworkExplodeEvent.class, Firework.class, FireworkExplodeEvent::getEntity);
+		EventValues.registerEventValue(FireworkExplodeEvent.class, FireworkEffect.class, event -> {
+			List<FireworkEffect> effects = event.getEntity().getFireworkMeta().getEffects();
+			if (effects.isEmpty())
+				return null;
+			return effects.get(0);
+		});
+		EventValues.registerEventValue(FireworkExplodeEvent.class, Color[].class, event -> {
+			List<FireworkEffect> effects = event.getEntity().getFireworkMeta().getEffects();
+			if (effects.isEmpty())
+				return null;
+			List<Color> colors = new ArrayList<>();
+			for (FireworkEffect fireworkEffect : effects) {
+				for (org.bukkit.Color color : fireworkEffect.getColors()) {
+					if (SkriptColor.fromBukkitColor(color) != null)
+						colors.add(SkriptColor.fromBukkitColor(color));
+					else
+						colors.add(ColorRGB.fromBukkitColor(color));
+				}
 			}
-		}, 0);
+			if (colors.isEmpty())
+				return null;
+			return colors.toArray(Color[]::new);
+		});
 		//PlayerRiptideEvent
-		EventValues.registerEventValue(PlayerRiptideEvent.class, ItemStack.class, new Getter<ItemStack, PlayerRiptideEvent>() {
-			@Override
-			public ItemStack get(PlayerRiptideEvent e) {
-				return e.getItem();
-			}
-		}, 0);
+		EventValues.registerEventValue(PlayerRiptideEvent.class, ItemStack.class, PlayerRiptideEvent::getItem);
 		//PlayerArmorChangeEvent
 		if (Skript.classExists("com.destroystokyo.paper.event.player.PlayerArmorChangeEvent")) {
-			EventValues.registerEventValue(PlayerArmorChangeEvent.class, ItemStack.class, new Getter<ItemStack, PlayerArmorChangeEvent>() {
-				@Override
-				@Nullable
-				public ItemStack get(PlayerArmorChangeEvent e) {
-					return e.getNewItem();
-				}
-			}, 0);
+			EventValues.registerEventValue(PlayerArmorChangeEvent.class, ItemStack.class, PlayerArmorChangeEvent::getNewItem);
 		}
 		//PlayerInventorySlotChangeEvent
 		if (Skript.classExists("io.papermc.paper.event.player.PlayerInventorySlotChangeEvent")) {
-			EventValues.registerEventValue(PlayerInventorySlotChangeEvent.class, ItemStack.class, new Getter<ItemStack, PlayerInventorySlotChangeEvent>() {
-				@Override
-				@Nullable
-				public ItemStack get(PlayerInventorySlotChangeEvent event) {
-					return event.getNewItemStack();
-				}
-			}, EventValues.TIME_NOW);
-			EventValues.registerEventValue(PlayerInventorySlotChangeEvent.class, ItemStack.class, new Getter<ItemStack, PlayerInventorySlotChangeEvent>() {
-				@Override
-				@Nullable
-				public ItemStack get(PlayerInventorySlotChangeEvent event) {
-					return event.getOldItemStack();
-				}
-			}, EventValues.TIME_PAST);
-			EventValues.registerEventValue(PlayerInventorySlotChangeEvent.class, Slot.class, new Getter<Slot, PlayerInventorySlotChangeEvent>() {
-				@Override
-				@Nullable
-				public Slot get(PlayerInventorySlotChangeEvent event) {
-					PlayerInventory inv = event.getPlayer().getInventory();
-					int slotIndex = event.getSlot();
-					// Not all indices point to inventory slots. Equipment, for example
-					if (slotIndex >= 36) {
-						return new ch.njol.skript.util.slot.EquipmentSlot(event.getPlayer(), slotIndex);
-					} else {
-						return new InventorySlot(inv, slotIndex);
-					}
+			EventValues.registerEventValue(PlayerInventorySlotChangeEvent.class, ItemStack.class, PlayerInventorySlotChangeEvent::getNewItemStack);
+			EventValues.registerEventValue(PlayerInventorySlotChangeEvent.class, ItemStack.class, PlayerInventorySlotChangeEvent::getOldItemStack, TIME_PAST);
+			EventValues.registerEventValue(PlayerInventorySlotChangeEvent.class, Slot.class, event -> {
+				PlayerInventory inv = event.getPlayer().getInventory();
+				int slotIndex = event.getSlot();
+				// Not all indices point to inventory slots. Equipment, for example
+				if (slotIndex >= 36) {
+					return new ch.njol.skript.util.slot.EquipmentSlot(event.getPlayer(), slotIndex);
+				} else {
+					return new InventorySlot(inv, slotIndex);
 				}
-			}, EventValues.TIME_NOW);
+			});
 		}
 		//PrepareItemEnchantEvent
-		EventValues.registerEventValue(PrepareItemEnchantEvent.class, Player.class, new Getter<Player, PrepareItemEnchantEvent>() {
-			@Override
-			@Nullable
-			public Player get(PrepareItemEnchantEvent e) {
-				return e.getEnchanter();
-			}
-		}, 0);
-		EventValues.registerEventValue(PrepareItemEnchantEvent.class, ItemStack.class, new Getter<ItemStack, PrepareItemEnchantEvent>() {
-			@Override
-			@Nullable
-			public ItemStack get(PrepareItemEnchantEvent e) {
-				return e.getItem();
-			}
-		}, 0);
-		EventValues.registerEventValue(PrepareItemEnchantEvent.class, Block.class, new Getter<Block, PrepareItemEnchantEvent>() {
-			@Override
-			@Nullable
-			public Block get(PrepareItemEnchantEvent e) {
-				return e.getEnchantBlock();
-			}
-		}, 0);
+		EventValues.registerEventValue(PrepareItemEnchantEvent.class, Player.class, PrepareItemEnchantEvent::getEnchanter);
+		EventValues.registerEventValue(PrepareItemEnchantEvent.class, ItemStack.class, PrepareItemEnchantEvent::getItem);
+		EventValues.registerEventValue(PrepareItemEnchantEvent.class, Block.class, PrepareItemEnchantEvent::getEnchantBlock);
 		//EnchantItemEvent
-		EventValues.registerEventValue(EnchantItemEvent.class, Player.class, new Getter<Player, EnchantItemEvent>() {
-			@Override
-			@Nullable
-			public Player get(EnchantItemEvent e) {
-				return e.getEnchanter();
-			}
-		}, 0);
-		EventValues.registerEventValue(EnchantItemEvent.class, ItemStack.class, new Getter<ItemStack, EnchantItemEvent>() {
-			@Override
-			@Nullable
-			public ItemStack get(EnchantItemEvent e) {
-				return e.getItem();
-			}
-		}, 0);
-		EventValues.registerEventValue(EnchantItemEvent.class, EnchantmentType[].class, new Getter<EnchantmentType[], EnchantItemEvent>() {
-			@Override
-			@Nullable
-			public EnchantmentType[] get(EnchantItemEvent event) {
-				return event.getEnchantsToAdd().entrySet().stream()
-					.map(entry -> new EnchantmentType(entry.getKey(), entry.getValue()))
-					.toArray(EnchantmentType[]::new);
-			}
-		}, EventValues.TIME_NOW);
-		EventValues.registerEventValue(EnchantItemEvent.class, Block.class, new Getter<Block, EnchantItemEvent>() {
-			@Override
-			@Nullable
-			public Block get(EnchantItemEvent e) {
-				return e.getEnchantBlock();
-			}
-		}, 0);
-		EventValues.registerEventValue(HorseJumpEvent.class, Entity.class, new Getter<Entity, HorseJumpEvent>() {
-			@Nullable
-			@Override
-			public Entity get(HorseJumpEvent evt) {
-				return evt.getEntity();
-			}
-		}, 0);
+		EventValues.registerEventValue(EnchantItemEvent.class, Player.class, EnchantItemEvent::getEnchanter);
+		EventValues.registerEventValue(EnchantItemEvent.class, ItemStack.class, EnchantItemEvent::getItem);
+		EventValues.registerEventValue(EnchantItemEvent.class, EnchantmentType[].class,
+			event -> event.getEnchantsToAdd().entrySet().stream()
+			.map(entry -> new EnchantmentType(entry.getKey(), entry.getValue()))
+			.toArray(EnchantmentType[]::new));
+		EventValues.registerEventValue(EnchantItemEvent.class, Block.class, EnchantItemEvent::getEnchantBlock);
+		EventValues.registerEventValue(HorseJumpEvent.class, Entity.class, HorseJumpEvent::getEntity);
 		// PlayerTradeEvent
 		if (Skript.classExists("io.papermc.paper.event.player.PlayerTradeEvent")) {
-			EventValues.registerEventValue(PlayerTradeEvent.class, AbstractVillager.class, new Getter<AbstractVillager, PlayerTradeEvent>() {
-				@Override
-				@Nullable
-				public AbstractVillager get(PlayerTradeEvent event) {
-					return event.getVillager();
-				}
-			}, EventValues.TIME_NOW);
+			EventValues.registerEventValue(PlayerTradeEvent.class, AbstractVillager.class, PlayerTradeEvent::getVillager);
 		}
 		// PlayerChangedWorldEvent
-		EventValues.registerEventValue(PlayerChangedWorldEvent.class, World.class, new Getter<World, PlayerChangedWorldEvent>() {
-			@Nullable
-			@Override
-			public World get(PlayerChangedWorldEvent e) {
-				return e.getFrom();
-			}
-		}, -1);
+		EventValues.registerEventValue(PlayerChangedWorldEvent.class, World.class, PlayerChangedWorldEvent::getFrom, TIME_PAST);
 
 		// PlayerEggThrowEvent
-		EventValues.registerEventValue(PlayerEggThrowEvent.class, Egg.class, new Getter<Egg, PlayerEggThrowEvent>() {
-			@Override
-			@Nullable
-			public Egg get(PlayerEggThrowEvent event) {
-				return event.getEgg();
-			}
-		}, EventValues.TIME_NOW);
+		EventValues.registerEventValue(PlayerEggThrowEvent.class, Egg.class, PlayerEggThrowEvent::getEgg);
 
 		// PlayerStopUsingItemEvent
 		if (Skript.classExists("io.papermc.paper.event.player.PlayerStopUsingItemEvent")) {
-			EventValues.registerEventValue(PlayerStopUsingItemEvent.class, Timespan.class, new Getter<Timespan, PlayerStopUsingItemEvent>() {
-				@Override
-				public Timespan get(PlayerStopUsingItemEvent event) {
-					return Timespan.fromTicks(event.getTicksHeldFor());
-				}
-			}, EventValues.TIME_NOW);
-			EventValues.registerEventValue(PlayerStopUsingItemEvent.class, ItemType.class, new Getter<ItemType, PlayerStopUsingItemEvent>() {
-				@Override
-				public ItemType get(PlayerStopUsingItemEvent event) {
-					return new ItemType(event.getItem());
-				}
-			}, EventValues.TIME_NOW);
+			EventValues.registerEventValue(PlayerStopUsingItemEvent.class, Timespan.class,
+				event -> new Timespan(Timespan.TimePeriod.TICK, event.getTicksHeldFor()));
+			EventValues.registerEventValue(PlayerStopUsingItemEvent.class, ItemType.class,
+				event -> new ItemType(event.getItem()));
 		}
 
 		// LootGenerateEvent
 		if (Skript.classExists("org.bukkit.event.world.LootGenerateEvent")) {
-			EventValues.registerEventValue(LootGenerateEvent.class, Entity.class, new Getter<Entity, LootGenerateEvent>() {
-				@Override
-				@Nullable
-				public Entity get(LootGenerateEvent event) {
-					return event.getEntity();
-				}
-			}, EventValues.TIME_NOW);
-			EventValues.registerEventValue(LootGenerateEvent.class, Location.class, new Getter<Location, LootGenerateEvent>() {
-				@Override
-				@Nullable
-				public Location get(LootGenerateEvent event) {
-					return event.getLootContext().getLocation();
-				}
-			}, EventValues.TIME_NOW);
+			EventValues.registerEventValue(LootGenerateEvent.class, Entity.class, LootGenerateEvent::getEntity);
+			EventValues.registerEventValue(LootGenerateEvent.class, Location.class, event -> event.getLootContext().getLocation());
 		}
 
 		// EntityResurrectEvent
-		EventValues.registerEventValue(EntityResurrectEvent.class, Slot.class, new Getter<Slot, EntityResurrectEvent>() {
-			@Override
-			@Nullable
-			public Slot get(EntityResurrectEvent event) {
-				EquipmentSlot hand = event.getHand();
-				EntityEquipment equipment = event.getEntity().getEquipment();
-				if (equipment == null || hand == null)
-					return null;
-				return new ch.njol.skript.util.slot.EquipmentSlot(equipment,
-					(hand == EquipmentSlot.HAND) ? ch.njol.skript.util.slot.EquipmentSlot.EquipSlot.TOOL
-						: ch.njol.skript.util.slot.EquipmentSlot.EquipSlot.OFF_HAND);
-			}
-		}, EventValues.TIME_NOW);
+		EventValues.registerEventValue(EntityResurrectEvent.class, Slot.class, event -> {
+			EquipmentSlot hand = event.getHand();
+			EntityEquipment equipment = event.getEntity().getEquipment();
+			if (equipment == null || hand == null)
+				return null;
+			return new ch.njol.skript.util.slot.EquipmentSlot(equipment,
+				(hand == EquipmentSlot.HAND) ? ch.njol.skript.util.slot.EquipmentSlot.EquipSlot.TOOL
+					: ch.njol.skript.util.slot.EquipmentSlot.EquipSlot.OFF_HAND);
+		});
 
 		// PlayerItemHeldEvent
-		EventValues.registerEventValue(PlayerItemHeldEvent.class, Slot.class, new Getter<Slot, PlayerItemHeldEvent>() {
-			@Override
-			@Nullable
-			public Slot get(PlayerItemHeldEvent event) {
-				return new InventorySlot(event.getPlayer().getInventory(), event.getNewSlot());
-			}
-		}, EventValues.TIME_NOW);
-		EventValues.registerEventValue(PlayerItemHeldEvent.class, Slot.class, new Getter<Slot, PlayerItemHeldEvent>() {
-			@Override
-			@Nullable
-			public Slot get(PlayerItemHeldEvent event) {
-				return new InventorySlot(event.getPlayer().getInventory(), event.getPreviousSlot());
-			}
-		}, EventValues.TIME_PAST);
+		EventValues.registerEventValue(PlayerItemHeldEvent.class, Slot.class,
+			event -> new InventorySlot(event.getPlayer().getInventory(), event.getNewSlot()));
+		EventValues.registerEventValue(PlayerItemHeldEvent.class, Slot.class,
+			event -> new InventorySlot(event.getPlayer().getInventory(), event.getPreviousSlot()), TIME_PAST);
 
 		// PlayerPickupArrowEvent
 		// This event value is restricted to MC 1.14+ due to an API change which has the return type changed
 		// which throws a NoSuchMethodError if used in a 1.13 server.
 		if (Skript.isRunningMinecraft(1, 14))
-			EventValues.registerEventValue(PlayerPickupArrowEvent.class, Projectile.class, new Getter<Projectile, PlayerPickupArrowEvent>() {
-				@Override
-				public Projectile get(PlayerPickupArrowEvent event) {
-					return event.getArrow();
-				}
-			}, EventValues.TIME_NOW);
+			EventValues.registerEventValue(PlayerPickupArrowEvent.class, Projectile.class, PlayerPickupArrowEvent::getArrow);
 
-		EventValues.registerEventValue(PlayerPickupArrowEvent.class, ItemStack.class, new Getter<ItemStack, PlayerPickupArrowEvent>() {
-			@Override
-			@Nullable
-			public ItemStack get(PlayerPickupArrowEvent event) {
-				return event.getItem().getItemStack();
-			}
-		}, EventValues.TIME_NOW);
+		EventValues.registerEventValue(PlayerPickupArrowEvent.class, ItemStack.class,
+			event -> event.getItem().getItemStack());
 
 		//PlayerQuitEvent
 		if (Skript.classExists("org.bukkit.event.player.PlayerQuitEvent$QuitReason"))
-			EventValues.registerEventValue(PlayerQuitEvent.class, QuitReason.class, new Getter<QuitReason, PlayerQuitEvent>() {
-				@Override
-				@Nullable
-				public QuitReason get(PlayerQuitEvent event) {
-					return event.getReason();
-				}
-			}, EventValues.TIME_NOW);
+			EventValues.registerEventValue(PlayerQuitEvent.class, QuitReason.class, PlayerQuitEvent::getReason);
 
 		// PlayerStonecutterRecipeSelectEvent
 		if (Skript.classExists("io.papermc.paper.event.player.PlayerStonecutterRecipeSelectEvent"))
-			EventValues.registerEventValue(PlayerStonecutterRecipeSelectEvent.class, ItemStack.class, new Getter<ItemStack, PlayerStonecutterRecipeSelectEvent>() {
-				@Override
-				public ItemStack get(PlayerStonecutterRecipeSelectEvent event) {
-					return event.getStonecuttingRecipe().getResult();
-				}
-			}, EventValues.TIME_NOW);
+			EventValues.registerEventValue(PlayerStonecutterRecipeSelectEvent.class, ItemStack.class,
+				event -> event.getStonecuttingRecipe().getResult());
 
 		// EntityTransformEvent
-		EventValues.registerEventValue(EntityTransformEvent.class, Entity[].class, new Getter<Entity[], EntityTransformEvent>() {
-			@Override
-			@Nullable
-			public Entity[] get(EntityTransformEvent event) {
-				return event.getTransformedEntities().stream().toArray(Entity[]::new);
-			}
-		}, EventValues.TIME_NOW);
-		EventValues.registerEventValue(EntityTransformEvent.class, TransformReason.class, new Getter<TransformReason, EntityTransformEvent>() {
-			@Override
-			@Nullable
-			public TransformReason get(EntityTransformEvent event) {
-				return event.getTransformReason();
-			}
-		}, EventValues.TIME_NOW);
+		EventValues.registerEventValue(EntityTransformEvent.class, Entity[].class,
+			event -> event.getTransformedEntities().stream().toArray(Entity[]::new));
+		EventValues.registerEventValue(EntityTransformEvent.class, TransformReason.class, EntityTransformEvent::getTransformReason);
 
 		// BellRingEvent - these are BlockEvents and not EntityEvents, so they have declared methods for getEntity()
 		if (Skript.classExists("org.bukkit.event.block.BellRingEvent")) {
-			EventValues.registerEventValue(BellRingEvent.class, Entity.class, new Getter<Entity, BellRingEvent>() {
-                @Override
-                @Nullable
-                public Entity get(BellRingEvent event) {
-                    return event.getEntity();
-                }
-            }, EventValues.TIME_NOW);
+			EventValues.registerEventValue(BellRingEvent.class, Entity.class, BellRingEvent::getEntity);
 
-			EventValues.registerEventValue(BellRingEvent.class, Direction.class, new Getter<Direction, BellRingEvent>() {
-                @Override
-                public Direction get(BellRingEvent event) {
-                    return new Direction(event.getDirection(), 1);
-                }
-            }, EventValues.TIME_NOW);
+			EventValues.registerEventValue(BellRingEvent.class, Direction.class,
+				event -> new Direction(event.getDirection(), 1));
 		} else if (Skript.classExists("io.papermc.paper.event.block.BellRingEvent")) {
-			EventValues.registerEventValue(
-				io.papermc.paper.event.block.BellRingEvent.class, Entity.class,
-				new Getter<Entity, io.papermc.paper.event.block.BellRingEvent>() {
-					@Override
-					@Nullable
-					public Entity get(io.papermc.paper.event.block.BellRingEvent event) {
-						return event.getEntity();
-					}
-				}, EventValues.TIME_NOW);
+			EventValues.registerEventValue(io.papermc.paper.event.block.BellRingEvent.class, Entity.class, BellRingEvent::getEntity);
 		}
 
 		if (Skript.classExists("org.bukkit.event.block.BellResonateEvent")) {
-			EventValues.registerEventValue(BellResonateEvent.class, Entity[].class, new Getter<Entity[], BellResonateEvent>() {
-				@Override
-				@Nullable
-				public Entity[] get(BellResonateEvent event) {
-					return event.getResonatedEntities().toArray(new LivingEntity[0]);
-				}
-			}, EventValues.TIME_NOW);
+			EventValues.registerEventValue(BellResonateEvent.class, Entity[].class,
+				event -> event.getResonatedEntities().toArray(new LivingEntity[0]));
 		}
-    
+
 		// InventoryMoveItemEvent
-		EventValues.registerEventValue(InventoryMoveItemEvent.class, Inventory.class, new Getter<Inventory, InventoryMoveItemEvent>() {
-			@Override
-			public Inventory get(InventoryMoveItemEvent event) {
-				return event.getSource();
-			}
-		}, EventValues.TIME_NOW);
-		EventValues.registerEventValue(InventoryMoveItemEvent.class, Inventory.class, new Getter<Inventory, InventoryMoveItemEvent>() {
-			@Override
-			public Inventory get(InventoryMoveItemEvent event) {
-				return event.getDestination();
-			}
-		}, EventValues.TIME_FUTURE);
-		EventValues.registerEventValue(InventoryMoveItemEvent.class, Block.class, new Getter<Block, InventoryMoveItemEvent>() {
-			@Override
-			public Block get(InventoryMoveItemEvent event) {
-				return event.getSource().getLocation().getBlock();
-			}
-		}, EventValues.TIME_NOW);
-		EventValues.registerEventValue(InventoryMoveItemEvent.class, Block.class, new Getter<Block, InventoryMoveItemEvent>() {
-			@Override
-			public Block get(InventoryMoveItemEvent event) {
-				return event.getDestination().getLocation().getBlock();
-			}
-		}, EventValues.TIME_FUTURE);
-		EventValues.registerEventValue(InventoryMoveItemEvent.class, ItemStack.class, new Getter<ItemStack, InventoryMoveItemEvent>() {
-			@Override
-			public ItemStack get(InventoryMoveItemEvent event) {
-				return event.getItem();
-			}
-		}, EventValues.TIME_NOW);
+		EventValues.registerEventValue(InventoryMoveItemEvent.class, Inventory.class, InventoryMoveItemEvent::getSource);
+		EventValues.registerEventValue(InventoryMoveItemEvent.class, Inventory.class, InventoryMoveItemEvent::getDestination, TIME_FUTURE);
+		EventValues.registerEventValue(InventoryMoveItemEvent.class, Block.class,
+			event -> event.getSource().getLocation().getBlock());
+		EventValues.registerEventValue(InventoryMoveItemEvent.class, Block.class,
+			event -> event.getDestination().getLocation().getBlock(), TIME_FUTURE);
+		EventValues.registerEventValue(InventoryMoveItemEvent.class, ItemStack.class, InventoryMoveItemEvent::getItem);
 
 		// EntityRegainHealthEvent
-		EventValues.registerEventValue(EntityRegainHealthEvent.class, RegainReason.class, new Getter<RegainReason, EntityRegainHealthEvent>() {
-			@Override
-			@Nullable
-			public RegainReason get(EntityRegainHealthEvent event) {
-				return event.getRegainReason();
-			}
-		}, EventValues.TIME_NOW);
+		EventValues.registerEventValue(EntityRegainHealthEvent.class, RegainReason.class, EntityRegainHealthEvent::getRegainReason);
+
+		// FurnaceExtractEvent
+		EventValues.registerEventValue(FurnaceExtractEvent.class, Player.class, FurnaceExtractEvent::getPlayer);
+		EventValues.registerEventValue(FurnaceExtractEvent.class, ItemStack[].class,
+			event -> new ItemStack[]{ItemStack.of(event.getItemType(), event.getItemAmount())
+		});
+
+		// BlockDropItemEvent
+		EventValues.registerEventValue(BlockDropItemEvent.class, Block.class,
+			event -> new BlockStateBlock(event.getBlockState()), TIME_PAST);
+		EventValues.registerEventValue(BlockDropItemEvent.class, Player.class, BlockDropItemEvent::getPlayer);
+		EventValues.registerEventValue(BlockDropItemEvent.class, ItemStack[].class,
+			event -> event.getItems().stream().map(Item::getItemStack).toArray(ItemStack[]::new));
+		EventValues.registerEventValue(BlockDropItemEvent.class, Entity[].class,
+			event -> event.getItems().toArray(Entity[]::new));
+
+		// PlayerExpCooldownChangeEvent
+		EventValues.registerEventValue(PlayerExpCooldownChangeEvent.class, ChangeReason.class, PlayerExpCooldownChangeEvent::getReason);
+		EventValues.registerEventValue(PlayerExpCooldownChangeEvent.class, Timespan.class,
+			event -> new Timespan(Timespan.TimePeriod.TICK, event.getNewCooldown()));
+		EventValues.registerEventValue(PlayerExpCooldownChangeEvent.class, Timespan.class,
+			event -> new Timespan(Timespan.TimePeriod.TICK, event.getPlayer().getExpCooldown()), TIME_PAST);
+
+		// VehicleMoveEvent
+		EventValues.registerEventValue(VehicleMoveEvent.class, Location.class, VehicleMoveEvent::getTo);
+		EventValues.registerEventValue(VehicleMoveEvent.class, Location.class, VehicleMoveEvent::getFrom, TIME_PAST);
+
+		// BeaconEffectEvent
+		if (Skript.classExists("com.destroystokyo.paper.event.block.BeaconEffectEvent")) {
+			EventValues.registerEventValue(BeaconEffectEvent.class, PotionEffectType.class,
+				event -> event.getEffect().getType(), TIME_NOW, "Use 'applied effect' in beacon effect events.",
+				BeaconEffectEvent.class);
+			EventValues.registerEventValue(BeaconEffectEvent.class, Player.class, BeaconEffectEvent::getPlayer);
+		}
+		// PlayerChangeBeaconEffectEvent
+		if (Skript.classExists("io.papermc.paper.event.player.PlayerChangeBeaconEffectEvent")) {
+			EventValues.registerEventValue(PlayerChangeBeaconEffectEvent.class, Block.class, PlayerChangeBeaconEffectEvent::getBeacon);
+		}
+
+		// PlayerElytraBoostEvent
+		if (Skript.classExists("com.destroystokyo.paper.event.player.PlayerElytraBoostEvent")) {
+			EventValues.registerEventValue(PlayerElytraBoostEvent.class, ItemStack.class, PlayerElytraBoostEvent::getItemStack);
+			EventValues.registerEventValue(PlayerElytraBoostEvent.class, Entity.class, PlayerElytraBoostEvent::getFirework);
+		}
+
 	}
+
 }
diff --git a/src/main/java/ch/njol/skript/classes/data/DefaultChangers.java b/src/main/java/ch/njol/skript/classes/data/DefaultChangers.java
index 7d6aff7f333..8a8ce77dc55 100644
--- a/src/main/java/ch/njol/skript/classes/data/DefaultChangers.java
+++ b/src/main/java/ch/njol/skript/classes/data/DefaultChangers.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.classes.data;
 
 import org.bukkit.Material;
diff --git a/src/main/java/ch/njol/skript/classes/data/DefaultComparators.java b/src/main/java/ch/njol/skript/classes/data/DefaultComparators.java
index e5e42bf1423..f6a2759c201 100644
--- a/src/main/java/ch/njol/skript/classes/data/DefaultComparators.java
+++ b/src/main/java/ch/njol/skript/classes/data/DefaultComparators.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.classes.data;
 
 import ch.njol.skript.Skript;
@@ -29,6 +11,7 @@
 import ch.njol.skript.entity.EntityData;
 import ch.njol.skript.entity.RabbitData;
 import ch.njol.skript.util.BlockUtils;
+import ch.njol.skript.util.Color;
 import ch.njol.skript.util.Date;
 import ch.njol.skript.util.EnchantmentType;
 import ch.njol.skript.util.Experience;
@@ -51,11 +34,7 @@
 import org.bukkit.block.data.BlockData;
 import org.bukkit.command.CommandSender;
 import org.bukkit.enchantments.EnchantmentOffer;
-import org.bukkit.entity.Entity;
-import org.bukkit.entity.FallingBlock;
-import org.bukkit.entity.Item;
-import org.bukkit.entity.Projectile;
-import org.bukkit.entity.Wither;
+import org.bukkit.entity.*;
 import org.bukkit.event.entity.EntityDamageEvent.DamageCause;
 import org.bukkit.event.inventory.InventoryType;
 import org.bukkit.inventory.Inventory;
@@ -75,20 +54,28 @@ public DefaultComparators() {}
 	static {
 		
 		// Number - Number
-		Comparators.registerComparator(Number.class, Number.class, new Comparator<Number, Number>() {
+		Comparators.registerComparator(Number.class, Number.class, new Comparator<>() {
 			@Override
 			public Relation compare(Number n1, Number n2) {
 				if (n1 instanceof Long && n2 instanceof Long)
 					return Relation.get(n1.longValue() - n2.longValue());
-				Double d1 = n1.doubleValue(),
-					   d2 = n2.doubleValue();
+				double epsilon = Skript.EPSILON;
+				@SuppressWarnings("WrapperTypeMayBePrimitive") Double d1, d2;
+				if (n1 instanceof Float || n2 instanceof Float) {
+					d1 = (double) n1.floatValue();
+					d2 = (double) n2.floatValue();
+					epsilon = Math.min(d1, d2) * 1e-6; // dynamic epsilon
+				} else {
+					d1 = n1.doubleValue();
+					d2 = n2.doubleValue();
+				}
 				if (d1.isNaN() || d2.isNaN()) {
 					return Relation.SMALLER;
 				} else if (d1.isInfinite() || d2.isInfinite()) {
 					return d1 > d2 ? Relation.GREATER : d1 < d2 ? Relation.SMALLER : Relation.EQUAL;
 				} else {
 					double diff = d1 - d2;
-					if (Math.abs(diff) < Skript.EPSILON)
+					if (Math.abs(diff) < epsilon)
 						return Relation.EQUAL;
 					return Relation.get(diff);
 				}
@@ -447,7 +434,7 @@ public boolean supportsOrdering() {
 		Comparators.registerComparator(Timespan.class, Timespan.class, new Comparator<Timespan, Timespan>() {
 			@Override
 			public Relation compare(Timespan t1, Timespan t2) {
-				return Relation.get(t1.getMilliSeconds() - t2.getMilliSeconds());
+				return Relation.get(t1.getAs(Timespan.TimePeriod.MILLISECOND) - t2.getAs(Timespan.TimePeriod.MILLISECOND));
 			}
 
 			@Override
@@ -656,6 +643,28 @@ public boolean supportsOrdering() {
 
 		// Potion Effect Type
 		Comparators.registerComparator(PotionEffectType.class, PotionEffectType.class, (one, two) -> Relation.get(one.equals(two)));
+
+		// Color - Color
+		Comparators.registerComparator(Color.class, Color.class, (one, two) -> Relation.get(one.asBukkitColor().equals(two.asBukkitColor())));
+		Comparators.registerComparator(Color.class, org.bukkit.Color.class, (one, two) -> Relation.get(one.asBukkitColor().equals(two)));
+		Comparators.registerComparator(org.bukkit.Color.class, org.bukkit.Color.class, (one, two) -> Relation.get(one.equals(two)));
+
+		if (Skript.classExists("org.bukkit.entity.EntitySnapshot")) {
+			boolean SNAPSHOT_AS_STRING_EXISTS = Skript.methodExists(EntitySnapshot.class, "getAsString");
+			Comparators.registerComparator(EntitySnapshot.class, EntitySnapshot.class, new Comparator<EntitySnapshot, EntitySnapshot>() {
+				@Override
+				public Relation compare(EntitySnapshot snap1, EntitySnapshot snap2) {
+					if (!snap1.getEntityType().equals(snap1.getEntityType()))
+						return Relation.NOT_EQUAL;
+					boolean isEqual;
+					if (!SNAPSHOT_AS_STRING_EXISTS)
+						isEqual = snap1.equals(snap2) || snap1.hashCode() == snap2.hashCode();
+					else
+						isEqual = snap1.getAsString().equalsIgnoreCase(snap2.getAsString());
+					return Relation.get(isEqual);
+				}
+			});
+		}
 	}
 	
 }
diff --git a/src/main/java/ch/njol/skript/classes/data/DefaultConverters.java b/src/main/java/ch/njol/skript/classes/data/DefaultConverters.java
index a90de6957d3..f43258f2970 100644
--- a/src/main/java/ch/njol/skript/classes/data/DefaultConverters.java
+++ b/src/main/java/ch/njol/skript/classes/data/DefaultConverters.java
@@ -1,39 +1,19 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.classes.data;
 
+import ch.njol.skript.Skript;
 import ch.njol.skript.aliases.ItemType;
+import ch.njol.skript.bukkitutil.EntityUtils;
 import ch.njol.skript.command.Commands;
+import ch.njol.skript.config.Config;
+import ch.njol.skript.config.Node;
 import ch.njol.skript.entity.EntityData;
 import ch.njol.skript.entity.EntityType;
 import ch.njol.skript.entity.XpOrbData;
-import ch.njol.skript.util.BlockInventoryHolder;
-import ch.njol.skript.util.BlockUtils;
-import ch.njol.skript.util.Direction;
-import ch.njol.skript.util.EnchantmentType;
-import ch.njol.skript.util.Experience;
+import ch.njol.skript.lang.util.common.AnyAmount;
+import ch.njol.skript.lang.util.common.AnyNamed;
+import ch.njol.skript.util.*;
 import ch.njol.skript.util.slot.Slot;
-import org.bukkit.Bukkit;
-import org.bukkit.Location;
-import org.bukkit.Material;
-import org.bukkit.OfflinePlayer;
-import org.bukkit.World;
+import org.bukkit.*;
 import org.bukkit.block.Block;
 import org.bukkit.block.BlockState;
 import org.bukkit.block.DoubleChest;
@@ -42,20 +22,27 @@
 import org.bukkit.enchantments.Enchantment;
 import org.bukkit.enchantments.EnchantmentOffer;
 import org.bukkit.entity.Entity;
+import org.bukkit.entity.EntitySnapshot;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.InventoryHolder;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.PlayerInventory;
+import org.bukkit.plugin.Plugin;
+import org.bukkit.scoreboard.Objective;
+import org.bukkit.scoreboard.Team;
 import org.bukkit.util.Vector;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.UnknownNullability;
 import org.skriptlang.skript.lang.converter.Converter;
 import org.skriptlang.skript.lang.converter.Converters;
+import org.skriptlang.skript.lang.script.Script;
 
 public class DefaultConverters {
-	
+
 	public DefaultConverters() {}
-	
+
 	static {
 		// Number to subtypes converters
 		Converters.registerConverter(Number.class, Byte.class, Number::byteValue);
@@ -100,27 +87,27 @@ public DefaultConverters() {}
 				return (LivingEntity) e;
 			return null;
 		});
-		
+
 		// Block - Inventory
 		Converters.registerConverter(Block.class, Inventory.class, b -> {
 			if (b.getState() instanceof InventoryHolder)
 				return ((InventoryHolder) b.getState()).getInventory();
 			return null;
 		}, Commands.CONVERTER_NO_COMMAND_ARGUMENTS);
-		
+
 		// Entity - Inventory
 		Converters.registerConverter(Entity.class, Inventory.class, e -> {
 			if (e instanceof InventoryHolder)
 				return ((InventoryHolder) e).getInventory();
 			return null;
 		}, Commands.CONVERTER_NO_COMMAND_ARGUMENTS);
-		
+
 		// Block - ItemType
 		Converters.registerConverter(Block.class, ItemType.class, ItemType::new, Converter.NO_LEFT_CHAINING | Commands.CONVERTER_NO_COMMAND_ARGUMENTS);
 
 		// Block - Location
 		Converters.registerConverter(Block.class, Location.class, BlockUtils::getLocation, Commands.CONVERTER_NO_COMMAND_ARGUMENTS);
-		
+
 		// Entity - Location
 		Converters.registerConverter(Entity.class, Location.class, Entity::getLocation, Commands.CONVERTER_NO_COMMAND_ARGUMENTS);
 
@@ -129,21 +116,21 @@ public DefaultConverters() {}
 
 		// EntityData - EntityType
 		Converters.registerConverter(EntityData.class, EntityType.class, data -> new EntityType(data, -1));
-		
+
 		// ItemType - ItemStack
 		Converters.registerConverter(ItemType.class, ItemStack.class, ItemType::getRandom);
 		Converters.registerConverter(ItemStack.class, ItemType.class, ItemType::new);
-		
+
 		// Experience - XpOrbData
 		Converters.registerConverter(Experience.class, XpOrbData.class, e -> new XpOrbData(e.getXP()));
 		Converters.registerConverter(XpOrbData.class, Experience.class, e -> new Experience(e.getExperience()));
-		
+
 		// Slot - ItemType
 		Converters.registerConverter(Slot.class, ItemType.class, s -> {
 			ItemStack i = s.getItem();
 			return new ItemType(i != null ? i : new ItemStack(Material.AIR, 1));
 		});
-		
+
 		// Block - InventoryHolder
 		Converters.registerConverter(Block.class, InventoryHolder.class, b -> {
 			BlockState s = b.getState();
@@ -162,25 +149,108 @@ public DefaultConverters() {}
 
 		// InventoryHolder - Entity
 		Converters.registerConverter(InventoryHolder.class, Entity.class, holder -> {
-			if (holder instanceof Entity)
-				return (Entity) holder;
+			if (holder instanceof Entity entity)
+				return entity;
 			return null;
 		}, Converter.NO_CHAINING);
 
+		// Anything with a name -> AnyNamed
+		Converters.registerConverter(OfflinePlayer.class, AnyNamed.class, player -> player::getName, Converter.NO_RIGHT_CHAINING);
+		if (Skript.classExists("org.bukkit.generator.WorldInfo"))
+			Converters.registerConverter(World.class, AnyNamed.class, world -> world::getName, Converter.NO_RIGHT_CHAINING);
+		else //noinspection RedundantCast getName method is on World itself in older versions
+			Converters.registerConverter(World.class, AnyNamed.class, world -> () -> ((World) world).getName(), Converter.NO_RIGHT_CHAINING);
+		Converters.registerConverter(GameRule.class, AnyNamed.class, rule -> rule::getName, Converter.NO_RIGHT_CHAINING);
+		Converters.registerConverter(Server.class, AnyNamed.class, server -> server::getName, Converter.NO_RIGHT_CHAINING);
+		Converters.registerConverter(Plugin.class, AnyNamed.class, plugin -> plugin::getName, Converter.NO_RIGHT_CHAINING);
+		Converters.registerConverter(WorldType.class, AnyNamed.class, type -> type::getName, Converter.NO_RIGHT_CHAINING);
+		Converters.registerConverter(Team.class, AnyNamed.class, team -> team::getName, Converter.NO_RIGHT_CHAINING);
+		Converters.registerConverter(Objective.class, AnyNamed.class, objective -> objective::getName, Converter.NO_RIGHT_CHAINING);
+		Converters.registerConverter(Nameable.class, AnyNamed.class, //<editor-fold desc="Converter" defaultstate="collapsed">
+			nameable -> new AnyNamed() {
+				@Override
+				public @UnknownNullability String name() {
+					//noinspection deprecation
+					return nameable.getCustomName();
+				}
+
+				@Override
+				public boolean supportsNameChange() {
+					return true;
+				}
+
+				@Override
+				public void setName(String name) {
+					//noinspection deprecation
+					nameable.setCustomName(name);
+				}
+			},
+			//</editor-fold>
+			Converter.NO_RIGHT_CHAINING);
+		Converters.registerConverter(Block.class, AnyNamed.class, //<editor-fold desc="Converter" defaultstate="collapsed">
+			block -> new AnyNamed() {
+				@Override
+				public @UnknownNullability String name() {
+					BlockState state = block.getState();
+					if (state instanceof Nameable nameable)
+						//noinspection deprecation
+						return nameable.getCustomName();
+					return null;
+				}
+
+				@Override
+				public boolean supportsNameChange() {
+					return true;
+				}
+
+				@Override
+				public void setName(String name) {
+					BlockState state = block.getState();
+					if (state instanceof Nameable nameable)
+						//noinspection deprecation
+						nameable.setCustomName(name);
+				}
+			},
+			//</editor-fold>
+			Converter.NO_RIGHT_CHAINING);
+		Converters.registerConverter(CommandSender.class, AnyNamed.class, thing -> thing::getName, Converter.NO_RIGHT_CHAINING);
+		// Command senders should be done last because there might be a better alternative above
+
+		// Anything with an amount -> AnyAmount
+		Converters.registerConverter(ItemStack.class, AnyAmount.class, //<editor-fold desc="Converter" defaultstate="collapsed">
+			item -> new AnyAmount() {
+
+				@Override
+				public @NotNull Number amount() {
+					return item.getAmount();
+				}
+
+				@Override
+				public boolean supportsAmountChange() {
+					return true;
+				}
+
+				@Override
+				public void setAmount(Number amount) {
+					item.setAmount(amount != null ? amount.intValue() : 0);
+				}
+			},
+			//</editor-fold>
+			Converter.NO_RIGHT_CHAINING);
+
 		// InventoryHolder - Location
 		// since the individual ones can't be trusted to chain.
 		Converters.registerConverter(InventoryHolder.class, Location.class, holder -> {
-			if (holder instanceof Entity)
-				return ((Entity) holder).getLocation();
-			if (holder instanceof Block)
-				return ((Block) holder).getLocation();
-			if (holder instanceof BlockState)
-				return BlockUtils.getLocation(((BlockState) holder).getBlock());
-			if (holder instanceof DoubleChest) {
-				DoubleChest doubleChest = (DoubleChest) holder;
+			if (holder instanceof Entity entity)
+				return entity.getLocation();
+			if (holder instanceof Block block)
+				return block.getLocation();
+			if (holder instanceof BlockState state)
+				return BlockUtils.getLocation(state.getBlock());
+			if (holder instanceof DoubleChest doubleChest) {
 				if (doubleChest.getLeftSide() != null) {
 					return BlockUtils.getLocation(((BlockState) doubleChest.getLeftSide()).getBlock());
-				} else if (((DoubleChest) holder).getRightSide() != null) {
+				} else if (doubleChest.getRightSide() != null) {
 					return BlockUtils.getLocation(((BlockState) doubleChest.getRightSide()).getBlock());
 				}
 			}
@@ -198,6 +268,13 @@ public DefaultConverters() {}
 
 		Converters.registerConverter(String.class, World.class, Bukkit::getWorld);
 
+		if (Skript.classExists("org.bukkit.entity.EntitySnapshot"))
+			Converters.registerConverter(EntitySnapshot.class, EntityData.class, snapshot -> EntityUtils.toSkriptEntityData(snapshot.getEntityType()));
+
+		// Script -> Config & Node
+		Converters.registerConverter(Script.class, Config.class, Script::getConfig);
+		Converters.registerConverter(Config.class, Node.class, Config::getMainNode);
+
 //		// Entity - String (UUID) // Very slow, thus disabled for now
 //		Converters.registerConverter(String.class, Entity.class, new Converter<String, Entity>() {
 //
diff --git a/src/main/java/ch/njol/skript/classes/data/DefaultFunctions.java b/src/main/java/ch/njol/skript/classes/data/DefaultFunctions.java
index 712477f8031..69a142d4827 100644
--- a/src/main/java/ch/njol/skript/classes/data/DefaultFunctions.java
+++ b/src/main/java/ch/njol/skript/classes/data/DefaultFunctions.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.classes.data;
 
 import ch.njol.skript.Skript;
@@ -31,6 +13,7 @@
 import ch.njol.skript.registrations.DefaultClasses;
 import ch.njol.skript.util.Color;
 import ch.njol.skript.util.ColorRGB;
+import ch.njol.skript.util.Contract;
 import ch.njol.skript.util.Date;
 import ch.njol.util.Math2;
 import ch.njol.util.StringUtils;
@@ -42,27 +25,33 @@
 import org.bukkit.entity.Player;
 import org.bukkit.util.Vector;
 import org.jetbrains.annotations.Nullable;
-import ch.njol.skript.util.Contract;
+import org.joml.AxisAngle4f;
+import org.joml.Quaternionf;
+import org.joml.Vector3f;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.util.ArrayList;
+import java.text.DecimalFormat;
 import java.util.Calendar;
 import java.util.List;
 import java.util.UUID;
 
 public class DefaultFunctions {
-	
+
 	private static String str(double n) {
 		return StringUtils.toString(n, 4);
 	}
-	
+
+	private static final DecimalFormat DEFAULT_INTEGER_FORMAT = new DecimalFormat("###,###");
+	private static final DecimalFormat DEFAULT_DECIMAL_FORMAT = new DecimalFormat("###,###.##");
+
 	static {
 		Parameter<?>[] numberParam = new Parameter[] {new Parameter<>("n", DefaultClasses.NUMBER, true, null)};
 		Parameter<?>[] numbersParam = new Parameter[] {new Parameter<>("ns", DefaultClasses.NUMBER, false, null)};
-		
+
 		// basic math functions
-		
+
 		Functions.registerFunction(new SimpleJavaFunction<Long>("floor", numberParam, DefaultClasses.LONG, true) {
 			@Override
 			public Long[] executeSimple(Object[][] params) {
@@ -73,7 +62,7 @@ public Long[] executeSimple(Object[][] params) {
 		}.description("Rounds a number down, i.e. returns the closest integer smaller than or equal to the argument.")
 			.examples("floor(2.34) = 2", "floor(2) = 2", "floor(2.99) = 2")
 			.since("2.2"));
-		
+
 		Functions.registerFunction(new SimpleJavaFunction<Number>("round", new Parameter[] {new Parameter<>("n", DefaultClasses.NUMBER, true, null), new Parameter<>("d", DefaultClasses.NUMBER, true, new SimpleLiteral<Number>(0, false))}, DefaultClasses.NUMBER, true) {
 			@Override
 			public Number[] executeSimple(Object[][] params) {
@@ -94,7 +83,7 @@ public Number[] executeSimple(Object[][] params) {
 		}.description("Rounds a number, i.e. returns the closest integer to the argument. Place a second argument to define the decimal placement.")
 			.examples("round(2.34) = 2", "round(2) = 2", "round(2.99) = 3", "round(2.5) = 3")
 			.since("2.2, 2.7 (decimal placement)"));
-		
+
 		Functions.registerFunction(new SimpleJavaFunction<Long>("ceil", numberParam, DefaultClasses.LONG, true) {
 			@Override
 			public Long[] executeSimple(Object[][] params) {
@@ -105,7 +94,7 @@ public Long[] executeSimple(Object[][] params) {
 		}.description("Rounds a number up, i.e. returns the closest integer larger than or equal to the argument.")
 			.examples("ceil(2.34) = 3", "ceil(2) = 2", "ceil(2.99) = 3")
 			.since("2.2"));
-		
+
 		Functions.registerFunction(new SimpleJavaFunction<Long>("ceiling", numberParam, DefaultClasses.LONG, true) {
 			@Override
 			public Long[] executeSimple(Object[][] params) {
@@ -116,7 +105,7 @@ public Long[] executeSimple(Object[][] params) {
 		}.description("Alias of <a href='#ceil'>ceil</a>.")
 			.examples("ceiling(2.34) = 3", "ceiling(2) = 2", "ceiling(2.99) = 3")
 			.since("2.2"));
-		
+
 		Functions.registerFunction(new SimpleJavaFunction<Number>("abs", numberParam, DefaultClasses.NUMBER, true) {
 			@Override
 			public Number[] executeSimple(Object[][] params) {
@@ -128,7 +117,7 @@ public Number[] executeSimple(Object[][] params) {
 		}.description("Returns the absolute value of the argument, i.e. makes the argument positive.")
 			.examples("abs(3) = 3", "abs(-2) = 2")
 			.since("2.2"));
-		
+
 		Functions.registerFunction(new SimpleJavaFunction<Number>("mod", new Parameter[] {new Parameter<>("d", DefaultClasses.NUMBER, true, null), new Parameter<>("m", DefaultClasses.NUMBER, true, null)}, DefaultClasses.NUMBER, true) {
 			@Override
 			public Number[] executeSimple(Object[][] params) {
@@ -143,7 +132,7 @@ public Number[] executeSimple(Object[][] params) {
 						"The returned value is always positive. Returns NaN (not a number) if the second argument is zero.")
 			.examples("mod(3, 2) = 1", "mod(256436, 100) = 36", "mod(-1, 10) = 9")
 			.since("2.2"));
-		
+
 		Functions.registerFunction(new SimpleJavaFunction<Number>("exp", numberParam, DefaultClasses.NUMBER, true) {
 			@Override
 			public Number[] executeSimple(Object[][] params) {
@@ -152,7 +141,7 @@ public Number[] executeSimple(Object[][] params) {
 		}.description("The exponential function. You probably don't need this if you don't know what this is.")
 			.examples("exp(0) = 1", "exp(1) = " + str(Math.exp(1)))
 			.since("2.2"));
-		
+
 		Functions.registerFunction(new SimpleJavaFunction<Number>("ln", numberParam, DefaultClasses.NUMBER, true) {
 			@Override
 			public Number[] executeSimple(Object[][] params) {
@@ -162,7 +151,7 @@ public Number[] executeSimple(Object[][] params) {
 						"Returns NaN (not a number) if the argument is negative.")
 			.examples("ln(1) = 0", "ln(exp(5)) = 5", "ln(2) = " + StringUtils.toString(Math.log(2), 4))
 			.since("2.2"));
-		
+
 		Functions.registerFunction(new SimpleJavaFunction<Number>("log", new Parameter[] {new Parameter<>("n", DefaultClasses.NUMBER, true, null), new Parameter<>("base", DefaultClasses.NUMBER, true, new SimpleLiteral<Number>(10, false))}, DefaultClasses.NUMBER, true) {
 			@Override
 			public Number[] executeSimple(Object[][] params) {
@@ -174,7 +163,7 @@ public Number[] executeSimple(Object[][] params) {
 						"Returns NaN (not a number) if any of the arguments are negative.")
 			.examples("log(100) = 2 # 10^2 = 100", "log(16, 2) = 4 # 2^4 = 16")
 			.since("2.2"));
-		
+
 		Functions.registerFunction(new SimpleJavaFunction<Number>("sqrt", numberParam, DefaultClasses.NUMBER, true) {
 			@Override
 			public Number[] executeSimple(Object[][] params) {
@@ -184,9 +173,9 @@ public Number[] executeSimple(Object[][] params) {
 						"Returns NaN (not a number) if the argument is negative.")
 			.examples("sqrt(4) = 2", "sqrt(2) = " + str(Math.sqrt(2)), "sqrt(-1) = " + str(Math.sqrt(-1)))
 			.since("2.2"));
-		
+
 		// trigonometry
-		
+
 		Functions.registerFunction(new SimpleJavaFunction<Number>("sin", numberParam, DefaultClasses.NUMBER, true) {
 			@Override
 			public Number[] executeSimple(Object[][] params) {
@@ -195,7 +184,7 @@ public Number[] executeSimple(Object[][] params) {
 		}.description("The sine function. It starts at 0° with a value of 0, goes to 1 at 90°, back to 0 at 180°, to -1 at 270° and then repeats every 360°. Uses degrees, not radians.")
 			.examples("sin(90) = 1", "sin(60) = " + str(Math.sin(Math.toRadians(60))))
 			.since("2.2"));
-		
+
 		Functions.registerFunction(new SimpleJavaFunction<Number>("cos", numberParam, DefaultClasses.NUMBER, true) {
 			@Override
 			public Number[] executeSimple(Object[][] params) {
@@ -204,7 +193,7 @@ public Number[] executeSimple(Object[][] params) {
 		}.description("The cosine function. This is basically the <a href='#sin'>sine</a> shifted by 90°, i.e. <code>cos(a) = sin(a + 90°)</code>, for any number a. Uses degrees, not radians.")
 			.examples("cos(0) = 1", "cos(90) = 0")
 			.since("2.2"));
-		
+
 		Functions.registerFunction(new SimpleJavaFunction<Number>("tan", numberParam, DefaultClasses.NUMBER, true) {
 			@Override
 			public Number[] executeSimple(Object[][] params) {
@@ -213,7 +202,7 @@ public Number[] executeSimple(Object[][] params) {
 		}.description("The tangent function. This is basically <code><a href='#sin'>sin</a>(arg)/<a href='#cos'>cos</a>(arg)</code>. Uses degrees, not radians.")
 			.examples("tan(0) = 0", "tan(45) = 1", "tan(89.99) = " + str(Math.tan(Math.toRadians(89.99))))
 			.since("2.2"));
-		
+
 		Functions.registerFunction(new SimpleJavaFunction<Number>("asin", numberParam, DefaultClasses.NUMBER, true) {
 			@Override
 			public Number[] executeSimple(Object[][] params) {
@@ -222,7 +211,7 @@ public Number[] executeSimple(Object[][] params) {
 		}.description("The inverse of the <a href='#sin'>sine</a>, also called arcsin. Returns result in degrees, not radians. Only returns values from -90 to 90.")
 			.examples("asin(0) = 0", "asin(1) = 90", "asin(0.5) = " + str(Math.toDegrees(Math.asin(0.5))))
 			.since("2.2"));
-		
+
 		Functions.registerFunction(new SimpleJavaFunction<Number>("acos", numberParam, DefaultClasses.NUMBER, true) {
 			@Override
 			public Number[] executeSimple(Object[][] params) {
@@ -231,7 +220,7 @@ public Number[] executeSimple(Object[][] params) {
 		}.description("The inverse of the <a href='#cos'>cosine</a>, also called arccos. Returns result in degrees, not radians. Only returns values from 0 to 180.")
 			.examples("acos(0) = 90", "acos(1) = 0", "acos(0.5) = " + str(Math.toDegrees(Math.asin(0.5))))
 			.since("2.2"));
-		
+
 		Functions.registerFunction(new SimpleJavaFunction<Number>("atan", numberParam, DefaultClasses.NUMBER, true) {
 			@Override
 			public Number[] executeSimple(Object[][] params) {
@@ -240,7 +229,7 @@ public Number[] executeSimple(Object[][] params) {
 		}.description("The inverse of the <a href='#tan'>tangent</a>, also called arctan. Returns result in degrees, not radians. Only returns values from -90 to 90.")
 			.examples("atan(0) = 0", "atan(1) = 45", "atan(10000) = " + str(Math.toDegrees(Math.atan(10000))))
 			.since("2.2"));
-		
+
 		Functions.registerFunction(new SimpleJavaFunction<Number>("atan2", new Parameter[] {
 			new Parameter<>("x", DefaultClasses.NUMBER, true, null),
 			new Parameter<>("y", DefaultClasses.NUMBER, true, null)
@@ -253,9 +242,9 @@ public Number[] executeSimple(Object[][] params) {
 			"The returned angle is measured counterclockwise in a standard mathematical coordinate system (x to the right, y to the top).")
 			.examples("atan2(0, 1) = 0", "atan2(10, 0) = 90", "atan2(-10, 5) = " + str(Math.toDegrees(Math.atan2(-10, 5))))
 			.since("2.2"));
-		
+
 		// more stuff
-		
+
 		Functions.registerFunction(new SimpleJavaFunction<Number>("sum", numbersParam, DefaultClasses.NUMBER, true) {
 			@Override
 			public Number[] executeSimple(Object[][] params) {
@@ -268,7 +257,7 @@ public Number[] executeSimple(Object[][] params) {
 		}.description("Sums a list of numbers.")
 			.examples("sum(1) = 1", "sum(2, 3, 4) = 9", "sum({some list variable::*})", "sum(2, {_v::*}, and the player's y-coordinate)")
 			.since("2.2"));
-		
+
 		Functions.registerFunction(new SimpleJavaFunction<Number>("product", numbersParam, DefaultClasses.NUMBER, true) {
 			@Override
 			public Number[] executeSimple(Object[][] params) {
@@ -281,7 +270,7 @@ public Number[] executeSimple(Object[][] params) {
 		}.description("Calculates the product of a list of numbers.")
 			.examples("product(1) = 1", "product(2, 3, 4) = 24", "product({some list variable::*})", "product(2, {_v::*}, and the player's y-coordinate)")
 			.since("2.2"));
-		
+
 		Functions.registerFunction(new SimpleJavaFunction<Number>("max", numbersParam, DefaultClasses.NUMBER, true) {
 			@Override
 			public Number[] executeSimple(Object[][] params) {
@@ -297,7 +286,7 @@ public Number[] executeSimple(Object[][] params) {
 		}.description("Returns the maximum number from a list of numbers.")
 			.examples("max(1) = 1", "max(1, 2, 3, 4) = 4", "max({some list variable::*})")
 			.since("2.2"));
-		
+
 		Functions.registerFunction(new SimpleJavaFunction<Number>("min", numbersParam, DefaultClasses.NUMBER, true) {
 			@Override
 			public Number[] executeSimple(Object[][] params) {
@@ -356,7 +345,7 @@ public Class<?> getReturnType(Expression<?>... arguments) {
 			.since("2.8.0");
 
 		// misc
-		
+
 		Functions.registerFunction(new SimpleJavaFunction<World>("world", new Parameter[] {
 			new Parameter<>("name", DefaultClasses.STRING, true, null)
 		}, DefaultClasses.WORLD, true) {
@@ -379,7 +368,7 @@ public World[] executeSimple(Object[][] params) {
 		}, DefaultClasses.LOCATION, true) {
 			@Override
 			@Nullable
-			public Location[] execute(FunctionEvent<?> e, Object[][] params) {
+			public Location[] execute(FunctionEvent<?> event, Object[][] params) {
 				for (int i : new int[] {0, 1, 2, 4, 5}) {
 					if (params[i] == null || params[i].length == 0 || params[i][0] == null)
 						return null;
@@ -416,7 +405,7 @@ public Location[] execute(FunctionEvent<?> e, Object[][] params) {
 					"delete all entities in radius 25 around location(50,50,50, world \"world_nether\")",
 					"ignite all entities in radius 25 around location(1,1,1, world of player)")
 			.since("2.2"));
-		
+
 		Functions.registerFunction(new SimpleJavaFunction<Date>("date", new Parameter[] {
 			new Parameter<>("year", DefaultClasses.NUMBER, true, null),
 			new Parameter<>("month", DefaultClasses.NUMBER, true, null),
@@ -449,7 +438,7 @@ public Location[] execute(FunctionEvent<?> e, Object[][] params) {
 				0, 0,
 				0
 			};
-			
+
 			{
 				int length = getSignature().getMaxParameters();
 				assert fields.length == length
@@ -457,7 +446,7 @@ public Location[] execute(FunctionEvent<?> e, Object[][] params) {
 					&& scale.length == length
 					&& relations.length == length;
 			}
-			
+
 			@Override
 			public Date[] executeSimple(Object[][] params) {
 				Calendar c = Calendar.getInstance();
@@ -466,21 +455,21 @@ public Date[] executeSimple(Object[][] params) {
 				for (int i = 0; i < fields.length; i++) {
 					int field = fields[i];
 					Number n = (Number) params[i][0];
-					
+
 					double value = n.doubleValue() * scale[i] + offsets[i] + carry;
 					int v = (int) Math2.floor(value);
 					carry = (value - v) * relations[i];
 					//noinspection MagicConstant
 					c.set(field, v);
 				}
-				
+
 				return new Date[] {new Date(c.getTimeInMillis(), c.getTimeZone())};
 			}
 		}.description("Creates a date from a year, month, and day, and optionally also from hour, minute, second and millisecond.",
 						"A time zone and DST offset can be specified as well (in minutes), if they are left out the server's time zone and DST offset are used (the created date will not retain this information).")
 			.examples("date(2014, 10, 1) # 0:00, 1st October 2014", "date(1990, 3, 5, 14, 30) # 14:30, 5th May 1990", "date(1999, 12, 31, 23, 59, 59, 999, -3*60, 0) # almost year 2000 in parts of Brazil (-3 hours offset, no DST)")
 			.since("2.2"));
-		
+
 		Functions.registerFunction(new SimpleJavaFunction<Vector>("vector", new Parameter[] {
 			new Parameter<>("x", DefaultClasses.NUMBER, true, null),
 			new Parameter<>("y", DefaultClasses.NUMBER, true, null),
@@ -494,11 +483,11 @@ public Vector[] executeSimple(Object[][] params) {
 					((Number)params[2][0]).doubleValue()
 				)};
 			}
-			
+
 		}.description("Creates a new vector, which can be used with various expressions, effects and functions.")
 			.examples("vector(0, 0, 0)")
 			.since("2.2-dev23"));
-		
+
 		Functions.registerFunction(new SimpleJavaFunction<Long>("calcExperience", new Parameter[] {
 			new Parameter<>("level", DefaultClasses.LONG, true, null)
 		}, DefaultClasses.LONG, true) {
@@ -515,29 +504,35 @@ public Long[] executeSimple(Object[][] params) {
 				} else { // Half experience points do not exist, anyway
 					exp = (int) (4.5 * level * level - 162.5 * level + 2220);
 				}
-				
+
 				return new Long[] {exp};
 			}
-			
+
 		}.description("Calculates the total amount of experience needed to achieve given level from scratch in Minecraft.")
 			.since("2.2-dev32"));
-		
+
 		Functions.registerFunction(new SimpleJavaFunction<Color>("rgb", new Parameter[] {
 			new Parameter<>("red", DefaultClasses.LONG, true, null),
 			new Parameter<>("green", DefaultClasses.LONG, true, null),
-			new Parameter<>("blue", DefaultClasses.LONG, true, null)
+			new Parameter<>("blue", DefaultClasses.LONG, true, null),
+			new Parameter<>("alpha", DefaultClasses.LONG, true, new SimpleLiteral<>(255L,true))
 		}, DefaultClasses.COLOR, true) {
 			@Override
 			public ColorRGB[] executeSimple(Object[][] params) {
 				Long red = (Long) params[0][0];
 				Long green = (Long) params[1][0];
 				Long blue = (Long) params[2][0];
-				
-				return CollectionUtils.array(new ColorRGB(red.intValue(), green.intValue(), blue.intValue()));
+				Long alpha = (Long) params[3][0];
+
+				return CollectionUtils.array(ColorRGB.fromRGBA(red.intValue(), green.intValue(), blue.intValue(), alpha.intValue()));
 			}
-		}).description("Returns a RGB color from the given red, green and blue parameters.")
-			.examples("dye player's leggings rgb(120, 30, 45)")
-			.since("2.5");
+		}).description("Returns a RGB color from the given red, green and blue parameters. Alpha values can be added optionally, " +
+						"but these only take affect in certain situations, like text display backgrounds.")
+			.examples(
+				"dye player's leggings rgb(120, 30, 45)",
+				"set the colour of a text display to rgb(10, 50, 100, 50)"
+			)
+			.since("2.5, 2.10 (alpha)");
 
 		Functions.registerFunction(new SimpleJavaFunction<Player>("player", new Parameter[] {
 			new Parameter<>("nameOrUUID", DefaultClasses.STRING, true, null),
@@ -634,6 +629,88 @@ public String[] executeSimple(Object[][] params) {
 				"concat(\"foo \", 100, \" bar\") # foo 100 bar"
 			).since("2.9.0");
 
+		// joml functions - for display entities
+		{
+			if (Skript.classExists("org.joml.Quaternionf")) {
+				Functions.registerFunction(new SimpleJavaFunction<>("quaternion", new Parameter[]{
+						new Parameter<>("w", DefaultClasses.NUMBER, true, null),
+						new Parameter<>("x", DefaultClasses.NUMBER, true, null),
+						new Parameter<>("y", DefaultClasses.NUMBER, true, null),
+						new Parameter<>("z", DefaultClasses.NUMBER, true, null)
+					}, Classes.getExactClassInfo(Quaternionf.class), true) {
+						@Override
+						public Quaternionf[] executeSimple(Object[][] params) {
+							double w = ((Number) params[0][0]).doubleValue();
+							double x = ((Number) params[1][0]).doubleValue();
+							double y = ((Number) params[2][0]).doubleValue();
+							double z = ((Number) params[3][0]).doubleValue();
+							return CollectionUtils.array(new Quaternionf(x, y, z, w));
+						}
+					})
+					.description("Returns a quaternion from the given W, X, Y and Z parameters. ")
+					.examples("quaternion(1, 5.6, 45.21, 10)")
+					.since("2.10");
+			}
+
+			if (Skript.classExists("org.joml.AxisAngle4f")) {
+				Functions.registerFunction(new SimpleJavaFunction<>("axisAngle", new Parameter[]{
+						new Parameter<>("angle", DefaultClasses.NUMBER, true, null),
+						new Parameter<>("axis", DefaultClasses.VECTOR, true, null)
+					}, Classes.getExactClassInfo(Quaternionf.class), true) {
+						@Override
+						public Quaternionf[] executeSimple(Object[][] params) {
+							float angle = (float) (((Number) params[0][0]).floatValue() / 180 * Math.PI);
+							Vector v = ((Vector) params[1][0]);
+							if (v.isZero() || !Double.isFinite(v.getX()) || !Double.isFinite(v.getY()) || !Double.isFinite(v.getZ()))
+								return new Quaternionf[0];
+							Vector3f axis = ((Vector) params[1][0]).toVector3f();
+							return CollectionUtils.array(new Quaternionf(new AxisAngle4f(angle, axis)));
+						}
+					})
+					.description("Returns a quaternion from the given angle (in degrees) and axis (as a vector). This represents a rotation around the given axis by the given angle.")
+					.examples("axisangle(90, (vector from player's facing))")
+					.since("2.10");
+			}
+		} // end joml functions
+
+		Functions.registerFunction(new SimpleJavaFunction<>("formatNumber", new Parameter[]{
+				new Parameter<>("number", DefaultClasses.NUMBER, true, null),
+				new Parameter<>("format", DefaultClasses.STRING, true, new SimpleLiteral<>("", true))
+			}, DefaultClasses.STRING, true) {
+				@Override
+				public String[] executeSimple(Object[][] params) {
+					Number number = (Number) params[0][0];
+					String format = (String) params[1][0];
+
+					if (format.isEmpty()) {
+						if (number instanceof Double || number instanceof Float) {
+							return new String[]{DEFAULT_DECIMAL_FORMAT.format(number)};
+						} else {
+							return new String[]{DEFAULT_INTEGER_FORMAT.format(number)};
+						}
+					}
+
+					try {
+						return new String[]{new DecimalFormat(format).format(number)};
+					} catch (IllegalArgumentException e) {
+						return null; // invalid format
+					}
+				}
+			})
+			.description(
+				"Converts numbers to human-readable format. By default, '###,###' (e.g. '123,456,789') " +
+				"will be used for whole numbers and '###,###.##' (e.g. '123,456,789.00) will be used for decimal numbers. " +
+				"A hashtag '#' represents a digit, a comma ',' is used to separate numbers, and a period '.' is used for decimals. ",
+				"Will return none if the format is invalid.",
+				"For further reference, see this <a href=\"https://docs.oracle.com/javase/7/docs/api/java/text/DecimalFormat.html\" target=\"_blank\">article</a>.")
+			.examples(
+				"command /balance:",
+					"\taliases: bal",
+					"\texecutable by: players",
+					"\ttrigger:",
+						"\t\tset {_money} to formatNumber({money::%sender's uuid%})",
+						"\t\tsend \"Your balance: %{_money}%\" to sender")
+			.since("2.10");
 	}
-	
+
 }
diff --git a/src/main/java/ch/njol/skript/classes/data/DefaultOperations.java b/src/main/java/ch/njol/skript/classes/data/DefaultOperations.java
index 48bf82939fd..907de84ef89 100644
--- a/src/main/java/ch/njol/skript/classes/data/DefaultOperations.java
+++ b/src/main/java/ch/njol/skript/classes/data/DefaultOperations.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.classes.data;
 
 import ch.njol.skript.util.Date;
diff --git a/src/main/java/ch/njol/skript/classes/data/JavaClasses.java b/src/main/java/ch/njol/skript/classes/data/JavaClasses.java
index 660c1cc04ba..8d9bbea8603 100644
--- a/src/main/java/ch/njol/skript/classes/data/JavaClasses.java
+++ b/src/main/java/ch/njol/skript/classes/data/JavaClasses.java
@@ -1,27 +1,11 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.classes.data;
 
+import ch.njol.skript.Skript;
 import ch.njol.skript.SkriptConfig;
 import ch.njol.skript.classes.ClassInfo;
 import ch.njol.skript.classes.Parser;
 import ch.njol.skript.classes.Serializer;
+import ch.njol.skript.expressions.base.EventValueExpression;
 import ch.njol.skript.lang.ParseContext;
 import ch.njol.skript.lang.VariableString;
 import ch.njol.skript.lang.util.SimpleLiteral;
@@ -31,15 +15,65 @@
 import ch.njol.skript.util.Utils;
 import ch.njol.util.StringUtils;
 import ch.njol.yggdrasil.Fields;
+import org.jetbrains.annotations.Contract;
 import org.jetbrains.annotations.Nullable;
+import org.joml.Quaternionf;
 
+import java.util.function.Function;
+import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 public class JavaClasses {
 
 	public static final int VARIABLENAME_NUMBERACCURACY = 8;
-	public static final Pattern INTEGER_PATTERN = Pattern.compile("-?[0-9]+");
-	public static final Pattern NUMBER_PATTERN = Pattern.compile("-?[0-9]+(?>\\.[0-9]+)?%?");
+
+	/**
+	 * The format of an integer.
+	 * <p>
+	 * Has an optional negative sign and may contain one underscores followed by any number of digits.
+	 * </p>
+	 */
+	public static final String INTEGER_NUMBER_PATTERN = "-?\\d+(_\\d+)*";
+
+	/**
+	 * Matches an integer with an optional unit of radians or degrees.
+	 * <p>
+	 * First, the actual number format {@code num} is specified. Then, an optional angle unit is specified.
+	 * For this, the {@code rad} group is used. This specifies that the number is in radians.
+	 * This is used to determine if the number should be converted to degrees.
+	 * Degrees is not a named group because it just returns the value in the {@code num} group, which
+	 * is the default behaviour.
+	 * Optionally, the user can use {@code x in degrees} instead of {@code x degrees}.
+	 * </p>
+	 */
+	public static final Pattern INTEGER_PATTERN =
+		Pattern.compile("(?<num>" + INTEGER_NUMBER_PATTERN + ")" +
+			"(?: (?:in )?(?:(?<rad>rad(?:ian)?s?)|deg(?:ree)?s?))?");
+
+	/**
+	 * The format of a decimal number.
+	 * <p>
+	 * Has an optional negative sign and may contain one underscores followed by any number of digits,
+	 * in the whole part or the fractional part. The fractional part is optional. May be followed by a percentage sign,
+	 * to indicate that the number is a percentage.
+	 * </p>
+	 */
+	public static final String DECIMAL_NUMBER_PATTERN = "-?\\d+(_\\d+)*(?>\\.\\d+(_\\d+)*)?%?";
+
+	/**
+	 * Matches a decimal number with an optional unit of radians or degrees.
+	 * <p>
+	 * First, the actual number format {@code num} is specified. Then, an optional angle unit is specified.
+	 * For this, the {@code rad} group is used. This specifies that the number is in radians.
+	 * This is used to determine if the number should be converted to degrees.
+	 * Degrees is not a named group because it just returns the value in the {@code num} group, which
+	 * is the default behaviour.
+	 * Optionally, the user can use {@code x in degrees} instead of {@code x degrees}.
+	 * </p>
+	 */
+	public static final Pattern DECIMAL_PATTERN =
+		Pattern.compile("(?<num>" + DECIMAL_NUMBER_PATTERN + ")" +
+			"(?: (?:in )?(?:(?<rad>rad(?:ian)?s?)|deg(?:ree)?s?))?");
 
 	static {
 		Classes.registerClass(new ClassInfo<>(Object.class, "object")
@@ -49,322 +83,55 @@ public class JavaClasses {
 				.usage("")
 				.examples("")
 				.since("1.0"));
-		
+
 		Classes.registerClass(new ClassInfo<>(Number.class, "number")
 				.user("num(ber)?s?")
 				.name("Number")
-				.description("A number, e.g. 2.5, 3, or -9812454.",
-						"Please note that many expressions only need integers, i.e. will discard any fractional parts of any numbers without producing an error.")
-				.usage("[-]###[.###]</code> (any amount of digits; very large numbers will be truncated though)")
-				.examples("set the player's health to 5.5",
-						"set {_temp} to 2*{_temp} - 2.5")
+				.description(
+					"A number, e.g. 2.5, 3, -9812454, 30 degrees or 3.14 radians.",
+					"Please note that many expressions only need integers, i.e. " +
+						"will discard any fractional parts of any numbers without producing an error.",
+					"Radians will be converted to degrees.")
+				.usage("[-]###[.###] [[in ](rad[ian][s]|deg[ree][s])]</code> (any amount of digits; very large numbers will be truncated though)")
+				.examples(
+					"set the player's health to 5.5",
+					"set {_temp} to 2*{_temp} - 2.5",
+					"set {_angle} to 3.14 in radians # will be converted to degrees"
+				)
 				.since("1.0")
 				// is registered after all other number classes
 				.defaultExpression(new SimpleLiteral<>(1, true))
-				.parser(new Parser<Number>() {
-					@Override
-					@Nullable
-					public Number parse(String s, ParseContext context) {
-						if (!NUMBER_PATTERN.matcher(s).matches())
-							return null;
-						if (INTEGER_PATTERN.matcher(s).matches()) {
-							try {
-								return Long.valueOf(s);
-							} catch (NumberFormatException ignored) { }
-						}
-						try {
-							Double d = s.endsWith("%") ? Double.parseDouble(s.substring(0, s.length() - 1)) / 100 : Double.parseDouble(s);
-							if (d.isNaN() || d.isInfinite())
-								return null;
-							return d;
-						} catch (NumberFormatException e) {
-							return null;
-						}
-					}
-					
-					@Override
-					public String toString(Number n, int flags) {
-						return StringUtils.toString(n.doubleValue(), SkriptConfig.numberAccuracy.value());
-					}
-					
-					@Override
-					public String toVariableNameString(Number n) {
-						return StringUtils.toString(n.doubleValue(), VARIABLENAME_NUMBERACCURACY);
-					}
-                }).serializer(new Serializer<Number>() {
-					@Override
-					public Fields serialize(Number n) {
-						throw new IllegalStateException(); // serialised natively by Yggdrasil
-					}
-					
-					@Override
-					public boolean canBeInstantiated() {
-						return true;
-					}
-					
-					@Override
-					public void deserialize(Number o, Fields f) {
-						assert false;
-					}
+				.parser(new NumberParser())
+				.serializer(new NumberSerializer()));
 
-					@Override
-					@Nullable
-					public Number deserialize(String s) {
-						try {
-							return Integer.valueOf(s);
-						} catch (NumberFormatException ignored) {}
-						try {
-							return Double.valueOf(s);
-						} catch (NumberFormatException e) {
-							return null;
-						}
-					}
-					
-					@Override
-					public boolean mustSyncDeserialization() {
-						return false;
-					}
-				}));
-		
 		Classes.registerClass(new ClassInfo<>(Long.class, "long")
 				.user("int(eger)?s?")
 				.name(ClassInfo.NO_DOC)
 				.before("integer", "short", "byte")
 				.defaultExpression(new SimpleLiteral<>((long) 1, true))
-				.parser(new Parser<Long>() {
-					@Override
-					@Nullable
-					public Long parse(String s, ParseContext context) {
-						if (!INTEGER_PATTERN.matcher(s).matches())
-							return null;
-						try {
-							return Long.valueOf(s);
-						} catch (NumberFormatException e) {
-							return null;
-						}
-					}
-					
-					@Override
-					public String toString(Long l, int flags) {
-						return "" + l;
-					}
-					
-					@Override
-					public String toVariableNameString(Long l) {
-						return "" + l;
-					}
-                }).serializer(new Serializer<Long>() {
-					@Override
-					public Fields serialize(Long n) {
-						throw new IllegalStateException(); // serialised natively by Yggdrasil
-					}
-					
-					@Override
-					public boolean canBeInstantiated() {
-						return true;
-					}
-					
-					@Override
-					public void deserialize(Long o, Fields f) {
-						assert false;
-					}
+				.parser(new LongParser())
+				.serializer(new LongSerializer()));
 
-					@Override
-					@Nullable
-					public Long deserialize(String s) {
-						try {
-							return Long.parseLong(s);
-						} catch (NumberFormatException e) {
-							return null;
-						}
-					}
-					
-					@Override
-					public boolean mustSyncDeserialization() {
-						return false;
-					}
-				}));
-		
 		Classes.registerClass(new ClassInfo<>(Integer.class, "integer")
 				.name(ClassInfo.NO_DOC)
 				.defaultExpression(new SimpleLiteral<>(1, true))
-				.parser(new Parser<Integer>() {
-					@Override
-					@Nullable
-					public Integer parse(String s, ParseContext context) {
-						if (!INTEGER_PATTERN.matcher(s).matches())
-							return null;
-						try {
-							return Integer.valueOf(s);
-						} catch (NumberFormatException e) {
-							return null;
-						}
-					}
-					
-					@Override
-					public String toString(Integer i, int flags) {
-						return "" + i;
-					}
-					
-					@Override
-					public String toVariableNameString(Integer i) {
-						return "" + i;
-					}
-                }).serializer(new Serializer<Integer>() {
-					@Override
-					public Fields serialize(Integer n) {
-						throw new IllegalStateException(); // serialised natively by Yggdrasil
-					}
-					
-					@Override
-					public boolean canBeInstantiated() {
-						return true;
-					}
-					
-					@Override
-					public void deserialize(Integer o, Fields f) {
-						assert false;
-					}
+				.parser(new IntegerParser())
+				.serializer(new IntegerSerializer()));
 
-					@Override
-					@Nullable
-					public Integer deserialize(String s) {
-						try {
-							return Integer.parseInt(s);
-						} catch (NumberFormatException e) {
-							return null;
-						}
-					}
-					
-					@Override
-					public boolean mustSyncDeserialization() {
-						return false;
-					}
-				}));
-		
 		Classes.registerClass(new ClassInfo<>(Double.class, "double")
 				.name(ClassInfo.NO_DOC)
 				.defaultExpression(new SimpleLiteral<>(1., true))
 				.after("long")
 				.before("float", "integer", "short", "byte")
-				.parser(new Parser<Double>() {
-					@Override
-					@Nullable
-					public Double parse(String s, ParseContext context) {
-						if (!NUMBER_PATTERN.matcher(s).matches())
-							return null;
-						try {
-							Double d = s.endsWith("%") ? Double.parseDouble(s.substring(0, s.length() - 1)) / 100 : Double.parseDouble(s);
-							if (d.isNaN() || d.isInfinite())
-								return null;
-							return d;
-						} catch (NumberFormatException e) {
-							return null;
-						}
-					}
-					
-					@Override
-					public String toString(Double d, int flags) {
-						return StringUtils.toString(d, SkriptConfig.numberAccuracy.value());
-					}
-					
-					@Override
-					public String toVariableNameString(Double d) {
-						return StringUtils.toString(d, VARIABLENAME_NUMBERACCURACY);
-					}
-                }).serializer(new Serializer<Double>() {
-					@Override
-					public Fields serialize(Double n) {
-						throw new IllegalStateException(); // serialised natively by Yggdrasil
-					}
-					
-					@Override
-					public boolean canBeInstantiated() {
-						return true;
-					}
-					
-					@Override
-					public void deserialize(Double o, Fields f) {
-						assert false;
-					}
+				.parser(new DoubleParser())
+				.serializer(new DoubleSerializer()));
 
-					@Override
-					@Nullable
-					public Double deserialize(String s) {
-						try {
-							return Double.parseDouble(s);
-						} catch (NumberFormatException e) {
-							return null;
-						}
-					}
-					
-					@Override
-					public boolean mustSyncDeserialization() {
-						return false;
-					}
-				}));
-		
 		Classes.registerClass(new ClassInfo<>(Float.class, "float")
 				.name(ClassInfo.NO_DOC)
 				.defaultExpression(new SimpleLiteral<>(1f, true))
-				.parser(new Parser<Float>() {
-					@Override
-					@Nullable
-					public Float parse(String s, ParseContext context) {
-						if (!NUMBER_PATTERN.matcher(s).matches())
-							return null;
-						try {
-							Float f = s.endsWith("%") ? Float.parseFloat(s.substring(0, s.length() - 1)) / 100 : Float.parseFloat(s);
-							if (f.isNaN() || f.isInfinite()) {
-								return null;
-							}
-							return f;
-						} catch (NumberFormatException e) {
-							return null;
-						}
-					}
-					
-					@Override
-					public String toString(Float f, int flags) {
-						return StringUtils.toString(f, SkriptConfig.numberAccuracy.value());
-					}
-					
-					@Override
-					public String toVariableNameString(Float f) {
-						return StringUtils.toString(f.doubleValue(), VARIABLENAME_NUMBERACCURACY);
-					}
-                }).serializer(new Serializer<Float>() {
-					@Override
-					public Fields serialize(Float n) {
-						throw new IllegalStateException(); // serialised natively by Yggdrasil
-					}
-					
-					@Override
-					public boolean canBeInstantiated() {
-						return true;
-					}
-					
-					@Override
-					public void deserialize(Float o, Fields f) {
-						assert false;
-					}
+				.parser(new FloatParser())
+				.serializer(new FloatSerializer()));
 
-					@Override
-					@Nullable
-					public Float deserialize(String s) {
-						try {
-							return Float.parseFloat(s);
-						} catch (NumberFormatException e) {
-							return null;
-						}
-					}
-					
-					@Override
-					public boolean mustSyncDeserialization() {
-						return false;
-					}
-				}));
-		
 		Classes.registerClass(new ClassInfo<>(Boolean.class, "boolean")
 				.user("booleans?")
 				.name("Boolean")
@@ -372,10 +139,10 @@ public boolean mustSyncDeserialization() {
 				.usage("true/yes/on or false/no/off")
 				.examples("set {config.%player%.use mod} to false")
 				.since("1.0")
-				.parser(new Parser<Boolean>() {
+				.parser(new Parser<>() {
 					private final RegexMessage truePattern = new RegexMessage("boolean.true.pattern");
 					private final RegexMessage falsePattern = new RegexMessage("boolean.false.pattern");
-					
+
 					@Override
 					@Nullable
 					public Boolean parse(String s, ParseContext context) {
@@ -385,30 +152,30 @@ public Boolean parse(String s, ParseContext context) {
 							return Boolean.FALSE;
 						return null;
 					}
-					
+
 					private final Message trueName = new Message("boolean.true.name");
 					private final Message falseName = new Message("boolean.false.name");
-					
+
 					@Override
 					public String toString(Boolean b, int flags) {
 						return b ? trueName.toString() : falseName.toString();
 					}
-					
+
 					@Override
 					public String toVariableNameString(Boolean b) {
 						return "" + b;
 					}
-                }).serializer(new Serializer<Boolean>() {
+				}).serializer(new Serializer<Boolean>() {
 					@Override
 					public Fields serialize(Boolean n) {
 						throw new IllegalStateException(); // serialised natively by Yggdrasil
 					}
-					
+
 					@Override
 					public boolean canBeInstantiated() {
 						return true;
 					}
-					
+
 					@Override
 					public void deserialize(Boolean o, Fields f) {
 						assert false;
@@ -423,127 +190,25 @@ public Boolean deserialize(String s) {
 							return Boolean.FALSE;
 						return null;
 					}
-					
+
 					@Override
 					public boolean mustSyncDeserialization() {
 						return false;
 					}
 				}));
-		
+
 		Classes.registerClass(new ClassInfo<>(Short.class, "short")
 				.name(ClassInfo.NO_DOC)
 				.defaultExpression(new SimpleLiteral<>((short) 1, true))
-				.parser(new Parser<Short>() {
-					@Override
-					@Nullable
-					public Short parse(String s, ParseContext context) {
-						if (!INTEGER_PATTERN.matcher(s).matches())
-							return null;
-						try {
-							return Short.valueOf(s);
-						} catch (NumberFormatException e) {
-							return null;
-						}
-					}
-					
-					@Override
-					public String toString(Short s, int flags) {
-						return "" + s;
-					}
-					
-					@Override
-					public String toVariableNameString(Short s) {
-						return "" + s;
-					}
-                }).serializer(new Serializer<Short>() {
-					@Override
-					public Fields serialize(Short n) {
-						throw new IllegalStateException(); // serialised natively by Yggdrasil
-					}
-					
-					@Override
-					public boolean canBeInstantiated() {
-						return true;
-					}
-					
-					@Override
-					public void deserialize(Short o, Fields f) {
-						assert false;
-					}
+				.parser(new ShortParser())
+				.serializer(new ShortSerializer()));
 
-					@Override
-					@Nullable
-					public Short deserialize(String s) {
-						try {
-							return Short.parseShort(s);
-						} catch (NumberFormatException e) {
-							return null;
-						}
-					}
-					
-					@Override
-					public boolean mustSyncDeserialization() {
-						return false;
-					}
-				}));
-		
 		Classes.registerClass(new ClassInfo<>(Byte.class, "byte")
 				.name(ClassInfo.NO_DOC)
 				.defaultExpression(new SimpleLiteral<>((byte) 1, true))
-				.parser(new Parser<Byte>() {
-					@Override
-					@Nullable
-					public Byte parse(String s, ParseContext context) {
-						if (!INTEGER_PATTERN.matcher(s).matches())
-							return null;
-						try {
-							return Byte.valueOf(s);
-						} catch (NumberFormatException e) {
-							return null;
-						}
-					}
-					
-					@Override
-					public String toString(Byte b, int flags) {
-						return "" + b;
-					}
-					
-					@Override
-					public String toVariableNameString(Byte b) {
-						return "" + b;
-					}
-                }).serializer(new Serializer<Byte>() {
-					@Override
-					public Fields serialize(Byte n) {
-						throw new IllegalStateException(); // serialised natively by Yggdrasil
-					}
-					
-					@Override
-					public boolean canBeInstantiated() {
-						return true;
-					}
-					
-					@Override
-					public void deserialize(Byte o, Fields f) {
-						assert false;
-					}
+				.parser(new ByteParser())
+				.serializer(new ByteSerializer()));
 
-					@Override
-					@Nullable
-					public Byte deserialize(String s) {
-						try {
-							return Byte.parseByte(s);
-						} catch (NumberFormatException e) {
-							return null;
-						}
-					}
-					
-					@Override
-					public boolean mustSyncDeserialization() {
-						return false;
-					}
-				}));
-		
 		Classes.registerClass(new ClassInfo<>(String.class, "string")
 				.user("(text|string)s?")
 				.name("Text")
@@ -559,7 +224,7 @@ public boolean mustSyncDeserialization() {
 						"message \"Hello %player%\"",
 						"message \"The id of \"\"%type of tool%\"\" is %id of tool%.\"")
 				.since("1.0")
-				.parser(new Parser<String>() {
+				.parser(new Parser<>() {
 					@Override
 					@Nullable
 					public String parse(String s, ParseContext context) {
@@ -581,37 +246,37 @@ public String parse(String s, ParseContext context) {
 						assert false;
 						return null;
 					}
-					
+
 					@Override
 					public boolean canParse(ParseContext context) {
 						return context != ParseContext.DEFAULT;
 					}
-					
+
 					@Override
 					public String toString(String s, int flags) {
 						return s;
 					}
-					
+
 					@Override
 					public String getDebugMessage(String s) {
 						return '"' + s + '"';
 					}
-					
+
 					@Override
 					public String toVariableNameString(String s) {
 						return s;
 					}
-                }).serializer(new Serializer<String>() {
+				}).serializer(new Serializer<String>() {
 					@Override
 					public Fields serialize(String n) {
 						throw new IllegalStateException(); // serialised natively by Yggdrasil
 					}
-					
+
 					@Override
 					public boolean canBeInstantiated() {
 						return true;
 					}
-					
+
 					@Override
 					public void deserialize(String o, Fields f) {
 						assert false;
@@ -621,11 +286,511 @@ public void deserialize(String o, Fields f) {
 					public String deserialize(String s) {
 						return s;
 					}
-					
+
 					@Override
 					public boolean mustSyncDeserialization() {
 						return false;
 					}
 				}));
+
+		// joml type - for display entities
+		if (Skript.classExists("org.joml.Quaternionf"))
+			Classes.registerClass(new ClassInfo<>(Quaternionf.class, "quaternion")
+				.user("quaternionf?s?")
+				.name("Quaternion")
+				.description("Quaternions are four dimensional vectors, often used for representing rotations.")
+				.since("2.10")
+				.parser(new Parser<>() {
+					public boolean canParse(ParseContext context) {
+						return false;
+					}
+
+					@Override
+					public String toString(Quaternionf quaternion, int flags) {
+						return "w:" + Skript.toString(quaternion.w()) + ", x:" + Skript.toString(quaternion.x()) + ", y:" + Skript.toString(quaternion.y()) + ", z:" + Skript.toString(quaternion.z());
+					}
+
+					@Override
+					public String toVariableNameString(Quaternionf quaternion) {
+						return quaternion.w() + "," + quaternion.x() + "," + quaternion.y() + "," + quaternion.z();
+					}
+				})
+				.defaultExpression(new EventValueExpression<>(Quaternionf.class))
+				.cloner(quaternion -> {
+					try {
+						// Implements cloneable, but doesn't return a Quaternionf.
+						// org.joml improper override. Returns Object.
+						return (Quaternionf) quaternion.clone();
+					} catch (CloneNotSupportedException e) {
+						return null;
+					}
+				}));
+	}
+
+	/**
+	 * Converts a string to a number formatted as an integer.
+	 * <p>
+	 * Applies {@code stringToNumber} for parsing the number, then tries to
+	 * convert radians to degrees if the string contains a radian group.
+	 * </p>
+	 *
+	 * @param string The string with the possible number.
+	 * @param stringToNumber The function to parse the number, e.g. {@link Integer#parseInt(String)}.
+	 * @return The parsed string, or null if the string could not be parsed.
+	 */
+	@Contract(pure = true)
+	private static <T extends Number> @Nullable T convertIntegerFormatted(
+		String string,
+		Function<String, T> stringToNumber
+	) {
+		Matcher matcher = INTEGER_PATTERN.matcher(string);
+
+		if (!matcher.matches())
+			return null;
+
+		String number = matcher.group("num").replace("_", "");
+		if (matcher.group("rad") != null) {
+			try {
+				//noinspection unchecked
+				return (T) (Double) Math.toDegrees(stringToNumber.apply(number).doubleValue());
+			} catch (NumberFormatException ignored) {
+			}
+		} else {
+			try {
+				return stringToNumber.apply(number);
+			} catch (NumberFormatException ignored) {
+			}
+		}
+
+		return null;
+	}
+
+	/**
+	 * Converts a string to a number formatted as a decimal.
+	 * <p>
+	 * Applies {@code stringToNumber} for parsing the number.
+	 * If the number is a percentage, it gets parsed using the double value divided by 100, and {@code fromDouble}.
+	 * Then tries to convert radians to degrees if the string contains a radian group.
+	 * </p>
+	 *
+	 * @param string The string with the possible number.
+	 * @param stringToNumber The function to parse the number, e.g. {@link Integer#parseInt(String)}.
+	 * @return The parsed string, or null if the string could not be parsed.
+	 */
+	@Contract(pure = true)
+	private static <T extends Number> @Nullable T convertDecimalFormatted(
+		String string,
+		Function<String, T> stringToNumber
+	) {
+		Matcher matcher = DECIMAL_PATTERN.matcher(string);
+
+		if (!matcher.matches())
+			return null;
+
+		String number = matcher.group("num").replace("_", "");
+		try {
+			T result;
+			if (number.endsWith("%")) {
+				T extracted = stringToNumber.apply(number.substring(0, number.length() - 1));
+				//noinspection unchecked
+				result = (T) (Double) (extracted.doubleValue() / 100.0);
+			} else {
+				result = stringToNumber.apply(number);
+			}
+
+			if (matcher.group("rad") != null) {
+				try {
+					//noinspection unchecked
+					return (T) (Double) Math.toDegrees(result.doubleValue());
+				} catch (NumberFormatException ignored) {
+				}
+			}
+
+			return result;
+		} catch (NumberFormatException ex) {
+			return null;
+		}
+	}
+
+	private static class NumberParser extends Parser<Number> {
+
+		@Override
+		public @Nullable Number parse(String string, ParseContext context) {
+			Matcher numberMatcher = DECIMAL_PATTERN.matcher(string);
+			if (!numberMatcher.matches())
+				return null;
+
+			Integer integerAttempt = convertIntegerFormatted(string, Integer::parseInt);
+			if (integerAttempt != null)
+				return integerAttempt;
+
+			Double parsed = convertDecimalFormatted(string, Double::parseDouble);
+			return parsed == null || parsed.isInfinite() || parsed.isNaN() ? null : parsed;
+		}
+
+		@Override
+		public String toString(Number number, int flags) {
+			return StringUtils.toString(number.doubleValue(), SkriptConfig.numberAccuracy.value());
+		}
+
+		@Override
+		public String toVariableNameString(Number number) {
+			return StringUtils.toString(number.doubleValue(), VARIABLENAME_NUMBERACCURACY);
+		}
+
+	}
+
+	private static class NumberSerializer extends Serializer<Number> {
+
+		@Override
+		public Fields serialize(Number number) {
+			throw new IllegalStateException(); // serialised natively by Yggdrasil
+		}
+
+		@Override
+		public boolean canBeInstantiated() {
+			return true;
+		}
+
+		@Override
+		public void deserialize(Number number, Fields fields) {
+			assert false;
+		}
+
+		@Override
+		public @Nullable Number deserialize(String string) {
+			try {
+				return Integer.valueOf(string);
+			} catch (NumberFormatException ignored) {
+			}
+			try {
+				return Double.valueOf(string);
+			} catch (NumberFormatException e) {
+				return null;
+			}
+		}
+
+		@Override
+		public boolean mustSyncDeserialization() {
+			return false;
+		}
+
+	}
+
+	private static class LongParser extends Parser<Long> {
+
+		@Override
+		public @Nullable Long parse(String string, ParseContext context) {
+			return convertIntegerFormatted(string, Long::parseLong);
+		}
+
+		@Override
+		public String toString(Long l, int flags) {
+			return l.toString();
+		}
+
+		@Override
+		public String toVariableNameString(Long l) {
+			return l.toString();
+		}
+
+	}
+
+	private static class LongSerializer extends Serializer<Long> {
+
+		@Override
+		public Fields serialize(Long l) {
+			throw new IllegalStateException(); // serialised natively by Yggdrasil
+		}
+
+		@Override
+		public boolean canBeInstantiated() {
+			return true;
+		}
+
+		@Override
+		public void deserialize(Long l, Fields fields) {
+			assert false;
+		}
+
+		@Override
+		public @Nullable Long deserialize(String string) {
+			try {
+				return Long.parseLong(string);
+			} catch (NumberFormatException ex) {
+				return null;
+			}
+		}
+
+		@Override
+		public boolean mustSyncDeserialization() {
+			return false;
+		}
+
 	}
+
+	private static class IntegerParser extends Parser<Integer> {
+
+		@Override
+		public @Nullable Integer parse(String string, ParseContext context) {
+			return convertIntegerFormatted(string, Integer::parseInt);
+		}
+
+		@Override
+		public String toString(Integer i, int flags) {
+			return i.toString();
+		}
+
+		@Override
+		public String toVariableNameString(Integer i) {
+			return i.toString();
+		}
+
+	}
+
+	private static class IntegerSerializer extends Serializer<Integer> {
+
+		@Override
+		public Fields serialize(Integer i) {
+			throw new IllegalStateException(); // serialised natively by Yggdrasil
+		}
+
+		@Override
+		public boolean canBeInstantiated() {
+			return true;
+		}
+
+		@Override
+		public void deserialize(Integer i, Fields fields) {
+			assert false;
+		}
+
+		@Override
+		public @Nullable Integer deserialize(String string) {
+			try {
+				return Integer.parseInt(string);
+			} catch (NumberFormatException ex) {
+				return null;
+			}
+		}
+
+		@Override
+		public boolean mustSyncDeserialization() {
+			return false;
+		}
+
+	}
+
+	private static class DoubleParser extends Parser<Double> {
+
+		@Override
+		public @Nullable Double parse(String string, ParseContext context) {
+			Double parsed = convertDecimalFormatted(string, Double::parseDouble);
+
+			return parsed == null || parsed.isInfinite() || parsed.isNaN() ? null : parsed;
+		}
+
+		@Override
+		public String toString(Double d, int flags) {
+			return StringUtils.toString(d, SkriptConfig.numberAccuracy.value());
+		}
+
+		@Override
+		public String toVariableNameString(Double d) {
+			return StringUtils.toString(d, VARIABLENAME_NUMBERACCURACY);
+		}
+
+	}
+
+	private static class DoubleSerializer extends Serializer<Double> {
+
+		@Override
+		public Fields serialize(Double d) {
+			throw new IllegalStateException(); // serialised natively by Yggdrasil
+		}
+
+		@Override
+		public boolean canBeInstantiated() {
+			return true;
+		}
+
+		@Override
+		public void deserialize(Double d, Fields fields) {
+			assert false;
+		}
+
+		@Override
+		public @Nullable Double deserialize(String string) {
+			try {
+				return Double.parseDouble(string);
+			} catch (NumberFormatException ex) {
+				return null;
+			}
+		}
+
+		@Override
+		public boolean mustSyncDeserialization() {
+			return false;
+		}
+
+	}
+
+	private static class FloatParser extends Parser<Float> {
+
+		@Override
+		public @Nullable Float parse(String string, ParseContext context) {
+			Float parsed = convertDecimalFormatted(string, Float::parseFloat);
+
+			return parsed == null || parsed.isInfinite() || parsed.isNaN() ? null : parsed;
+		}
+
+		@Override
+		public String toString(Float f, int flags) {
+			return StringUtils.toString(f, SkriptConfig.numberAccuracy.value());
+		}
+
+		@Override
+		public String toVariableNameString(Float f) {
+			return StringUtils.toString(f.doubleValue(), VARIABLENAME_NUMBERACCURACY);
+		}
+
+	}
+
+	private static class FloatSerializer extends Serializer<Float> {
+
+		@Override
+		public Fields serialize(Float f) {
+			throw new IllegalStateException(); // serialised natively by Yggdrasil
+		}
+
+		@Override
+		public boolean canBeInstantiated() {
+			return true;
+		}
+
+		@Override
+		public void deserialize(Float f, Fields fields) {
+			assert false;
+		}
+
+		@Override
+		public @Nullable Float deserialize(String string) {
+			try {
+				return Float.parseFloat(string);
+			} catch (NumberFormatException ex) {
+				return null;
+			}
+		}
+
+		@Override
+		public boolean mustSyncDeserialization() {
+			return false;
+		}
+
+	}
+
+	private static class ShortParser extends Parser<Short> {
+
+		@Override
+		public @Nullable Short parse(String string, ParseContext context) {
+			return convertIntegerFormatted(string, Short::parseShort);
+		}
+
+		@Override
+		public String toString(Short s, int flags) {
+			return s.toString();
+		}
+
+		@Override
+		public String toVariableNameString(Short s) {
+			return s.toString();
+		}
+
+	}
+
+	private static class ShortSerializer extends Serializer<Short> {
+
+		@Override
+		public Fields serialize(Short s) {
+			throw new IllegalStateException(); // serialised natively by Yggdrasil
+		}
+
+		@Override
+		public boolean canBeInstantiated() {
+			return true;
+		}
+
+		@Override
+		public void deserialize(Short s, Fields fields) {
+			assert false;
+		}
+
+		@Override
+		public @Nullable Short deserialize(String string) {
+			try {
+				return Short.parseShort(string);
+			} catch (NumberFormatException ex) {
+				return null;
+			}
+		}
+
+		@Override
+		public boolean mustSyncDeserialization() {
+			return false;
+		}
+
+	}
+
+	private static class ByteParser extends Parser<Byte> {
+
+		@Override
+		public @Nullable Byte parse(String string, ParseContext context) {
+			return convertIntegerFormatted(string, Byte::parseByte);
+		}
+
+		@Override
+		public String toString(Byte b, int flags) {
+			return b.toString();
+		}
+
+		@Override
+		public String toVariableNameString(Byte b) {
+			return b.toString();
+		}
+
+	}
+
+	private static class ByteSerializer extends Serializer<Byte> {
+
+		@Override
+		public Fields serialize(Byte b) {
+			throw new IllegalStateException(); // serialised natively by Yggdrasil
+		}
+
+		@Override
+		public boolean canBeInstantiated() {
+			return true;
+		}
+
+		@Override
+		public void deserialize(Byte b, Fields fields) {
+			assert false;
+		}
+
+		@Override
+		public @Nullable Byte deserialize(String string) {
+			try {
+				return Byte.parseByte(string);
+			} catch (NumberFormatException ex) {
+				return null;
+			}
+		}
+
+		@Override
+		public boolean mustSyncDeserialization() {
+			return false;
+		}
+
+	}
+
 }
diff --git a/src/main/java/ch/njol/skript/classes/data/SkriptClasses.java b/src/main/java/ch/njol/skript/classes/data/SkriptClasses.java
index b0538c25f91..79cc665ae60 100644
--- a/src/main/java/ch/njol/skript/classes/data/SkriptClasses.java
+++ b/src/main/java/ch/njol/skript/classes/data/SkriptClasses.java
@@ -1,79 +1,50 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.classes.data;
 
-import java.io.StreamCorruptedException;
-import java.util.Iterator;
-import java.util.Locale;
-import java.util.regex.Pattern;
-
-import org.bukkit.Material;
-import org.bukkit.enchantments.Enchantment;
-import org.bukkit.inventory.ItemStack;
-import org.jetbrains.annotations.Nullable;
-
+import ch.njol.skript.ScriptLoader;
 import ch.njol.skript.Skript;
 import ch.njol.skript.aliases.Aliases;
 import ch.njol.skript.aliases.ItemData;
 import ch.njol.skript.aliases.ItemType;
-import ch.njol.skript.bukkitutil.EnchantmentUtils;
 import ch.njol.skript.bukkitutil.ItemUtils;
-import ch.njol.skript.classes.Changer;
-import ch.njol.skript.classes.ClassInfo;
-import ch.njol.skript.classes.EnumSerializer;
-import ch.njol.skript.classes.Parser;
-import ch.njol.skript.classes.Serializer;
-import ch.njol.skript.classes.YggdrasilSerializer;
+import ch.njol.skript.classes.*;
+import ch.njol.skript.config.Config;
+import ch.njol.skript.config.Node;
 import ch.njol.skript.expressions.base.EventValueExpression;
 import ch.njol.skript.lang.ParseContext;
+import ch.njol.skript.lang.function.DynamicFunctionReference;
 import ch.njol.skript.lang.util.SimpleLiteral;
+import ch.njol.skript.lang.util.common.AnyAmount;
+import ch.njol.skript.lang.util.common.AnyContains;
+import ch.njol.skript.lang.util.common.AnyNamed;
+import ch.njol.skript.lang.util.common.AnyValued;
 import ch.njol.skript.localization.Noun;
 import ch.njol.skript.localization.RegexMessage;
 import ch.njol.skript.registrations.Classes;
-import ch.njol.skript.util.Color;
-import ch.njol.skript.util.ColorRGB;
-import ch.njol.skript.util.Date;
-import ch.njol.skript.util.Direction;
-import ch.njol.skript.util.EnchantmentType;
-import ch.njol.skript.util.Experience;
-import ch.njol.skript.util.GameruleValue;
-import ch.njol.skript.util.SkriptColor;
-import ch.njol.skript.util.StructureType;
-import ch.njol.skript.util.Time;
-import ch.njol.skript.util.Timeperiod;
-import ch.njol.skript.util.Timespan;
-import ch.njol.skript.util.Utils;
-import ch.njol.skript.util.WeatherType;
+import ch.njol.skript.util.*;
 import ch.njol.skript.util.slot.Slot;
 import ch.njol.skript.util.visual.VisualEffect;
 import ch.njol.skript.util.visual.VisualEffects;
 import ch.njol.yggdrasil.Fields;
+import org.skriptlang.skript.lang.util.SkriptQueue;
+import org.bukkit.Material;
+import org.bukkit.enchantments.Enchantment;
+import org.bukkit.inventory.ItemStack;
+import org.jetbrains.annotations.Nullable;
+import org.skriptlang.skript.lang.script.Script;
+import org.skriptlang.skript.util.Executable;
 
+import java.io.File;
+import java.io.StreamCorruptedException;
+import java.nio.file.Path;
 import java.util.Arrays;
+import java.util.Iterator;
+import java.util.Locale;
+import java.util.regex.Pattern;
 
-/**
- * @author Peter Güttinger
- */
 @SuppressWarnings("rawtypes")
 public class SkriptClasses {
 	public SkriptClasses() {}
-	
+
 	static {
 		//noinspection unchecked
 		Classes.registerClass(new ClassInfo<>(ClassInfo.class, "classinfo")
@@ -96,17 +67,17 @@ public SkriptClasses() {}
 					public ClassInfo parse(final String s, final ParseContext context) {
 						return Classes.getClassInfoFromUserInput(Noun.stripIndefiniteArticle(s));
 					}
-					
+
 					@Override
 					public String toString(final ClassInfo c, final int flags) {
 						return c.toString(flags);
 					}
-					
+
 					@Override
 					public String toVariableNameString(final ClassInfo c) {
 						return c.getCodeName();
 					}
-					
+
 					@Override
 					public String getDebugMessage(final ClassInfo c) {
 						return c.getCodeName();
@@ -120,17 +91,17 @@ public Fields serialize(final ClassInfo c) {
 						f.putObject("codeName", c.getCodeName());
 						return f;
 					}
-					
+
 					@Override
 					public boolean canBeInstantiated() {
 						return false;
 					}
-					
+
 					@Override
 					public void deserialize(final ClassInfo o, final Fields f) throws StreamCorruptedException {
 						assert false;
 					}
-					
+
 					@Override
 					protected ClassInfo deserialize(final Fields fields) throws StreamCorruptedException {
 						final String codeName = fields.getObject("codeName", String.class);
@@ -141,20 +112,20 @@ protected ClassInfo deserialize(final Fields fields) throws StreamCorruptedExcep
 							throw new StreamCorruptedException("Invalid ClassInfo " + codeName);
 						return ci;
 					}
-					
+
 //					return c.getCodeName();
 					@Override
 					@Nullable
 					public ClassInfo deserialize(final String s) {
 						return Classes.getClassInfoNoError(s);
 					}
-					
+
 					@Override
 					public boolean mustSyncDeserialization() {
 						return false;
 					}
 				}));
-		
+
 		Classes.registerClass(new ClassInfo<>(WeatherType.class, "weathertype")
 				.user("weather ?types?", "weather conditions?", "weathers?")
 				.name("Weather Type")
@@ -171,12 +142,12 @@ public boolean mustSyncDeserialization() {
 					public WeatherType parse(final String s, final ParseContext context) {
 						return WeatherType.parse(s);
 					}
-					
+
 					@Override
 					public String toString(final WeatherType o, final int flags) {
 						return o.toString(flags);
 					}
-					
+
 					@Override
 					public String toVariableNameString(final WeatherType o) {
 						return "" + o.name().toLowerCase(Locale.ENGLISH);
@@ -184,7 +155,7 @@ public String toVariableNameString(final WeatherType o) {
 
 				})
 				.serializer(new EnumSerializer<>(WeatherType.class)));
-		
+
 		Classes.registerClass(new ClassInfo<>(ItemType.class, "itemtype")
 				.user("item ?types?", "materials?")
 				.name("Item Type")
@@ -238,7 +209,7 @@ public String toVariableNameString(final ItemType t) {
 								Enchantment e = ench.getType();
 								if (e == null)
 									continue;
-								b.append("#" + EnchantmentUtils.getKey(e));
+								b.append("#" + e.getKey().toString());
 								b.append(":" + ench.getLevel());
 							}
 						}
@@ -298,7 +269,7 @@ public String toVariableNameString(final Time o) {
 					@Nullable
 					public Timespan parse(final String s, final ParseContext context) {
 						try {
-							return Timespan.parse(s);
+							return Timespan.parse(s, context);
 						} catch (IllegalArgumentException e) {
 							Skript.error("'" + s + "' is not a valid timespan");
 							return null;
@@ -312,7 +283,7 @@ public String toString(final Timespan t, final int flags) {
 
 					@Override
 					public String toVariableNameString(final Timespan o) {
-						return "timespan:" + o.getMilliSeconds();
+						return "timespan:" + o.getAs(Timespan.TimePeriod.MILLISECOND);
 					}
 				}).serializer(new YggdrasilSerializer<>()));
 
@@ -376,7 +347,38 @@ public String toVariableNameString(final Timeperiod o) {
 						"subtract a day from {_yesterday}",
 						"# now {_yesterday} represents the date 24 hours before now")
 				.since("1.4")
-				.serializer(new YggdrasilSerializer<>()));
+				.serializer(new Serializer<Date>() {
+
+					@Override
+					public Fields serialize(Date date) {
+						Fields fields = new Fields();
+						fields.putPrimitive("time", date.getTime());
+						return fields;
+					}
+
+
+					@Override
+					protected Date deserialize(Fields fields)
+						throws StreamCorruptedException {
+						long time = fields.getPrimitive("time", long.class);
+						return new Date(time);
+					}
+
+					@Override
+					public void deserialize(Date date, Fields fields) {
+						throw new IllegalStateException("Cannot deserialize to an existing date object.");
+					}
+
+					@Override
+					public boolean mustSyncDeserialization() {
+						return false;
+					}
+
+					@Override
+					protected boolean canBeInstantiated() {
+						return false;
+					}
+				}));
 
 		Classes.registerClass(new ClassInfo<>(Direction.class, "direction")
 				.user("directions?")
@@ -626,7 +628,7 @@ public String toVariableNameString(final EnchantmentType o) {
 				.since("2.0")
 				.parser(new Parser<Experience>() {
 					private final RegexMessage pattern = new RegexMessage("types.experience.pattern", Pattern.CASE_INSENSITIVE);
-					
+
 					@Override
 					@Nullable
 					public Experience parse(String s, final ParseContext context) {
@@ -639,12 +641,12 @@ public Experience parse(String s, final ParseContext context) {
 							return new Experience(xp);
 						return null;
 					}
-					
+
 					@Override
 					public String toString(final Experience xp, final int flags) {
 						return xp.toString();
 					}
-					
+
 					@Override
 					public String toVariableNameString(final Experience xp) {
 						return "" + xp.getXP();
@@ -681,7 +683,7 @@ public String toVariableNameString(VisualEffect e) {
 
 				})
 				.serializer(new YggdrasilSerializer<>()));
-		
+
 		Classes.registerClass(new ClassInfo<>(GameruleValue.class, "gamerulevalue")
 				.user("gamerule values?")
 				.name("Gamerule Value")
@@ -691,6 +693,229 @@ public String toVariableNameString(VisualEffect e) {
 				.since("2.5")
 				.serializer(new YggdrasilSerializer<GameruleValue>())
 		);
+
+		Classes.registerClass(new ClassInfo<>(SkriptQueue.class, "queue")
+				.user("queues?")
+				.name("Queue")
+				.description("A queued list of values. Entries are removed from a queue when they are queried.")
+				.examples(
+					"set {queue} to a new queue",
+					"add \"hello\" to {queue}",
+					"broadcast the 1st element of {queue}"
+				)
+				.since("2.10")
+				.changer(new Changer<>() {
+					@Override
+					public Class<?> @Nullable [] acceptChange(ChangeMode mode) {
+						return switch (mode) {
+							case ADD, REMOVE, DELETE -> new Class[] {Object.class};
+							case RESET -> new Class[0];
+							default -> null;
+						};
+					}
+
+					@Override
+					public void change(SkriptQueue[] what, Object @Nullable [] delta, ChangeMode mode) {
+						for (SkriptQueue queue : what) {
+							switch (mode) {
+								case RESET, DELETE -> queue.clear();
+								case ADD -> {
+									assert delta != null;
+									queue.addAll(Arrays.asList(delta));
+								}
+								case REMOVE -> {
+									assert delta != null;
+									queue.removeAll(Arrays.asList(delta));
+								}
+							}
+						}
+					}
+				})
+				.serializer(new YggdrasilSerializer<>())
+		);
+
+
+		Classes.registerClass(new ClassInfo<>(Config.class, "config")
+			.user("configs?")
+			.name("Config")
+			.description("A configuration (or code) loaded by Skript, such as the config.sk or aliases.",
+				"Configs can be reloaded or navigated to find options.")
+			.usage("")
+			.examples("the skript config")
+			.since("2.10")
+			.parser(new Parser<Config>() {
+
+				@Override
+				public boolean canParse(ParseContext context) {
+					return false;
+				}
+
+				@Override
+				public String toString(Config config, int flags) {
+					@Nullable File file = config.getFile();
+					if (file == null)
+						return config.getFileName();
+					return Skript.getInstance().getDataFolder().getAbsoluteFile().toPath()
+						.relativize(file.toPath().toAbsolutePath()).toString();
+				}
+
+				@Override
+				public String toVariableNameString(Config config) {
+					return this.toString(config, 0);
+				}
+			}));
+
+		Classes.registerClass(new ClassInfo<>(Node.class, "node")
+			.user("nodes?")
+			.name("Node")
+			.description("A node (entry) from a script config file.",
+				"This may have navigable children.")
+			.usage("")
+			.examples("the current script")
+			.since("2.10")
+			.parser(new Parser<Node>() {
+
+				@Override
+				public boolean canParse(ParseContext context) {
+					return false;
+				}
+
+				@Override
+				public String toString(Node node, int flags) {
+					return node.getPath();
+				}
+
+				@Override
+				public String toVariableNameString(Node node) {
+					return this.toString(node, 0);
+				}
+
+			}));
+
+		Classes.registerClass(new ClassInfo<>(Script.class, "script")
+				.user("scripts?")
+				.name("Script")
+				.description("A script loaded by Skript.",
+					"Disabled scripts will report as being empty since their content has not been loaded.")
+				.usage("")
+				.examples("the current script")
+				.since("2.10")
+				.parser(new Parser<Script>() {
+					final Path path = Skript.getInstance().getScriptsFolder().getAbsoluteFile().toPath();
+
+					@Override
+					public boolean canParse(final ParseContext context) {
+						return switch (context) {
+							case PARSE, COMMAND -> true;
+							default -> false;
+						};
+					}
+
+					@Override
+					@Nullable
+					public Script parse(final String name, final ParseContext context) {
+						return switch (context) {
+							case PARSE, COMMAND -> {
+								@Nullable File file = ScriptLoader.getScriptFromName(name);
+								if (file == null || !file.isFile())
+									yield null;
+								yield ScriptLoader.getScript(file);
+							}
+							default -> null;
+						};
+					}
+
+					@Override
+					public String toString(final Script script, final int flags) {
+						@Nullable File file = script.getConfig().getFile();
+						if (file == null)
+							return script.getConfig().getFileName();
+						return path.relativize(file.toPath().toAbsolutePath()).toString();
+					}
+					@Override
+					public String toVariableNameString(final Script script) {
+						return this.toString(script, 0);
+					}
+				}));
+
+		Classes.registerClass(new ClassInfo<>(Executable.class, "executable")
+			.user("executables?")
+			.name("Executable")
+			.description("Something that can be executed (run) and may accept arguments, e.g. a function.",
+					"This may also return a result.")
+			.examples("run {_function} with arguments 1 and true")
+			.since("2.10"));
+
+		Classes.registerClass(new ClassInfo<>(DynamicFunctionReference.class, "function")
+			.user("functions?")
+			.name("Function")
+			.description("A function loaded by Skript.",
+					"This can be executed (with arguments) and may return a result.")
+			.examples("run {_function} with arguments 1 and true",
+					"set {_result} to the result of {_function}")
+			.since("2.10")
+			.parser(new Parser<DynamicFunctionReference<?>>() {
+
+				@Override
+				public boolean canParse(final ParseContext context) {
+					return switch (context) {
+						case PARSE, COMMAND -> true;
+						default -> false;
+					};
+				}
+
+				@Override
+				@Nullable
+				public DynamicFunctionReference<?> parse(final String name, final ParseContext context) {
+					return switch (context) {
+						case PARSE, COMMAND -> DynamicFunctionReference.parseFunction(name);
+						default -> null;
+					};
+				}
+
+				@Override
+				public String toString(DynamicFunctionReference<?> function, final int flags) {
+					return function.toString();
+				}
+
+				@Override
+				public String toVariableNameString(DynamicFunctionReference<?> function) {
+					return this.toString(function, 0);
+				}
+			}));
+
+		Classes.registerClass(new AnyInfo<>(AnyNamed.class, "named")
+				.name("Any Named Thing")
+				.description("Something that has a name (e.g. an item).")
+				.usage("")
+				.examples("{thing}'s name")
+				.since("2.10")
+		);
+
+		Classes.registerClass(new AnyInfo<>(AnyAmount.class, "numbered")
+				.name("Any Numbered/Sized Thing")
+				.description("Something that has an amount or size.")
+				.usage("")
+				.examples("the size of {thing}", "the amount of {thing}")
+				.since("2.10")
+		);
+
+		Classes.registerClass(new AnyInfo<>(AnyValued.class, "valued")
+			.name("Any Valued Thing")
+			.description("Something that has a value.")
+			.usage("")
+			.examples("the text of {node}")
+			.since("2.10")
+		);
+
+		Classes.registerClass(new AnyInfo<>(AnyContains.class, "containing")
+				.user("any container")
+				.name("Anything with Contents")
+				.description("Something that contains other things.")
+				.usage("")
+				.examples("{a} contains {b}")
+				.since("2.10")
+		);
 	}
-	
+
 }
diff --git a/src/main/java/ch/njol/skript/classes/registry/RegistryClassInfo.java b/src/main/java/ch/njol/skript/classes/registry/RegistryClassInfo.java
index ff82f966af8..be7c4c8076b 100644
--- a/src/main/java/ch/njol/skript/classes/registry/RegistryClassInfo.java
+++ b/src/main/java/ch/njol/skript/classes/registry/RegistryClassInfo.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.classes.registry;
 
 import ch.njol.skript.classes.ClassInfo;
@@ -23,6 +5,8 @@
 import ch.njol.skript.lang.DefaultExpression;
 import org.bukkit.Keyed;
 import org.bukkit.Registry;
+import org.skriptlang.skript.lang.comparator.Comparators;
+import org.skriptlang.skript.lang.comparator.Relation;
 
 /**
  * This class can be used for easily creating ClassInfos for {@link Registry}s.
@@ -32,15 +16,47 @@
  */
 public class RegistryClassInfo<R extends Keyed> extends ClassInfo<R> {
 
+	/**
+	 * @param registryClass The registry class
+	 * @param registry The registry
+	 * @param codeName The name used in patterns
+	 * @param languageNode The language node of the type
+	 */
 	public RegistryClassInfo(Class<R> registryClass, Registry<R> registry, String codeName, String languageNode) {
-		this(registryClass, registry, codeName, languageNode, new EventValueExpression<>(registryClass));
+		this(registryClass, registry, codeName, languageNode, new EventValueExpression<>(registryClass), true);
 	}
 
 	/**
+	 * @param registryClass The registry class
 	 * @param registry The registry
 	 * @param codeName The name used in patterns
+	 * @param languageNode The language node of the type
+	 * @param registerComparator Whether a default comparator should be registered for this registry's classinfo
+	 */
+	public RegistryClassInfo(Class<R> registryClass, Registry<R> registry, String codeName, String languageNode, boolean registerComparator) {
+		this(registryClass, registry, codeName, languageNode, new EventValueExpression<>(registryClass), registerComparator);
+	}
+
+	/**
+	 * @param registryClass The registry class
+	 * @param registry The registry
+	 * @param codeName The name used in patterns
+	 * @param languageNode The language node of the type
+	 * @param defaultExpression The default expression of the type
 	 */
 	public RegistryClassInfo(Class<R> registryClass, Registry<R> registry, String codeName, String languageNode, DefaultExpression<R> defaultExpression) {
+		this(registryClass, registry, codeName, languageNode,  defaultExpression, true);
+	}
+
+	/**
+	 * @param registryClass The registry class
+	 * @param registry The registry
+	 * @param codeName The name used in patterns
+	 * @param languageNode The language node of the type
+	 * @param defaultExpression The default expression of the type
+	 * @param registerComparator Whether a default comparator should be registered for this registry's classinfo
+	 */
+	public RegistryClassInfo(Class<R> registryClass, Registry<R> registry, String codeName, String languageNode, DefaultExpression<R> defaultExpression, boolean registerComparator) {
 		super(registryClass, codeName);
 		RegistryParser<R> registryParser = new RegistryParser<>(registry, languageNode);
 		usage(registryParser.getAllNames())
@@ -48,6 +64,9 @@ public RegistryClassInfo(Class<R> registryClass, Registry<R> registry, String co
 			.serializer(new RegistrySerializer<R>(registry))
 			.defaultExpression(defaultExpression)
 			.parser(registryParser);
+
+		if (registerComparator)
+			Comparators.registerComparator(registryClass, registryClass, (o1, o2) -> Relation.get(o1.getKey().equals(o2.getKey())));
 	}
 
 }
diff --git a/src/main/java/ch/njol/skript/classes/registry/RegistryParser.java b/src/main/java/ch/njol/skript/classes/registry/RegistryParser.java
index dc9bf9f00b7..ba35553f297 100644
--- a/src/main/java/ch/njol/skript/classes/registry/RegistryParser.java
+++ b/src/main/java/ch/njol/skript/classes/registry/RegistryParser.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.classes.registry;
 
 import ch.njol.skript.classes.Parser;
diff --git a/src/main/java/ch/njol/skript/classes/registry/RegistrySerializer.java b/src/main/java/ch/njol/skript/classes/registry/RegistrySerializer.java
index 33f6645fe52..1a58d6b0912 100644
--- a/src/main/java/ch/njol/skript/classes/registry/RegistrySerializer.java
+++ b/src/main/java/ch/njol/skript/classes/registry/RegistrySerializer.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.classes.registry;
 
 import ch.njol.skript.classes.Serializer;
diff --git a/src/main/java/ch/njol/skript/command/Argument.java b/src/main/java/ch/njol/skript/command/Argument.java
index c66f278d5c4..4147987b404 100644
--- a/src/main/java/ch/njol/skript/command/Argument.java
+++ b/src/main/java/ch/njol/skript/command/Argument.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.command;
 
 import java.util.WeakHashMap;
diff --git a/src/main/java/ch/njol/skript/command/CommandEvent.java b/src/main/java/ch/njol/skript/command/CommandEvent.java
index 07bf63ff046..803debab9f5 100644
--- a/src/main/java/ch/njol/skript/command/CommandEvent.java
+++ b/src/main/java/ch/njol/skript/command/CommandEvent.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.command;
 
 import org.bukkit.command.CommandSender;
diff --git a/src/main/java/ch/njol/skript/command/CommandHelp.java b/src/main/java/ch/njol/skript/command/CommandHelp.java
index 55eea97a06e..f38a73229cf 100644
--- a/src/main/java/ch/njol/skript/command/CommandHelp.java
+++ b/src/main/java/ch/njol/skript/command/CommandHelp.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.command;
 
 import static org.bukkit.ChatColor.GRAY;
diff --git a/src/main/java/ch/njol/skript/command/CommandUsage.java b/src/main/java/ch/njol/skript/command/CommandUsage.java
index c746d93cf8a..8d27f74a87c 100644
--- a/src/main/java/ch/njol/skript/command/CommandUsage.java
+++ b/src/main/java/ch/njol/skript/command/CommandUsage.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.command;
 
 import ch.njol.skript.lang.VariableString;
diff --git a/src/main/java/ch/njol/skript/command/Commands.java b/src/main/java/ch/njol/skript/command/Commands.java
index d2ca7d3d020..01534038dd0 100644
--- a/src/main/java/ch/njol/skript/command/Commands.java
+++ b/src/main/java/ch/njol/skript/command/Commands.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.command;
 
 import ch.njol.skript.ScriptLoader;
@@ -30,7 +12,7 @@
 import ch.njol.skript.log.SkriptLogger;
 import ch.njol.skript.util.SkriptColor;
 import ch.njol.skript.variables.Variables;
-import org.apache.commons.lang.Validate;
+import com.google.common.base.Preconditions;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
@@ -77,7 +59,7 @@ public abstract class Commands {
 	/**
 	 * A Converter flag declaring that a Converter cannot be used for parsing command arguments.
 	 */
-	public static final int CONVERTER_NO_COMMAND_ARGUMENTS = 4;
+	public static final int CONVERTER_NO_COMMAND_ARGUMENTS = 8;
 
 	private final static Map<String, ScriptCommand> commands = new HashMap<>();
 
@@ -100,7 +82,7 @@ public static SimpleCommandMap getCommandMap(){
 		return commandMap;
 	}
 
-	@SuppressWarnings("unchecked")
+	@SuppressWarnings({"unchecked", "removal"})
 	private static void init() {
 		try {
 			if (Bukkit.getPluginManager() instanceof SimplePluginManager) {
@@ -184,7 +166,7 @@ public void onServerCommand(ServerCommandEvent event) {
 	};
 
 	static boolean handleEffectCommand(CommandSender sender, String command) {
-		if (!(sender instanceof ConsoleCommandSender || sender.hasPermission("skript.effectcommands") || SkriptConfig.allowOpsToUseEffectCommands.value() && sender.isOp()))
+		if (!(Skript.testing() || sender instanceof ConsoleCommandSender || sender.hasPermission("skript.effectcommands") || SkriptConfig.allowOpsToUseEffectCommands.value() && sender.isOp()))
 			return false;
 		try {
 			command = "" + command.substring(SkriptConfig.effectCommandToken.value().length()).trim();
@@ -204,8 +186,7 @@ static boolean handleEffectCommand(CommandSender sender, String command) {
 					log.printLog();
 					if (!effectCommand.isCancelled()) {
 						sender.sendMessage(ChatColor.GRAY + "executing '" + SkriptColor.replaceColorChar(command) + "'");
-						// TODO: remove logPlayerCommands for 2.8.0
-						if ((SkriptConfig.logEffectCommands.value() || SkriptConfig.logPlayerCommands.value()) && !(sender instanceof ConsoleCommandSender))
+						if (SkriptConfig.logEffectCommands.value() && !(sender instanceof ConsoleCommandSender))
 							Skript.info(sender.getName() + " issued effect command: " + SkriptColor.replaceColorChar(command));
 						TriggerItem.walk(effect, effectCommand);
 						Variables.removeLocals(effectCommand);
@@ -300,7 +281,7 @@ public static void registerListeners() {
 			Bukkit.getPluginManager().registerEvents(new Listener() {
 				@EventHandler(priority = EventPriority.LOWEST, ignoreCancelled = true)
 				public void onPlayerChat(AsyncPlayerChatEvent event) {
-					if (!SkriptConfig.enableEffectCommands.value() || !event.getMessage().startsWith(SkriptConfig.effectCommandToken.value()))
+					if ((!SkriptConfig.enableEffectCommands.value() && !Skript.testing()) || !event.getMessage().startsWith(SkriptConfig.effectCommandToken.value()))
 						return;
 					if (!event.isAsynchronous()) {
 						if (handleEffectCommand(event.getPlayer(), event.getMessage()))
@@ -339,7 +320,7 @@ public CommandAliasHelpTopic(String alias, String aliasFor, HelpMap helpMap) {
 			this.aliasFor = aliasFor.startsWith("/") ? aliasFor : "/" + aliasFor;
 			this.helpMap = helpMap;
 			name = alias.startsWith("/") ? alias : "/" + alias;
-			Validate.isTrue(!name.equals(this.aliasFor), "Command " + name + " cannot be alias for itself");
+			Preconditions.checkState(!name.equals(this.aliasFor), "Command " + name + " cannot be alias for itself");
 			shortText = ChatColor.YELLOW + "Alias for " + ChatColor.WHITE + this.aliasFor;
 		}
 
diff --git a/src/main/java/ch/njol/skript/command/EffectCommandEvent.java b/src/main/java/ch/njol/skript/command/EffectCommandEvent.java
index dc411d3547d..76859f65a8d 100644
--- a/src/main/java/ch/njol/skript/command/EffectCommandEvent.java
+++ b/src/main/java/ch/njol/skript/command/EffectCommandEvent.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.command;
 
 import org.bukkit.command.CommandSender;
diff --git a/src/main/java/ch/njol/skript/command/ScriptCommand.java b/src/main/java/ch/njol/skript/command/ScriptCommand.java
index eca22e78a68..48d6c01dbbc 100644
--- a/src/main/java/ch/njol/skript/command/ScriptCommand.java
+++ b/src/main/java/ch/njol/skript/command/ScriptCommand.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.command;
 
 import ch.njol.skript.ScriptLoader;
@@ -43,7 +25,7 @@
 import ch.njol.skript.util.chat.MessageComponent;
 import ch.njol.skript.variables.Variables;
 import ch.njol.util.StringUtils;
-import ch.njol.util.Validate;
+import com.google.common.base.Preconditions;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.OfflinePlayer;
@@ -165,7 +147,13 @@ public ScriptCommand(
 		@Nullable VariableString cooldownMessage, String cooldownBypass,
 		@Nullable VariableString cooldownStorage, int executableBy, SectionNode node
 	) {
-		Validate.notNull(name, pattern, arguments, description, usage, aliases, node);
+		Preconditions.checkNotNull(name);
+		Preconditions.checkNotNull(pattern);
+		Preconditions.checkNotNull(arguments);
+		Preconditions.checkNotNull(description);
+		Preconditions.checkNotNull(usage);
+		Preconditions.checkNotNull(aliases);
+		Preconditions.checkNotNull(node);
 		this.name = name;
 		label = "" + name.toLowerCase(Locale.ENGLISH);
 		this.permission = permission;
@@ -556,7 +544,7 @@ public long getRemainingMilliseconds(UUID uuid, Event event) {
 			return 0;
 		Timespan cooldown = this.cooldown;
 		assert cooldown != null;
-		long remaining = cooldown.getMilliSeconds() - getElapsedMilliseconds(uuid, event);
+		long remaining = cooldown.getAs(Timespan.TimePeriod.MILLISECOND) - getElapsedMilliseconds(uuid, event);
 		if (remaining < 0)
 			remaining = 0;
 		return remaining;
@@ -565,7 +553,7 @@ public long getRemainingMilliseconds(UUID uuid, Event event) {
 	public void setRemainingMilliseconds(UUID uuid, Event event, long milliseconds) {
 		Timespan cooldown = this.cooldown;
 		assert cooldown != null;
-		long cooldownMs = cooldown.getMilliSeconds();
+		long cooldownMs = cooldown.getAs(Timespan.TimePeriod.MILLISECOND);
 		if (milliseconds > cooldownMs)
 			milliseconds = cooldownMs;
 		setElapsedMilliSeconds(uuid, event, cooldownMs - milliseconds);
@@ -573,11 +561,11 @@ public void setRemainingMilliseconds(UUID uuid, Event event, long milliseconds)
 
 	public long getElapsedMilliseconds(UUID uuid, Event event) {
 		Date lastUsage = getLastUsage(uuid, event);
-		return lastUsage == null ? 0 : new Date().getTimestamp() - lastUsage.getTimestamp();
+		return lastUsage == null ? 0 : Date.now().getTime() - lastUsage.getTime();
 	}
 
 	public void setElapsedMilliSeconds(UUID uuid, Event event, long milliseconds) {
-		Date date = new Date();
+		Date date = Date.now();
 		date.subtract(new Timespan(milliseconds));
 		setLastUsage(uuid, event, date);
 	}
diff --git a/src/main/java/ch/njol/skript/command/ScriptCommandEvent.java b/src/main/java/ch/njol/skript/command/ScriptCommandEvent.java
index 91b8f16567c..deed6c35be0 100644
--- a/src/main/java/ch/njol/skript/command/ScriptCommandEvent.java
+++ b/src/main/java/ch/njol/skript/command/ScriptCommandEvent.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.command;
 
 import ch.njol.skript.effects.Delay;
diff --git a/src/main/java/ch/njol/skript/conditions/CondAI.java b/src/main/java/ch/njol/skript/conditions/CondAI.java
index 52370cd07a3..4e4b602f4f7 100644
--- a/src/main/java/ch/njol/skript/conditions/CondAI.java
+++ b/src/main/java/ch/njol/skript/conditions/CondAI.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.conditions;
 
 import org.bukkit.entity.LivingEntity;
diff --git a/src/main/java/ch/njol/skript/conditions/CondAlphanumeric.java b/src/main/java/ch/njol/skript/conditions/CondAlphanumeric.java
index d52713979c6..01702442428 100644
--- a/src/main/java/ch/njol/skript/conditions/CondAlphanumeric.java
+++ b/src/main/java/ch/njol/skript/conditions/CondAlphanumeric.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.conditions;
 
 import org.apache.commons.lang.StringUtils;
diff --git a/src/main/java/ch/njol/skript/conditions/CondAnchorWorks.java b/src/main/java/ch/njol/skript/conditions/CondAnchorWorks.java
index a6c1aafacb1..03768c63793 100644
--- a/src/main/java/ch/njol/skript/conditions/CondAnchorWorks.java
+++ b/src/main/java/ch/njol/skript/conditions/CondAnchorWorks.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.conditions;
 
 import ch.njol.skript.Skript;
diff --git a/src/main/java/ch/njol/skript/conditions/CondCanFly.java b/src/main/java/ch/njol/skript/conditions/CondCanFly.java
index 478c0e862d4..efbd07272d4 100644
--- a/src/main/java/ch/njol/skript/conditions/CondCanFly.java
+++ b/src/main/java/ch/njol/skript/conditions/CondCanFly.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.conditions;
 
 import org.bukkit.entity.Player;
diff --git a/src/main/java/ch/njol/skript/conditions/CondCanHold.java b/src/main/java/ch/njol/skript/conditions/CondCanHold.java
index 8705c325a81..bfbcd70af9e 100644
--- a/src/main/java/ch/njol/skript/conditions/CondCanHold.java
+++ b/src/main/java/ch/njol/skript/conditions/CondCanHold.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.conditions;
 
 import org.bukkit.event.Event;
diff --git a/src/main/java/ch/njol/skript/conditions/CondCanPickUpItems.java b/src/main/java/ch/njol/skript/conditions/CondCanPickUpItems.java
index 07f5735e4f9..1bfb6d0aeac 100644
--- a/src/main/java/ch/njol/skript/conditions/CondCanPickUpItems.java
+++ b/src/main/java/ch/njol/skript/conditions/CondCanPickUpItems.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.conditions;
 
 import ch.njol.skript.conditions.base.PropertyCondition;
diff --git a/src/main/java/ch/njol/skript/conditions/CondCanSee.java b/src/main/java/ch/njol/skript/conditions/CondCanSee.java
index a6fedc2887a..0cc4b2359e1 100644
--- a/src/main/java/ch/njol/skript/conditions/CondCanSee.java
+++ b/src/main/java/ch/njol/skript/conditions/CondCanSee.java
@@ -1,85 +1,70 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.conditions;
 
-import org.bukkit.entity.Player;
-import org.bukkit.event.Event;
-import org.jetbrains.annotations.Nullable;
-
 import ch.njol.skript.Skript;
 import ch.njol.skript.conditions.base.PropertyCondition;
 import ch.njol.skript.conditions.base.PropertyCondition.PropertyType;
-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.doc.*;
 import ch.njol.skript.lang.Condition;
 import ch.njol.skript.lang.Expression;
 import ch.njol.skript.lang.SkriptParser.ParseResult;
 import ch.njol.util.Kleenean;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.Player;
+import org.bukkit.event.Event;
+import org.jetbrains.annotations.Nullable;
 
 @Name("Can See")
-@Description("Checks whether the given players can see another players.")
-@Examples({"if the player can't see the player-argument:",
-		"\tmessage \"&lt;light red&gt;The player %player-argument% is not online!\""})
-@Since("2.3")
+@Description("Checks whether the given players can see the provided entities.")
+@Examples({
+	"if sender can't see the player-argument:",
+		"\tmessage \"who dat?\"",
+	"",
+	"if the player can see the last spawned entity:",
+		"\tmessage \"hello there!\""
+})
+@Since("2.3, 2.10 (entities)")
+@RequiredPlugins("Minecraft 1.19+ (entities)")
 public class CondCanSee extends Condition {
 
 	static {
 		Skript.registerCondition(CondCanSee.class,
-				"%players% (is|are) [(1¦in)]visible for %players%",
-				"%players% can see %players%",
-				"%players% (is|are)(n't| not) [(1¦in)]visible for %players%",
-				"%players% can('t| not) see %players%");
+				"%entities% (is|are) [visible|:invisible] for %players%",
+				"%players% can see %entities%",
+				"%entities% (is|are)(n't| not) [visible|:invisible] for %players%",
+				"%players% can('t| not) see %entities%");
 	}
-	
+
 	@SuppressWarnings("null")
-	private Expression<Player> players;
+	private Expression<Player> viewers;
 	@SuppressWarnings("null")
-	private Expression<Player> targetPlayers;
+	private Expression<Entity> entities;
 
-	@SuppressWarnings({"unchecked", "null"})
 	@Override
-	public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelayed, ParseResult parseResult) {
+	@SuppressWarnings("unchecked")
+	public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelayed, ParseResult result) {
 		if (matchedPattern == 1 || matchedPattern == 3) {
-			players = (Expression<Player>) exprs[0];
-			targetPlayers = (Expression<Player>) exprs[1];
+			viewers = (Expression<Player>) exprs[0];
+			entities = (Expression<Entity>) exprs[1];
 		} else {
-			players = (Expression<Player>) exprs[1];
-			targetPlayers = (Expression<Player>) exprs[0];
+			entities = (Expression<Entity>) exprs[0];
+			viewers = (Expression<Player>) exprs[1];
 		}
-		setNegated(matchedPattern > 1 ^ parseResult.mark == 1);
+		setNegated(matchedPattern > 1 ^ result.hasTag("invisible"));
 		return true;
 	}
 
 	@Override
-	public boolean check(Event e) {
-		return players.check(e,
-				player -> targetPlayers.check(e,
+	public boolean check(Event event) {
+		return viewers.check(event,
+				player -> entities.check(event,
 						player::canSee
 				), isNegated());
 	}
 
 	@Override
-	public String toString(@Nullable Event e, boolean debug) {
-		return PropertyCondition.toString(this, PropertyType.CAN, e, debug, players,
-				"see" + targetPlayers.toString(e, debug));
+	public String toString(@Nullable Event event, boolean debug) {
+		return PropertyCondition.toString(this, PropertyType.CAN, event, debug, viewers,
+				"see " + entities.toString(event, debug));
 	}
 
 }
diff --git a/src/main/java/ch/njol/skript/conditions/CondCancelled.java b/src/main/java/ch/njol/skript/conditions/CondCancelled.java
index 4fcf70dfd03..29e98ae3c54 100644
--- a/src/main/java/ch/njol/skript/conditions/CondCancelled.java
+++ b/src/main/java/ch/njol/skript/conditions/CondCancelled.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.conditions;
 
 import ch.njol.skript.Skript;
diff --git a/src/main/java/ch/njol/skript/conditions/CondChance.java b/src/main/java/ch/njol/skript/conditions/CondChance.java
index 88359eb4867..1b2326adafb 100644
--- a/src/main/java/ch/njol/skript/conditions/CondChance.java
+++ b/src/main/java/ch/njol/skript/conditions/CondChance.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.conditions;
 
 import org.bukkit.event.Event;
diff --git a/src/main/java/ch/njol/skript/conditions/CondChatColors.java b/src/main/java/ch/njol/skript/conditions/CondChatColors.java
new file mode 100644
index 00000000000..dedb076af2d
--- /dev/null
+++ b/src/main/java/ch/njol/skript/conditions/CondChatColors.java
@@ -0,0 +1,36 @@
+package ch.njol.skript.conditions;
+
+import ch.njol.skript.Skript;
+import ch.njol.skript.conditions.base.PropertyCondition;
+import ch.njol.skript.doc.*;
+import com.destroystokyo.paper.ClientOption;
+import org.bukkit.entity.Player;
+
+@Name("Can See Chat Colors")
+@Description("Checks whether a player can see chat colors.")
+@Examples({
+	"if player can see chat colors:",
+		"\tsend \"Find the red word in <red>this<reset> message.\"",
+	"else:",
+		"\tsend \"You cannot partake in finding the colored word.\""
+})
+@RequiredPlugins("Paper")
+@Since("2.10")
+public class CondChatColors extends PropertyCondition<Player> {
+
+	static {
+		if (Skript.classExists("com.destroystokyo.paper.ClientOption"))
+			register(CondChatColors.class, PropertyType.CAN, "see chat colo[u]r[s|ing]", "players");
+	}
+
+	@Override
+	public boolean check(Player player) {
+		return player.getClientOption(ClientOption.CHAT_COLORS_ENABLED);
+	}
+
+	@Override
+	protected String getPropertyName() {
+		return "see chat colors";
+	}
+
+}
diff --git a/src/main/java/ch/njol/skript/conditions/CondChatFiltering.java b/src/main/java/ch/njol/skript/conditions/CondChatFiltering.java
new file mode 100644
index 00000000000..606b0b7db05
--- /dev/null
+++ b/src/main/java/ch/njol/skript/conditions/CondChatFiltering.java
@@ -0,0 +1,35 @@
+package ch.njol.skript.conditions;
+
+import ch.njol.skript.Skript;
+import ch.njol.skript.conditions.base.PropertyCondition;
+import ch.njol.skript.doc.*;
+import com.destroystokyo.paper.ClientOption;
+import org.bukkit.entity.Player;
+
+@Name("Has Chat Filtering")
+@Description("Checks whether a player has chat filtering enabled.")
+@Examples({
+	"if player doesn't have chat filtering enabled:",
+		"send \"<gray>This server may contain mature chat messages. You have been warned!\" to player",
+})
+@RequiredPlugins("Paper")
+@Since("2.10")
+public class CondChatFiltering extends PropertyCondition<Player> {
+
+	static {
+		if (Skript.classExists("com.destroystokyo.paper.ClientOption"))
+			register(CondChatFiltering.class, PropertyType.HAVE,
+				"(chat|text) filtering (on|enabled)", "players");
+	}
+
+	@Override
+	public boolean check(Player player) {
+		return player.getClientOption(ClientOption.TEXT_FILTERING_ENABLED);
+	}
+
+	@Override
+	protected String getPropertyName() {
+		return "chat filtering enabled";
+	}
+
+}
diff --git a/src/main/java/ch/njol/skript/conditions/CondChatVisibility.java b/src/main/java/ch/njol/skript/conditions/CondChatVisibility.java
new file mode 100644
index 00000000000..ad3cbfacd98
--- /dev/null
+++ b/src/main/java/ch/njol/skript/conditions/CondChatVisibility.java
@@ -0,0 +1,83 @@
+package ch.njol.skript.conditions;
+
+import ch.njol.skript.Skript;
+import ch.njol.skript.doc.*;
+import ch.njol.skript.lang.Condition;
+import ch.njol.skript.lang.Expression;
+import ch.njol.skript.lang.SkriptParser.ParseResult;
+import ch.njol.util.Kleenean;
+import com.destroystokyo.paper.ClientOption;
+import org.bukkit.entity.Player;
+import org.bukkit.event.Event;
+import org.jetbrains.annotations.Nullable;
+
+@Name("Can See Messages")
+@Description("Checks whether a player can see specific message types in chat.")
+@Examples({
+	"if player can see all messages:",
+		"\tsend \"You can see all messages.\"",
+	"if player can only see commands:",
+		"\tsend \"This game doesn't work with commands-only chat.\"",
+	"if player can't see any messages:",
+		"\tsend action bar \"Server shutting down in 5 minutes!\""
+})
+@RequiredPlugins("Paper")
+@Since("2.10")
+public class CondChatVisibility extends Condition {
+
+	static {
+		if (Skript.classExists("com.destroystokyo.paper.ClientOption$ChatVisibility"))
+			Skript.registerCondition(CondChatVisibility.class,
+				"%player% can see all messages [in chat]",
+				"%player% can only see (commands|system messages) [in chat]",
+				"%player% can('t|[ ]not) see any (command[s]|message[s]) [in chat]",
+				"%player% can('t|[ ]not) see all messages [in chat]",
+				"%player% can('t|[ ]not) only see (commands|system messages) [in chat]");
+	}
+
+	private int pattern = 0;
+	private Expression<Player> player;
+
+	@Override
+	@SuppressWarnings("unchecked")
+	public boolean init(Expression<?>[] expressions, int matchedPattern,
+						Kleenean isDelayed, ParseResult parseResult) {
+		pattern = matchedPattern;
+		player = (Expression<Player>) expressions[0];
+
+		setNegated(matchedPattern > 1);
+		return true;
+	}
+
+	@Override
+	public boolean check(Event event) {
+		Player player = this.player.getSingle(event);
+
+		if (player == null)
+			return false;
+
+		ClientOption.ChatVisibility current = player.getClientOption(ClientOption.CHAT_VISIBILITY);
+
+		return switch (pattern) {
+			case 0 -> current == ClientOption.ChatVisibility.FULL;
+			case 1 -> current == ClientOption.ChatVisibility.SYSTEM;
+			case 2 -> current == ClientOption.ChatVisibility.HIDDEN;
+			case 3 -> current != ClientOption.ChatVisibility.FULL;
+			case 4 -> current != ClientOption.ChatVisibility.SYSTEM;
+			default -> throw new IllegalStateException("Unexpected value: " + pattern);
+		};
+	}
+
+	@Override
+	public String toString(@Nullable Event event, boolean debug) {
+		return switch (pattern) {
+			case 0 -> player.toString(event, debug) + " can see all messages";
+			case 1 -> player.toString(event, debug) + " can only see commands";
+			case 2 -> player.toString(event, debug) + " can't see any messages";
+			case 3 -> player.toString(event, debug) + " can't see all messages";
+			case 4 -> player.toString(event, debug) + " can't only see commands";
+			default -> throw new IllegalStateException("Unexpected value: " + pattern);
+		};
+	}
+
+}
diff --git a/src/main/java/ch/njol/skript/conditions/CondCompare.java b/src/main/java/ch/njol/skript/conditions/CondCompare.java
index 3af42ccff03..cea7a493ba3 100644
--- a/src/main/java/ch/njol/skript/conditions/CondCompare.java
+++ b/src/main/java/ch/njol/skript/conditions/CondCompare.java
@@ -1,35 +1,17 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.conditions;
 
 import ch.njol.skript.lang.VerboseAssert;
+
 import ch.njol.skript.log.ParseLogHandler;
 import org.bukkit.event.Event;
-import org.jetbrains.annotations.Nullable;
-
-import ch.njol.skript.Skript;
-import ch.njol.skript.classes.ClassInfo;
-
 import org.skriptlang.skript.lang.comparator.Comparator;
 import org.skriptlang.skript.lang.comparator.ComparatorInfo;
+import org.skriptlang.skript.lang.comparator.Comparators;
 import org.skriptlang.skript.lang.comparator.Relation;
+import org.jetbrains.annotations.Nullable;
 
+import ch.njol.skript.Skript;
+import ch.njol.skript.classes.ClassInfo;
 import ch.njol.skript.doc.Description;
 import ch.njol.skript.doc.Examples;
 import ch.njol.skript.doc.Name;
@@ -45,14 +27,13 @@
 import ch.njol.skript.log.ErrorQuality;
 import ch.njol.skript.log.SkriptLogger;
 import ch.njol.skript.registrations.Classes;
-
-import org.skriptlang.skript.lang.comparator.Comparators;
 import ch.njol.skript.util.Patterns;
 import ch.njol.skript.util.Utils;
-import ch.njol.util.Checker;
 import ch.njol.util.Kleenean;
 import org.skriptlang.skript.lang.util.Cyclical;
 
+import java.util.function.Predicate;
+
 @Name("Comparison")
 @Description({"A very general condition, it simply compares two values. Usually you can only compare for equality (e.g. block is/isn't of &lt;type&gt;), " +
 		"but some values can also be compared using greater than/less than. In that case you can also test for whether an object is between two others.",
@@ -64,7 +45,7 @@
 		"the creature is not an enderman or an ender dragon"})
 @Since("1.0")
 public class CondCompare extends Condition implements VerboseAssert {
-	
+
 	private final static Patterns<Relation> patterns = new Patterns<>(new Object[][]{
 			{"(1¦neither|) %objects% ((is|are)(|2¦(n't| not|4¦ neither)) ((greater|more|higher|bigger|larger) than|above)|\\>) %objects%", Relation.GREATER},
 			{"(1¦neither|) %objects% ((is|are)(|2¦(n't| not|4¦ neither)) (greater|more|higher|bigger|larger|above) [than] or (equal to|the same as)|\\>=) %objects%", Relation.GREATER_OR_EQUAL},
@@ -74,7 +55,7 @@ public class CondCompare extends Condition implements VerboseAssert {
 			{"(1¦neither|) %objects% (is|are|=) [(equal to|the same as)] %objects%", Relation.EQUAL},
 			{"(1¦neither|) %objects% (is|are) between %objects% and %objects%", Relation.EQUAL},
 			{"(1¦neither|) %objects% (2¦)(is not|are not|isn't|aren't) between %objects% and %objects%", Relation.EQUAL},
-			
+
 			{"(1¦neither|) %objects@-1% (was|were)(|2¦(n't| not|4¦ neither)) ((greater|more|higher|bigger|larger) than|above) %objects%", Relation.GREATER},
 			{"(1¦neither|) %objects@-1% (was|were)(|2¦(n't| not|4¦ neither)) (greater|more|higher|bigger|larger|above) [than] or (equal to|the same as) %objects%", Relation.GREATER_OR_EQUAL},
 			{"(1¦neither|) %objects@-1% (was|were)(|2¦(n't| not|4¦ neither)) ((less|smaller|lower) than|below) %objects%", Relation.SMALLER},
@@ -83,7 +64,7 @@ public class CondCompare extends Condition implements VerboseAssert {
 			{"(1¦neither|) %objects@-1% (was|were) [(equal to|the same as)] %objects%", Relation.EQUAL},
 			{"(1¦neither|) %objects@-1% (was|were) between %objects% and %objects%", Relation.EQUAL},
 			{"(1¦neither|) %objects@-1% (2¦)(was not|were not|wasn't|weren't) between %objects% and %objects%", Relation.EQUAL},
-			
+
 			{"(1¦neither|) %objects@1% (will be|2¦(will (not|4¦neither) be|won't be)) ((greater|more|higher|bigger|larger) than|above) %objects%", Relation.GREATER},
 			{"(1¦neither|) %objects@1% (will be|2¦(will (not|4¦neither) be|won't be)) (greater|more|higher|bigger|larger|above) [than] or (equal to|the same as) %objects%", Relation.GREATER_OR_EQUAL},
 			{"(1¦neither|) %objects@1% (will be|2¦(will (not|4¦neither) be|won't be)) ((less|smaller|lower) than|below) %objects%", Relation.SMALLER},
@@ -93,11 +74,11 @@ public class CondCompare extends Condition implements VerboseAssert {
 			{"(1¦neither|) %objects@1% will be between %objects% and %objects%", Relation.EQUAL},
 			{"(1¦neither|) %objects@1% (2¦)(will not be|won't be) between %objects% and %objects%", Relation.EQUAL}
 	});
-	
+
 	static {
-		Skript.registerCondition(CondCompare.class, patterns.getPatterns());
+		Skript.registerCondition(CondCompare.class, ConditionType.PATTERN_MATCHES_EVERYTHING, patterns.getPatterns());
 	}
-	
+
 	private Expression<?> first;
 	private Expression<?> second;
 
@@ -109,7 +90,7 @@ public class CondCompare extends Condition implements VerboseAssert {
 	@Nullable
 	@SuppressWarnings("rawtypes")
 	private Comparator comparator;
-	
+
 	@Override
 	public boolean init(final Expression<?>[] vars, final int matchedPattern, final Kleenean isDelayed, final ParseResult parser) {
 		first = vars[0];
@@ -152,16 +133,16 @@ public boolean init(final Expression<?>[] vars, final int matchedPattern, final
 				}
 			}
 		}
-		
+
 		return true;
 	}
-	
+
 	public static String f(final Expression<?> e) {
 		if (e.getReturnType() == Object.class)
 			return e.toString(null, false);
 		return Classes.getSuperClassInfo(e.getReturnType()).getName().withIndefiniteArticle();
 	}
-	
+
 	@SuppressWarnings("unchecked")
 	private boolean init(String expr) {
 		Expression<?> third = this.third;
@@ -217,11 +198,11 @@ private boolean init(String expr) {
 			 * SkriptParser sees that CondCompare takes two objects. Most of the time,
 			 * this works fine. However, when there are multiple conflicting literals,
 			 * it just picks one of them at random.
-			 * 
+			 *
 			 * If our other parameter is not a literal, we can try parsing the other
 			 * explicitly with same return type. This is not guaranteed to succeed,
 			 * but will in work in some cases that were previously ambiguous.
-			 * 
+			 *
 			 * Some damage types not working (issue #2184) would be a good example
 			 * of issues that SkriptParser's lack of context can cause.
 			 */
@@ -236,7 +217,6 @@ private boolean init(String expr) {
 					comparator = Comparators.getComparator(first.getReturnType(), secondReturnType);
 				}
 			}
-			
 		}
 
 		return comparator != null;
@@ -273,7 +253,7 @@ private <T> SimpleLiteral<T> reparseLiteral(Class<T> type, Expression<?> express
 	 * For example 'fire' will be VisualEffect without this, but if the user attempts to compare 'fire'
 	 * with a block. This method will see if 'fire' can be compared to the block, and it will find ItemType.
 	 * Essentially solving something a human sees as comparable, but Skript doesn't understand.
-	 * 
+	 *
 	 * @param one The UnparsedLiteral expression to attempt to reconstruct.
 	 * @param two any expression to grab the return type from.
 	 * @return The newly formed Literal, will be SimpleLiteral in most cases.
@@ -307,7 +287,7 @@ private Literal<?> attemptReconstruction(UnparsedLiteral one, Expression<?> two)
 	/*
 	 * # := condition (e.g. is, is less than, contains, is enchanted with, has permission, etc.)
 	 * !# := not #
-	 * 
+	 *
 	 * a and b # x === a # x && b # x
 	 * a or b # x === a # x || b # x
 	 * a # x and y === a # x && a # y
@@ -318,25 +298,25 @@ private Literal<?> attemptReconstruction(UnparsedLiteral one, Expression<?> two)
 	 * a and b # x or y === a # x or y && b # x or y
 	 * a or b # x and y === a # x and y || b # x and y
 	 * a or b # x or y === a # x or y || b # x or y
-	 * 
-	 * 
+	 *
+	 *
 	 * a and b !# x === a !# x && b !# x
 	 * neither a nor b # x === a !# x && b !# x		// nor = and
 	 * a or b !# x === a !# x || b !# x
-	 * 
+	 *
 	 * a !# x and y === a !# x || a !# y							// e.g. "player doesn't have 2 emeralds and 5 gold ingots" == "NOT(player has 2 emeralds and 5 gold ingots)" == "player doesn't have 2 emeralds OR player doesn't have 5 gold ingots"
 	 * a # neither x nor y === a !# x && a !# y		// nor = or 	// e.g. "player has neither 2 emeralds nor 5 gold ingots" == "player doesn't have 2 emeralds AND player doesn't have 5 gold ingots"
 	 * a # neither x nor y === a !# x && a !# y		// nor = or 	// e.g. "player is neither the attacker nor the victim" == "player is not the attacker AND player is not the victim"
 	 * a !# x or y === a !# x && a !# y								// e.g. "player doesn't have 2 emeralds or 5 gold ingots" == "NOT(player has 2 emeralds or 5 gold ingots)" == "player doesn't have 2 emeralds AND player doesn't have 5 gold ingots"
-	 * 
+	 *
 	 * a and b !# x and y === a !# x and y && b !# x and y === (a !# x || a !# y) && (b !# x || b !# y)
 	 * a and b !# x or y === a !# x or y && b !# x or y
 	 * a and b # neither x nor y === a # neither x nor y && b # neither x nor y
-	 * 
+	 *
 	 * a or b !# x and y === a !# x and y || b !# x and y
 	 * a or b !# x or y === a !# x or y || b !# x or y
 	 * a or b # neither x nor y === a # neither x nor y || b # neither x nor y
-	 * 
+	 *
 	 * neither a nor b # x and y === a !# x and y && b !# x and y		// nor = and
 	 * neither a nor b # x or y === a !# x or y && b !# x or y			// nor = and
 	 */
@@ -351,11 +331,11 @@ public boolean check(final Event event) {
 				second.getAnd() && !second.isSingle())
 			return compareLists(event);
 
-		return first.check(event, (Checker<Object>) o1 ->
-			second.check(event, (Checker<Object>) o2 -> {
+		return first.check(event, (Predicate<Object>) o1 ->
+			second.check(event, (Predicate<Object>) o2 -> {
 				if (third == null)
 					return relation.isImpliedBy(comparator != null ? comparator.compare(o1, o2) : Comparators.compare(o1, o2));
-				return third.check(event, (Checker<Object>) o3 -> {
+				return third.check(event, (Predicate<Object>) o3 -> {
 					boolean isBetween;
 					if (comparator != null) {
 						if (o1 instanceof Cyclical<?> && o2 instanceof Cyclical<?> && o3 instanceof Cyclical<?>) {
@@ -436,5 +416,5 @@ public String toString(final @Nullable Event event, final boolean debug) {
 			s += " (comparator: " + comparator + ")";
 		return s;
 	}
-	
+
 }
diff --git a/src/main/java/ch/njol/skript/conditions/CondContains.java b/src/main/java/ch/njol/skript/conditions/CondContains.java
index 0c54c1be88d..366141ae0b3 100644
--- a/src/main/java/ch/njol/skript/conditions/CondContains.java
+++ b/src/main/java/ch/njol/skript/conditions/CondContains.java
@@ -1,26 +1,9 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.conditions;
 
 import ch.njol.skript.Skript;
 import ch.njol.skript.SkriptConfig;
 import ch.njol.skript.aliases.ItemType;
+import ch.njol.skript.lang.util.common.AnyContains;
 import org.skriptlang.skript.lang.comparator.Relation;
 import ch.njol.skript.doc.Description;
 import ch.njol.skript.doc.Examples;
@@ -36,14 +19,16 @@
 import org.bukkit.event.Event;
 import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.ItemStack;
+import org.skriptlang.skript.lang.converter.Converters;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.Arrays;
 import java.util.Objects;
 
 @Name("Contains")
-@Description("Checks whether an inventory contains an item, a text contains another piece of text, " +
-		"or a list (e.g. {list variable::*} or 'drops') contains another object.")
+@Description("Checks whether an inventory contains an item, a text contains another piece of text, "
+	+ "a container contains something, "
+	+ "or a list (e.g. {list variable::*} or 'drops') contains another object.")
 @Examples({"block contains 20 cobblestone",
 		"player has 4 flint and 2 iron ingots",
 		"{list::*} contains 5"})
@@ -63,16 +48,13 @@ public class CondContains extends Condition {
 	 * The type of check to perform
 	 */
 	private enum CheckType {
-		STRING, INVENTORY, OBJECTS, UNKNOWN
+		STRING, INVENTORY, OBJECTS, UNKNOWN, CONTAINER
 	}
 
-	@SuppressWarnings("NotNullFieldNotInitialized")
 	private Expression<?> containers;
-	@SuppressWarnings("NotNullFieldNotInitialized")
 	private Expression<?> items;
 
 	private boolean explicitSingle;
-	@SuppressWarnings("NotNullFieldNotInitialized")
 	private CheckType checkType;
 
 	@Override
@@ -88,15 +70,15 @@ public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelaye
 			checkType = CheckType.UNKNOWN;
 		}
 
-		setNegated(matchedPattern % 2 == 1);
+		this.setNegated(matchedPattern % 2 == 1);
 		return true;
 	}
 
 	@Override
-	public boolean check(Event e) {
+	public boolean check(Event event) {
 		CheckType checkType = this.checkType;
 
-		Object[] containerValues = containers.getAll(e);
+		Object[] containerValues = containers.getAll(event);
 
 		if (containerValues.length == 0)
 			return isNegated();
@@ -106,6 +88,11 @@ public boolean check(Event e) {
 			if (Arrays.stream(containerValues)
 				.allMatch(Inventory.class::isInstance)) {
 				checkType = CheckType.INVENTORY;
+			} else if (explicitSingle
+				&& Arrays.stream(containerValues)
+				.allMatch(object -> object instanceof AnyContains<?>
+					|| Converters.converterExists(object.getClass(), AnyContains.class))) {
+				checkType = CheckType.CONTAINER;
 			} else if (explicitSingle
 				&& Arrays.stream(containerValues)
 				.allMatch(String.class::isInstance)) {
@@ -115,48 +102,60 @@ public boolean check(Event e) {
 			}
 		}
 
-		if (checkType == CheckType.INVENTORY) {
-			return SimpleExpression.check(containerValues, o -> {
+		return switch (checkType) {
+			case INVENTORY -> SimpleExpression.check(containerValues, o -> {
 				Inventory inventory = (Inventory) o;
 
-				return items.check(e, o1 -> {
-					if (o1 instanceof ItemType)
-						return ((ItemType) o1).isContainedIn(inventory);
-					else if (o1 instanceof ItemStack)
-						return inventory.containsAtLeast((ItemStack) o1, ((ItemStack) o1).getAmount());
-					else if (o1 instanceof Inventory)
+				return items.check(event, o1 -> {
+					if (o1 instanceof ItemType type) {
+						return type.isContainedIn(inventory);
+					} else if (o1 instanceof ItemStack stack) {
+						return inventory.containsAtLeast(stack, stack.getAmount());
+					} else if (o1 instanceof Inventory) {
 						return Objects.equals(inventory, o1);
-					else
-						return false;
-				});
-			}, isNegated(), containers.getAnd());
-		} else if (checkType == CheckType.STRING) {
-			boolean caseSensitive = SkriptConfig.caseSensitive.value();
-
-			return SimpleExpression.check(containerValues, o -> {
-				String string = (String) o;
-
-				return items.check(e, o1 -> {
-					if (o1 instanceof String) {
-						return StringUtils.contains(string, (String) o1, caseSensitive);
-					} else {
-						return false;
 					}
+					return false;
 				});
 			}, isNegated(), containers.getAnd());
-		} else {
-			assert checkType == CheckType.OBJECTS;
-
-			return items.check(e, o1 -> {
-				for (Object o2 : containerValues) {
-					if (Comparators.compare(o1, o2) == Relation.EQUAL)
-						return true;
+			case STRING -> {
+				boolean caseSensitive = SkriptConfig.caseSensitive.value();
+
+				yield SimpleExpression.check(containerValues, o -> {
+					String string = (String) o;
+
+					return items.check(event, o1 -> {
+						if (o1 instanceof String text) {
+							return StringUtils.contains(string, text, caseSensitive);
+						} else {
+							return false;
+						}
+					});
+				}, isNegated(), containers.getAnd());
+			}
+			case CONTAINER -> SimpleExpression.check(containerValues, object -> {
+				AnyContains container;
+				if (object instanceof AnyContains<?>) {
+					container = (AnyContains) object;
+				} else {
+					container = Converters.convert(object, AnyContains.class);
 				}
-				return false;
-			}, isNegated());
-		}
+				if (container == null)
+					return false;
+				return items.check(event, container::checkSafely);
+			}, isNegated(), containers.getAnd());
+			default -> {
+				assert checkType == CheckType.OBJECTS;
+				yield items.check(event, o1 -> {
+					for (Object o2 : containerValues) {
+						if (Comparators.compare(o1, o2) == Relation.EQUAL)
+							return true;
+					}
+					return false;
+				}, isNegated());
+			}
+		};
 	}
-	
+
 	@Override
 	public String toString(@Nullable Event e, boolean debug) {
 		return containers.toString(e, debug) + (isNegated() ? " doesn't contain " : " contains ") + items.toString(e, debug);
diff --git a/src/main/java/ch/njol/skript/conditions/CondDamageCause.java b/src/main/java/ch/njol/skript/conditions/CondDamageCause.java
index 59c6421af77..53cda6b0c00 100644
--- a/src/main/java/ch/njol/skript/conditions/CondDamageCause.java
+++ b/src/main/java/ch/njol/skript/conditions/CondDamageCause.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.conditions;
 
 import org.bukkit.event.Event;
diff --git a/src/main/java/ch/njol/skript/conditions/CondDate.java b/src/main/java/ch/njol/skript/conditions/CondDate.java
index ba2da40b81b..392c8423301 100644
--- a/src/main/java/ch/njol/skript/conditions/CondDate.java
+++ b/src/main/java/ch/njol/skript/conditions/CondDate.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.conditions;
 
 import org.bukkit.event.Event;
@@ -73,7 +55,7 @@ public boolean check(final Event e) {
 		final long now = System.currentTimeMillis();
 		return date.check(e,
 				date -> delta.check(e,
-						timespan -> now - date.getTimestamp() >= timespan.getMilliSeconds()
+						timespan -> now - date.getTime() >= timespan.getAs(Timespan.TimePeriod.MILLISECOND)
 				), isNegated());
 	}
 	
diff --git a/src/main/java/ch/njol/skript/conditions/CondElytraBoostConsume.java b/src/main/java/ch/njol/skript/conditions/CondElytraBoostConsume.java
new file mode 100644
index 00000000000..f1a323df168
--- /dev/null
+++ b/src/main/java/ch/njol/skript/conditions/CondElytraBoostConsume.java
@@ -0,0 +1,56 @@
+package ch.njol.skript.conditions;
+
+import ch.njol.skript.Skript;
+import ch.njol.skript.doc.*;
+import ch.njol.skript.lang.Condition;
+import ch.njol.skript.lang.Expression;
+import ch.njol.skript.lang.SkriptParser.ParseResult;
+import ch.njol.util.Kleenean;
+import com.destroystokyo.paper.event.player.PlayerElytraBoostEvent;
+import org.bukkit.event.Event;
+import org.jetbrains.annotations.Nullable;
+
+@Name("Will Consume Boosting Firework")
+@Description("Checks to see if the firework used in an 'elytra boost' event will be consumed.")
+@Examples({
+	"on elytra boost:",
+		"\tif the used firework will be consumed:",
+			"\t\tprevent the used firework from being consume"
+})
+@RequiredPlugins("Paper")
+@Since("2.10")
+public class CondElytraBoostConsume extends Condition {
+
+	static {
+		if (Skript.classExists("com.destroystokyo.paper.event.player.PlayerElytraBoostEvent")) {
+			Skript.registerCondition(CondElytraBoostConsume.class,
+				"[the] (boosting|used) firework will be consumed",
+				"[the] (boosting|used) firework (will not|won't) be consumed");
+		}
+	}
+
+	private boolean checkConsume;
+
+	@Override
+	public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelayed, ParseResult parseResult) {
+		if (!getParser().isCurrentEvent(PlayerElytraBoostEvent.class)) {
+			Skript.error("This condition can only be used in an 'elytra boost' event.");
+			return false;
+		}
+		checkConsume = matchedPattern == 0;
+		return true;
+	}
+
+	@Override
+	public boolean check(Event event) {
+		if (!(event instanceof PlayerElytraBoostEvent boostEvent))
+			return false;
+		return boostEvent.shouldConsume() == checkConsume;
+	}
+
+	@Override
+	public String toString(@Nullable Event event, boolean debug) {
+		return "the boosting firework will " + (checkConsume ? "" : "not") + " be consumed";
+	}
+
+}
diff --git a/src/main/java/ch/njol/skript/conditions/CondEntityIsInLiquid.java b/src/main/java/ch/njol/skript/conditions/CondEntityIsInLiquid.java
index c2f838e148c..d470d0b14e8 100644
--- a/src/main/java/ch/njol/skript/conditions/CondEntityIsInLiquid.java
+++ b/src/main/java/ch/njol/skript/conditions/CondEntityIsInLiquid.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.conditions;
 
 import ch.njol.skript.Skript;
diff --git a/src/main/java/ch/njol/skript/conditions/CondEntityIsWet.java b/src/main/java/ch/njol/skript/conditions/CondEntityIsWet.java
index e013696582b..4b1dd579236 100644
--- a/src/main/java/ch/njol/skript/conditions/CondEntityIsWet.java
+++ b/src/main/java/ch/njol/skript/conditions/CondEntityIsWet.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.conditions;
 
 import ch.njol.skript.Skript;
diff --git a/src/main/java/ch/njol/skript/conditions/CondFromMobSpawner.java b/src/main/java/ch/njol/skript/conditions/CondFromMobSpawner.java
new file mode 100644
index 00000000000..230ee39f83b
--- /dev/null
+++ b/src/main/java/ch/njol/skript/conditions/CondFromMobSpawner.java
@@ -0,0 +1,45 @@
+package ch.njol.skript.conditions;
+
+import ch.njol.skript.Skript;
+import ch.njol.skript.conditions.base.PropertyCondition;
+import ch.njol.skript.doc.*;
+import ch.njol.skript.lang.Expression;
+import ch.njol.skript.lang.SkriptParser.ParseResult;
+import ch.njol.util.Kleenean;
+import org.bukkit.entity.Entity;
+
+@Name("Is From A Mob Spawner")
+@Description("Checks if an entity was spawned from a mob spawner.")
+@Examples("send whether target is from a mob spawner")
+@RequiredPlugins("PaperMC")
+@Since("2.10")
+public class CondFromMobSpawner extends PropertyCondition<Entity> {
+
+	static {
+		if (Skript.methodExists(Entity.class, "fromMobSpawner"))
+			Skript.registerCondition(CondFromMobSpawner.class,
+				"%entities% (is|are) from a [mob] spawner",
+				"%entities% (isn't|aren't|is not|are not) from a [mob] spawner",
+				"%entities% (was|were) spawned (from|by) a [mob] spawner",
+				"%entities% (wasn't|weren't|was not|were not) spawned (from|by) a [mob] spawner");
+	}
+
+	@Override
+	public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelayed, ParseResult parseResult) {
+		setNegated(matchedPattern == 1 || matchedPattern == 3);
+		setExpr((Expression<Entity>) exprs[0]);
+		return true;
+	}
+
+	@Override
+	public boolean check(Entity entity) {
+		return entity.fromMobSpawner();
+	}
+
+	@Override
+	protected String getPropertyName() {
+		return "from a mob spawner";
+	}
+
+}
+
diff --git a/src/main/java/ch/njol/skript/conditions/CondGlowingText.java b/src/main/java/ch/njol/skript/conditions/CondGlowingText.java
index aaf14939305..f7d42248377 100644
--- a/src/main/java/ch/njol/skript/conditions/CondGlowingText.java
+++ b/src/main/java/ch/njol/skript/conditions/CondGlowingText.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.conditions;
 
 import ch.njol.skript.Skript;
diff --git a/src/main/java/ch/njol/skript/conditions/CondHasClientWeather.java b/src/main/java/ch/njol/skript/conditions/CondHasClientWeather.java
index e9284a38807..0719ebf94ac 100755
--- a/src/main/java/ch/njol/skript/conditions/CondHasClientWeather.java
+++ b/src/main/java/ch/njol/skript/conditions/CondHasClientWeather.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.conditions;
 
 import org.bukkit.entity.Player;
diff --git a/src/main/java/ch/njol/skript/conditions/CondHasCustomModelData.java b/src/main/java/ch/njol/skript/conditions/CondHasCustomModelData.java
index 98f86424826..66621f9e91b 100644
--- a/src/main/java/ch/njol/skript/conditions/CondHasCustomModelData.java
+++ b/src/main/java/ch/njol/skript/conditions/CondHasCustomModelData.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.conditions;
 
 import org.bukkit.inventory.meta.ItemMeta;
diff --git a/src/main/java/ch/njol/skript/conditions/CondHasItemCooldown.java b/src/main/java/ch/njol/skript/conditions/CondHasItemCooldown.java
index 9e1d1fcf4db..dd67a64d6fc 100644
--- a/src/main/java/ch/njol/skript/conditions/CondHasItemCooldown.java
+++ b/src/main/java/ch/njol/skript/conditions/CondHasItemCooldown.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.conditions;
 
 import ch.njol.skript.Skript;
diff --git a/src/main/java/ch/njol/skript/conditions/CondHasLineOfSight.java b/src/main/java/ch/njol/skript/conditions/CondHasLineOfSight.java
index 706fa4f8629..b5e8dae5571 100644
--- a/src/main/java/ch/njol/skript/conditions/CondHasLineOfSight.java
+++ b/src/main/java/ch/njol/skript/conditions/CondHasLineOfSight.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.conditions;
 
 import ch.njol.skript.Skript;
diff --git a/src/main/java/ch/njol/skript/conditions/CondHasMetadata.java b/src/main/java/ch/njol/skript/conditions/CondHasMetadata.java
index 876a74249f8..cfb60086fd5 100644
--- a/src/main/java/ch/njol/skript/conditions/CondHasMetadata.java
+++ b/src/main/java/ch/njol/skript/conditions/CondHasMetadata.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.conditions;
 
 import ch.njol.skript.Skript;
diff --git a/src/main/java/ch/njol/skript/conditions/CondHasPotion.java b/src/main/java/ch/njol/skript/conditions/CondHasPotion.java
index 41aa7fa55c8..b71b6298d27 100644
--- a/src/main/java/ch/njol/skript/conditions/CondHasPotion.java
+++ b/src/main/java/ch/njol/skript/conditions/CondHasPotion.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.conditions;
 
 import ch.njol.skript.Skript;
diff --git a/src/main/java/ch/njol/skript/conditions/CondHasResourcePack.java b/src/main/java/ch/njol/skript/conditions/CondHasResourcePack.java
index 3d0eda99ef0..1b944f97134 100644
--- a/src/main/java/ch/njol/skript/conditions/CondHasResourcePack.java
+++ b/src/main/java/ch/njol/skript/conditions/CondHasResourcePack.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.conditions;
 
 import org.bukkit.entity.Player;
diff --git a/src/main/java/ch/njol/skript/conditions/CondHasScoreboardTag.java b/src/main/java/ch/njol/skript/conditions/CondHasScoreboardTag.java
index 0fe7942cf62..db7ffd61df4 100644
--- a/src/main/java/ch/njol/skript/conditions/CondHasScoreboardTag.java
+++ b/src/main/java/ch/njol/skript/conditions/CondHasScoreboardTag.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.conditions;
 
 import java.util.Arrays;
diff --git a/src/main/java/ch/njol/skript/conditions/CondIgnitionProcess.java b/src/main/java/ch/njol/skript/conditions/CondIgnitionProcess.java
index e0d0f1849c9..f59bc77a819 100644
--- a/src/main/java/ch/njol/skript/conditions/CondIgnitionProcess.java
+++ b/src/main/java/ch/njol/skript/conditions/CondIgnitionProcess.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.conditions;
 
 import org.bukkit.entity.Creeper;
diff --git a/src/main/java/ch/njol/skript/conditions/CondIncendiary.java b/src/main/java/ch/njol/skript/conditions/CondIncendiary.java
index a4d47b012ac..5ee20c07cec 100644
--- a/src/main/java/ch/njol/skript/conditions/CondIncendiary.java
+++ b/src/main/java/ch/njol/skript/conditions/CondIncendiary.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.conditions;
 
 import org.bukkit.entity.Entity;
diff --git a/src/main/java/ch/njol/skript/conditions/CondIsAlive.java b/src/main/java/ch/njol/skript/conditions/CondIsAlive.java
index 714b0ae5953..5026d5199ab 100644
--- a/src/main/java/ch/njol/skript/conditions/CondIsAlive.java
+++ b/src/main/java/ch/njol/skript/conditions/CondIsAlive.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.conditions;
 
 import org.bukkit.entity.Entity;
diff --git a/src/main/java/ch/njol/skript/conditions/CondIsBanned.java b/src/main/java/ch/njol/skript/conditions/CondIsBanned.java
index 212da063416..37fc818c2ac 100644
--- a/src/main/java/ch/njol/skript/conditions/CondIsBanned.java
+++ b/src/main/java/ch/njol/skript/conditions/CondIsBanned.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.conditions;
 
 import java.net.InetSocketAddress;
diff --git a/src/main/java/ch/njol/skript/conditions/CondIsBlock.java b/src/main/java/ch/njol/skript/conditions/CondIsBlock.java
index efafb2583b7..ee4035336b4 100644
--- a/src/main/java/ch/njol/skript/conditions/CondIsBlock.java
+++ b/src/main/java/ch/njol/skript/conditions/CondIsBlock.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.conditions;
 
 import ch.njol.skript.aliases.ItemType;
diff --git a/src/main/java/ch/njol/skript/conditions/CondIsBlockRedstonePowered.java b/src/main/java/ch/njol/skript/conditions/CondIsBlockRedstonePowered.java
index b7ec7be8027..86cba581c0e 100644
--- a/src/main/java/ch/njol/skript/conditions/CondIsBlockRedstonePowered.java
+++ b/src/main/java/ch/njol/skript/conditions/CondIsBlockRedstonePowered.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.conditions;
 
 import org.bukkit.block.Block;
diff --git a/src/main/java/ch/njol/skript/conditions/CondIsBlocking.java b/src/main/java/ch/njol/skript/conditions/CondIsBlocking.java
index 6d81a2633a6..684c3c38370 100644
--- a/src/main/java/ch/njol/skript/conditions/CondIsBlocking.java
+++ b/src/main/java/ch/njol/skript/conditions/CondIsBlocking.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.conditions;
 
 import org.bukkit.entity.Player;
diff --git a/src/main/java/ch/njol/skript/conditions/CondIsBurning.java b/src/main/java/ch/njol/skript/conditions/CondIsBurning.java
index b1b42efa5e0..f2e7838edf8 100644
--- a/src/main/java/ch/njol/skript/conditions/CondIsBurning.java
+++ b/src/main/java/ch/njol/skript/conditions/CondIsBurning.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.conditions;
 
 import org.bukkit.entity.Entity;
diff --git a/src/main/java/ch/njol/skript/conditions/CondIsCharged.java b/src/main/java/ch/njol/skript/conditions/CondIsCharged.java
index cf5992ef89b..f6c80e959b6 100644
--- a/src/main/java/ch/njol/skript/conditions/CondIsCharged.java
+++ b/src/main/java/ch/njol/skript/conditions/CondIsCharged.java
@@ -1,53 +1,41 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.conditions;
 
-import org.bukkit.entity.Creeper;
-import org.bukkit.entity.LivingEntity;
-
 import ch.njol.skript.conditions.base.PropertyCondition;
 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 org.bukkit.entity.Creeper;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.Wither;
+import org.bukkit.entity.WitherSkull;
 
 @Name("Is Charged")
-@Description("Checks if a creeper is charged (powered).")
+@Description("Checks if a creeper, wither, or wither skull is charged (powered).")
 @Examples({"if the last spawned creeper is charged:",
-			"\tbroadcast \"A charged creeper is at %location of last spawned creeper%\""})
-@Since("2.5")
-public class CondIsCharged extends PropertyCondition<LivingEntity> {
-	
+	"\tbroadcast \"A charged creeper is at %location of last spawned creeper%\""})
+@Since("2.5, 2.10 (withers, wither skulls)")
+public class CondIsCharged extends PropertyCondition<Entity> {
+
 	static {
-		register(CondIsCharged.class, "(charged|powered)", "livingentities");
+		register(CondIsCharged.class, "(charged|powered)", "entities");
 	}
-	
+
 	@Override
-	public boolean check(final LivingEntity e) {
-		if (e instanceof Creeper)
-			return ((Creeper) e).isPowered();
+	public boolean check(Entity entity) {
+		if (entity instanceof Creeper creeper) {
+			return creeper.isPowered();
+		} else if (entity instanceof WitherSkull witherSkull) {
+			return witherSkull.isCharged();
+		} else if (entity instanceof Wither wither) {
+			return wither.isCharged();
+		}
 		return false;
 	}
-	
+
 	@Override
 	protected String getPropertyName() {
 		return "charged";
 	}
-	
+
 }
diff --git a/src/main/java/ch/njol/skript/conditions/CondIsClimbing.java b/src/main/java/ch/njol/skript/conditions/CondIsClimbing.java
index 48cdfe5eb40..0acb7ffeeba 100644
--- a/src/main/java/ch/njol/skript/conditions/CondIsClimbing.java
+++ b/src/main/java/ch/njol/skript/conditions/CondIsClimbing.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.conditions;
 
 import org.bukkit.entity.LivingEntity;
diff --git a/src/main/java/ch/njol/skript/conditions/CondIsCommandBlockConditional.java b/src/main/java/ch/njol/skript/conditions/CondIsCommandBlockConditional.java
new file mode 100644
index 00000000000..9e25d424bc4
--- /dev/null
+++ b/src/main/java/ch/njol/skript/conditions/CondIsCommandBlockConditional.java
@@ -0,0 +1,49 @@
+package ch.njol.skript.conditions;
+
+import ch.njol.skript.conditions.base.PropertyCondition;
+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.SkriptParser.ParseResult;
+import ch.njol.util.Kleenean;
+import org.bukkit.block.Block;
+import org.bukkit.block.data.type.CommandBlock;
+
+@Name("Is Conditional")
+@Description(
+	"Checks whether a command block is conditional or not."
+)
+@Examples({
+	"if {_block} is conditional:",
+		"\tmake {_block} unconditional"
+})
+@Since("2.10")
+public class CondIsCommandBlockConditional extends PropertyCondition<Block> {
+
+	static {
+		register(CondIsCommandBlockConditional.class, "[:un]conditional", "blocks");
+	}
+
+	@Override
+	@SuppressWarnings("unchecked")
+	public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelayed, ParseResult parseResult) {
+		setExpr((Expression<Block>) exprs[0]);
+		setNegated(parseResult.hasTag("un") ^ matchedPattern == 1);
+		return true;
+	}
+
+	@Override
+	public boolean check(Block block) {
+		if (block.getBlockData() instanceof CommandBlock cmdBlock)
+			return cmdBlock.isConditional();
+		return false;
+	}
+
+	@Override
+	protected String getPropertyName() {
+		return "conditional";
+	}
+
+}
diff --git a/src/main/java/ch/njol/skript/conditions/CondIsCustomNameVisible.java b/src/main/java/ch/njol/skript/conditions/CondIsCustomNameVisible.java
new file mode 100644
index 00000000000..8446816ab51
--- /dev/null
+++ b/src/main/java/ch/njol/skript/conditions/CondIsCustomNameVisible.java
@@ -0,0 +1,46 @@
+package ch.njol.skript.conditions;
+
+import ch.njol.skript.Skript;
+import ch.njol.skript.conditions.base.PropertyCondition;
+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.SkriptParser.ParseResult;
+import ch.njol.util.Kleenean;
+import org.bukkit.entity.Entity;
+
+@Name("Is Custom Name Visible")
+@Description("Checks if an entity's custom name is visible.")
+@Examples("send true if target's custom name is visible")
+@Since("2.10")
+public class CondIsCustomNameVisible extends PropertyCondition<Entity> {
+
+	static {
+		Skript.registerCondition(CondIsCustomNameVisible.class,
+			"%entities%'[s] custom name[s] (is|are) visible",
+			"%entities%'[s] custom name[s] (isn't|is not|are not|aren't) visible",
+			"custom name of %entities% (is|are) visible",
+			"custom name of %entities% (isn't|is not|are not|aren't) visible");
+	}
+
+	@Override
+	public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelayed, ParseResult parseResult) {
+		setNegated(matchedPattern == 1 || matchedPattern == 3);
+		setExpr((Expression<Entity>) exprs[0]);
+		return true;
+	}
+
+	@Override
+	public boolean check(Entity entity) {
+		return entity.isCustomNameVisible();
+	}
+
+	@Override
+	protected String getPropertyName() {
+		return "custom name";
+	}
+
+}
+
diff --git a/src/main/java/ch/njol/skript/conditions/CondIsDivisibleBy.java b/src/main/java/ch/njol/skript/conditions/CondIsDivisibleBy.java
new file mode 100644
index 00000000000..68ac4999fb3
--- /dev/null
+++ b/src/main/java/ch/njol/skript/conditions/CondIsDivisibleBy.java
@@ -0,0 +1,59 @@
+package ch.njol.skript.conditions;
+
+import ch.njol.skript.Skript;
+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.Condition;
+import ch.njol.skript.lang.Expression;
+import ch.njol.skript.lang.SkriptParser.ParseResult;
+import ch.njol.util.Kleenean;
+import org.bukkit.event.Event;
+import org.jetbrains.annotations.Nullable;
+
+@Name("Is Evenly Divisible By")
+@Description("Check if a number is evenly divisible by another number.")
+@Examples({
+	"if 5 is evenly divisible by 5:",
+	"if 11 cannot be evenly divided by 10:",
+})
+@Since("2.10")
+public class CondIsDivisibleBy extends Condition {
+
+	static {
+		Skript.registerCondition(CondIsDivisibleBy.class,
+			"%numbers% (is|are) evenly divisible by %number%",
+			"%numbers% (isn't|is not|aren't|are not) evenly divisible by %number%",
+			"%numbers% can be evenly divided by %number%",
+			"%numbers% (can't|can[ ]not) be evenly divided by %number%");
+	}
+	@SuppressWarnings("null")
+	private Expression<Number> dividend;
+	@SuppressWarnings("null")
+	private Expression<Number> divisor;
+
+	@Override
+	public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelayed, ParseResult parseResult) {
+		dividend = (Expression<Number>) exprs[0];
+		divisor = (Expression<Number>) exprs[1];
+		setNegated(matchedPattern == 1 || matchedPattern == 3);
+		return true;
+	}
+
+	@Override
+	public boolean check(Event event) {
+		Number divisorNumber = divisor.getSingle(event);
+		if (divisorNumber == null)
+			return isNegated();
+		double divisor = divisorNumber.doubleValue();
+		return dividend.check(event, dividendNumber -> (dividendNumber.doubleValue() % divisor == 0), isNegated());
+	}
+
+	@Override
+	public String toString(@Nullable Event event, boolean debug) {
+		return dividend.toString(event, debug) + " is " + (isNegated() ? "not " : "")
+			+ "evenly divisible by " + divisor.toString(event, debug);
+	}
+
+}
diff --git a/src/main/java/ch/njol/skript/conditions/CondIsEdible.java b/src/main/java/ch/njol/skript/conditions/CondIsEdible.java
index 8545da529f9..d386c321a0f 100644
--- a/src/main/java/ch/njol/skript/conditions/CondIsEdible.java
+++ b/src/main/java/ch/njol/skript/conditions/CondIsEdible.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.conditions;
 
 import ch.njol.skript.aliases.ItemType;
diff --git a/src/main/java/ch/njol/skript/conditions/CondIsEmpty.java b/src/main/java/ch/njol/skript/conditions/CondIsEmpty.java
index 972f38ed5d3..c8774e8316b 100644
--- a/src/main/java/ch/njol/skript/conditions/CondIsEmpty.java
+++ b/src/main/java/ch/njol/skript/conditions/CondIsEmpty.java
@@ -1,70 +1,54 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.conditions;
 
-import org.bukkit.Material;
-import org.bukkit.inventory.Inventory;
-import org.bukkit.inventory.ItemStack;
-
 import ch.njol.skript.conditions.base.PropertyCondition;
 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.util.common.AnyAmount;
 import ch.njol.skript.util.slot.Slot;
+import org.bukkit.Material;
+import org.bukkit.inventory.Inventory;
+import org.bukkit.inventory.ItemStack;
+import org.skriptlang.skript.lang.util.SkriptQueue;
 
-/**
- * @author Peter Güttinger
- */
 @Name("Is Empty")
-@Description("Checks whether an inventory, an inventory slot, or a text is empty.")
+@Description("Checks whether an inventory, an inventory slot, a queue, or a text is empty.")
 @Examples("player's inventory is empty")
 @Since("<i>unknown</i> (before 2.1)")
 public class CondIsEmpty extends PropertyCondition<Object> {
-	
+
 	static {
-		register(CondIsEmpty.class, "empty", "inventories/slots/strings");
+		register(CondIsEmpty.class, "empty", "inventories/slots/strings/numbered");
 	}
-	
+
 	@Override
-	public boolean check(final Object o) {
-		if (o instanceof String)
-			return ((String) o).isEmpty();
-		if (o instanceof Inventory) {
-			for (ItemStack s : ((Inventory) o).getContents()) {
+	public boolean check(final Object object) {
+		if (object instanceof String string)
+			return string.isEmpty();
+		if (object instanceof SkriptQueue queue)
+			return queue.isEmpty();
+		if (object instanceof Inventory) {
+			for (ItemStack s : ((Inventory) object).getContents()) {
 				if (s != null && s.getType() != Material.AIR)
 					return false; // There is an item here!
 			}
 			return true;
 		}
-		if (o instanceof Slot) {
-			final Slot s = (Slot) o;
-			final ItemStack i = s.getItem();
-			return i == null || i.getType() == Material.AIR;
+		if (object instanceof Slot slot) {
+			final ItemStack item = slot.getItem();
+			return item == null || item.getType() == Material.AIR;
+		}
+		if (object instanceof AnyAmount numbered) {
+			return numbered.isEmpty();
 		}
 		assert false;
 		return false;
 	}
-	
+
 	@Override
 	protected String getPropertyName() {
 		return "empty";
 	}
-	
+
 }
diff --git a/src/main/java/ch/njol/skript/conditions/CondIsEnchanted.java b/src/main/java/ch/njol/skript/conditions/CondIsEnchanted.java
index b3fd13273f4..d0068b6c518 100644
--- a/src/main/java/ch/njol/skript/conditions/CondIsEnchanted.java
+++ b/src/main/java/ch/njol/skript/conditions/CondIsEnchanted.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.conditions;
 
 import org.bukkit.event.Event;
diff --git a/src/main/java/ch/njol/skript/conditions/CondIsFireResistant.java b/src/main/java/ch/njol/skript/conditions/CondIsFireResistant.java
index e52d8f08992..da0768b35d3 100644
--- a/src/main/java/ch/njol/skript/conditions/CondIsFireResistant.java
+++ b/src/main/java/ch/njol/skript/conditions/CondIsFireResistant.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.conditions;
 
 import ch.njol.skript.Skript;
diff --git a/src/main/java/ch/njol/skript/conditions/CondIsFlammable.java b/src/main/java/ch/njol/skript/conditions/CondIsFlammable.java
index aafc79a6900..778a37c7dee 100644
--- a/src/main/java/ch/njol/skript/conditions/CondIsFlammable.java
+++ b/src/main/java/ch/njol/skript/conditions/CondIsFlammable.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.conditions;
 
 import ch.njol.skript.aliases.ItemType;
diff --git a/src/main/java/ch/njol/skript/conditions/CondIsFlying.java b/src/main/java/ch/njol/skript/conditions/CondIsFlying.java
index d917ac4f612..bc1d831dba7 100644
--- a/src/main/java/ch/njol/skript/conditions/CondIsFlying.java
+++ b/src/main/java/ch/njol/skript/conditions/CondIsFlying.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.conditions;
 
 import org.bukkit.entity.Player;
diff --git a/src/main/java/ch/njol/skript/conditions/CondIsFrozen.java b/src/main/java/ch/njol/skript/conditions/CondIsFrozen.java
index d32cef4ec4e..ed5a511d875 100644
--- a/src/main/java/ch/njol/skript/conditions/CondIsFrozen.java
+++ b/src/main/java/ch/njol/skript/conditions/CondIsFrozen.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.conditions;
 
 import ch.njol.skript.Skript;
diff --git a/src/main/java/ch/njol/skript/conditions/CondIsFuel.java b/src/main/java/ch/njol/skript/conditions/CondIsFuel.java
index fd921af54a4..07f8ed9df1f 100644
--- a/src/main/java/ch/njol/skript/conditions/CondIsFuel.java
+++ b/src/main/java/ch/njol/skript/conditions/CondIsFuel.java
@@ -1,22 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.conditions;
 
 import org.bukkit.Material;
diff --git a/src/main/java/ch/njol/skript/conditions/CondIsGliding.java b/src/main/java/ch/njol/skript/conditions/CondIsGliding.java
index 36dc35f6dae..d5224690bdd 100644
--- a/src/main/java/ch/njol/skript/conditions/CondIsGliding.java
+++ b/src/main/java/ch/njol/skript/conditions/CondIsGliding.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.conditions;
 
 import ch.njol.skript.doc.Description;
diff --git a/src/main/java/ch/njol/skript/conditions/CondIsHandRaised.java b/src/main/java/ch/njol/skript/conditions/CondIsHandRaised.java
index 7a6686171fc..cc9d617f08b 100644
--- a/src/main/java/ch/njol/skript/conditions/CondIsHandRaised.java
+++ b/src/main/java/ch/njol/skript/conditions/CondIsHandRaised.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.conditions;
 
 import ch.njol.skript.Skript;
diff --git a/src/main/java/ch/njol/skript/conditions/CondIsInfinite.java b/src/main/java/ch/njol/skript/conditions/CondIsInfinite.java
index 725480bac1b..ceea3976c7d 100644
--- a/src/main/java/ch/njol/skript/conditions/CondIsInfinite.java
+++ b/src/main/java/ch/njol/skript/conditions/CondIsInfinite.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.conditions;
 
 import org.bukkit.potion.PotionEffect;
diff --git a/src/main/java/ch/njol/skript/conditions/CondIsInteractable.java b/src/main/java/ch/njol/skript/conditions/CondIsInteractable.java
index 4cc58208a2f..d699204c024 100644
--- a/src/main/java/ch/njol/skript/conditions/CondIsInteractable.java
+++ b/src/main/java/ch/njol/skript/conditions/CondIsInteractable.java
@@ -1,22 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.conditions;
 
 import org.bukkit.Material;
diff --git a/src/main/java/ch/njol/skript/conditions/CondIsInvisible.java b/src/main/java/ch/njol/skript/conditions/CondIsInvisible.java
index baa1fec0492..a839313e34d 100644
--- a/src/main/java/ch/njol/skript/conditions/CondIsInvisible.java
+++ b/src/main/java/ch/njol/skript/conditions/CondIsInvisible.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.conditions;
 
 import ch.njol.skript.Skript;
diff --git a/src/main/java/ch/njol/skript/conditions/CondIsInvulnerable.java b/src/main/java/ch/njol/skript/conditions/CondIsInvulnerable.java
index 5fa5be0c106..b788dc689ac 100644
--- a/src/main/java/ch/njol/skript/conditions/CondIsInvulnerable.java
+++ b/src/main/java/ch/njol/skript/conditions/CondIsInvulnerable.java
@@ -1,44 +1,38 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.conditions;
 
+import ch.njol.skript.Skript;
+import ch.njol.skript.doc.*;
+import org.bukkit.GameMode;
 import org.bukkit.entity.Entity;
 
 import ch.njol.skript.conditions.base.PropertyCondition;
-import ch.njol.skript.doc.Description;
-import ch.njol.skript.doc.Examples;
-import ch.njol.skript.doc.Name;
-import ch.njol.skript.doc.Since;
 
 @Name("Is Invulnerable")
-@Description("Checks whether an entity is invulnerable.")
-@Examples("target entity is invulnerable")
-@Since("2.5")
-public class CondIsInvulnerable extends PropertyCondition<Entity> {
+@Description("Checks whether an entity or a gamemode is invulnerable.\nFor gamemodes, Paper and Minecraft 1.20.6 are required")
+@Examples({
+	"target entity is invulnerable",
+	"",
+	"loop all gamemodes:",
+		"\tif loop-value is not invulnerable:",
+			"\t\tbroadcast \"the gamemode %loop-value% is vulnerable!\""
+})
+@Since("2.5, 2.10 (gamemode)")
+@RequiredPlugins("Paper 1.20.6+ (gamemodes)")
+public class CondIsInvulnerable extends PropertyCondition<Object> {
+	private static final boolean SUPPORTS_GAMEMODE = Skript.methodExists(GameMode.class, "isInvulnerable");
 	
 	static {
-		register(CondIsInvulnerable.class, PropertyType.BE, "(invulnerable|invincible)", "entities");
+		register(CondIsInvulnerable.class, PropertyType.BE, "(invulnerable|invincible)", "entities" + (SUPPORTS_GAMEMODE ? "/gamemodes" : ""));
 	}
 	
 	@Override
-	public boolean check(Entity entity) {
-		return entity.isInvulnerable();
+	public boolean check(Object object) {
+		if (object instanceof Entity) {
+			return ((Entity) object).isInvulnerable();
+		} else if (SUPPORTS_GAMEMODE && object instanceof GameMode) {
+			return ((GameMode) object).isInvulnerable();
+		}
+		return false;
 	}
 	
 	@Override
diff --git a/src/main/java/ch/njol/skript/conditions/CondIsJumping.java b/src/main/java/ch/njol/skript/conditions/CondIsJumping.java
index fb3738a05c6..41b766e9f59 100644
--- a/src/main/java/ch/njol/skript/conditions/CondIsJumping.java
+++ b/src/main/java/ch/njol/skript/conditions/CondIsJumping.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.conditions;
 
 import ch.njol.skript.conditions.base.PropertyCondition;
diff --git a/src/main/java/ch/njol/skript/conditions/CondIsLeftHanded.java b/src/main/java/ch/njol/skript/conditions/CondIsLeftHanded.java
index 7101ad18b92..178a7b75425 100644
--- a/src/main/java/ch/njol/skript/conditions/CondIsLeftHanded.java
+++ b/src/main/java/ch/njol/skript/conditions/CondIsLeftHanded.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.conditions;
 
 import ch.njol.skript.Skript;
diff --git a/src/main/java/ch/njol/skript/conditions/CondIsLoaded.java b/src/main/java/ch/njol/skript/conditions/CondIsLoaded.java
index 79158467187..9a88b72a103 100644
--- a/src/main/java/ch/njol/skript/conditions/CondIsLoaded.java
+++ b/src/main/java/ch/njol/skript/conditions/CondIsLoaded.java
@@ -1,23 +1,6 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.conditions;
 
+import ch.njol.skript.ScriptLoader;
 import ch.njol.skript.Skript;
 import ch.njol.skript.doc.Description;
 import ch.njol.skript.doc.Examples;
@@ -34,74 +17,104 @@
 import org.bukkit.World;
 import org.bukkit.event.Event;
 import org.jetbrains.annotations.Nullable;
+import org.skriptlang.skript.lang.script.Script;
 
 @Name("Is Loaded")
-@Description("Checks whether or not a chunk/world is loaded. 'chunk at 1, 1' uses chunk coords, which are location coords divided by 16.")
+@Description({
+		"Checks whether a world, chunk or script is loaded.",
+		"'chunk at 1, 1' uses chunk coordinates, which are location coords divided by 16."
+})
 @Examples({"if chunk at {home::%player's uuid%} is loaded:",
 		"if chunk 1, 10 in world \"world\" is loaded:",
-		"if world(\"lobby\") is loaded:"})
-@Since("2.3, 2.5 (revamp with chunk at location/coords)")
+		"if world(\"lobby\") is loaded:",
+		"if script named \"MyScript.sk\" is loaded:"
+})
+@Since("2.3, 2.5 (revamp with chunk at location/coords), 2.10 (Scripts)")
+@SuppressWarnings("unchecked")
 public class CondIsLoaded extends Condition {
-	
+
 	static {
 		Skript.registerCondition(CondIsLoaded.class,
 			"chunk[s] %directions% [%locations%] (is|are)[(1¦(n't| not))] loaded",
 			"chunk [at] %number%, %number% (in|of) [world] %world% is[(1¦(n't| not))] loaded",
-			"[world[s]] %worlds% (is|are)[(1¦(n't| not))] loaded");
+			"%scripts/worlds% (is|are)[1:(n't| not)] loaded",
+			"script[s] %scripts% (is|are)[1:(n't| not)] loaded",
+			"world[s] %worlds% (is|are)[1:(n't| not)] loaded");
 	}
-	
-	@Nullable
+
 	private Expression<Location> locations;
-	@Nullable
-	private Expression<Number> x,z;
-	@Nullable
-	private Expression<World> world;
+	private Expression<Number> x, z;
+	private Expression<?> objects;
 	private int pattern;
-	
+
 	@Override
 	public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelayed, ParseResult parseResult) {
 		pattern = matchedPattern;
-		locations = pattern == 0 ? Direction.combine((Expression<? extends Direction>) exprs[0], (Expression<? extends Location>) exprs[1]) : null;
-		x = pattern == 1 ? (Expression<Number>) exprs[0] : null;
-		z = pattern == 1 ? (Expression<Number>) exprs[1] : null;
-		world = pattern == 1 ? (Expression<World>) exprs[2] : pattern == 2 ? (Expression<World>) exprs[0] : null;
-		setNegated(parseResult.mark == 1);
-		return true;
-	}
-	
-	@SuppressWarnings("null")
-	@Override
-	public boolean check(Event e) {
 		switch (pattern) {
 			case 0:
-				return locations.check(e, location -> {
-					World world = location.getWorld();
-					if (world != null)
-						return world.isChunkLoaded(location.getBlockX() >> 4, location.getBlockZ() >> 4);
-					return false;
-				}, isNegated());
+				locations = Direction.combine((Expression<? extends Direction>) exprs[0], (Expression<? extends Location>) exprs[1]);
+				break;
 			case 1:
-				return world.check(e, world -> {
-					Number x = this.x.getSingle(e);
-					Number z = this.z.getSingle(e);
-					if (x == null || z == null)
-						return false;
-					return world.isChunkLoaded(x.intValue(), z.intValue());
-				}, isNegated());
+				x = (Expression<Number>) exprs[0];
+				z = (Expression<Number>) exprs[1];
+				objects = exprs[2];
+				break;
 			case 2:
-				return world.check(e, world -> Bukkit.getWorld(world.getName()) != null, isNegated());
+			case 3:
+			case 4:
+				objects = exprs[0];
 		}
-		return false;
+		setNegated(parseResult.mark == 1);
+		return true;
 	}
-	
+
+	@Override
 	@SuppressWarnings("null")
+	public boolean check(Event e) {
+		return switch (pattern) {
+			case 0 -> locations.check(e, location -> {
+				World world = location.getWorld();
+				if (world != null)
+					return world.isChunkLoaded(location.getBlockX() >> 4, location.getBlockZ() >> 4);
+				return false;
+			}, isNegated());
+			case 1 -> objects.check(e, object -> {
+				if (!(object instanceof World world))
+					return false;
+				Number x = this.x.getSingle(e);
+				Number z = this.z.getSingle(e);
+				if (x == null || z == null)
+					return false;
+				return world.isChunkLoaded(x.intValue(), z.intValue());
+			}, isNegated());
+			case 2, 4 -> objects.check(e, object -> {
+				if (object instanceof World world) {
+					return Bukkit.getWorld(world.getName()) != null;
+				} else if (object instanceof Script script) {
+					return ScriptLoader.getLoadedScripts().contains(script);
+				}
+				return false;
+			}, isNegated());
+			case 3 -> objects.check(e, ScriptLoader.getLoadedScripts()::contains, isNegated());
+			default -> false;
+		};
+	}
+
 	@Override
+	@SuppressWarnings("null")
 	public String toString(@Nullable Event e, boolean d) {
 		String neg = isNegated() ? " not " : " ";
-		String chunk = pattern == 0 ? "chunk[s] at " + locations.toString(e, d) + (locations.isSingle() ? " is" : " are") + neg + "loaded" : "";
-		String chunkC = pattern == 1 ? "chunk (x:" + x.toString(e, d) + ",z:" + z.toString(e, d) + ",w:" + world.toString(e,d) + ") is" + neg + "loaded" : "";
-		String world = pattern == 2 ? "world[s] " + this.world.toString(e, d) + (this.world.isSingle() ? " is" : " are") + neg + "loaded" : "";
-		return chunk + chunkC + world;
+		return switch (pattern) {
+			case 0 ->
+				"chunk[s] at " + locations.toString(e, d) + (locations.isSingle() ? " is" : " are") + neg + "loaded";
+			case 1 ->
+				"chunk at " + x.toString(e, d) + ", " + z.toString(e, d) + " in " + objects.toString(e, d) + ") is" + neg + "loaded";
+			case 3 ->
+				"scripts " + this.objects.toString(e, d) + (this.objects.isSingle() ? " is" : " are") + neg + "loaded";
+			case 4 ->
+				"worlds " + this.objects.toString(e, d) + (this.objects.isSingle() ? " is" : " are") + neg + "loaded";
+			default -> this.objects.toString(e, d) + (this.objects.isSingle() ? " is" : " are") + neg + "loaded";
+		};
 	}
-	
+
 }
diff --git a/src/main/java/ch/njol/skript/conditions/CondIsOccluding.java b/src/main/java/ch/njol/skript/conditions/CondIsOccluding.java
index 9e0b04bc975..1367e183c4b 100644
--- a/src/main/java/ch/njol/skript/conditions/CondIsOccluding.java
+++ b/src/main/java/ch/njol/skript/conditions/CondIsOccluding.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.conditions;
 
 import ch.njol.skript.aliases.ItemType;
diff --git a/src/main/java/ch/njol/skript/conditions/CondIsOfType.java b/src/main/java/ch/njol/skript/conditions/CondIsOfType.java
index 3a41d9881b9..47baed7a481 100644
--- a/src/main/java/ch/njol/skript/conditions/CondIsOfType.java
+++ b/src/main/java/ch/njol/skript/conditions/CondIsOfType.java
@@ -1,30 +1,6 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.conditions;
 
-import org.bukkit.entity.Entity;
-import org.bukkit.event.Event;
-import org.bukkit.inventory.ItemStack;
-import org.jetbrains.annotations.Nullable;
-
 import ch.njol.skript.aliases.ItemType;
-import org.skriptlang.skript.lang.comparator.Relation;
 import ch.njol.skript.classes.data.DefaultComparators;
 import ch.njol.skript.conditions.base.PropertyCondition;
 import ch.njol.skript.conditions.base.PropertyCondition.PropertyType;
@@ -36,26 +12,32 @@
 import ch.njol.skript.lang.Condition;
 import ch.njol.skript.lang.Expression;
 import ch.njol.skript.lang.SkriptParser.ParseResult;
-import ch.njol.util.Checker;
 import ch.njol.util.Kleenean;
+import org.bukkit.entity.Entity;
+import org.bukkit.event.Event;
+import org.bukkit.inventory.ItemStack;
+import org.jetbrains.annotations.Nullable;
+import org.skriptlang.skript.lang.comparator.Relation;
+
+import java.util.function.Predicate;
 
 @Name("Is of Type")
 @Description("Checks whether an item or an entity is of the given type. This is mostly useful for variables," +
-		" as you can use the general 'is' condition otherwise (e.g. 'victim is a creeper').")
+	" as you can use the general 'is' condition otherwise (e.g. 'victim is a creeper').")
 @Examples({"tool is of type {selected type}",
-		"victim is of type {villager type}"})
+	"victim is of type {villager type}"})
 @Since("1.4")
 public class CondIsOfType extends Condition {
-	
+
 	static {
 		PropertyCondition.register(CondIsOfType.class, "of type[s] %itemtypes/entitydatas%", "itemstacks/entities");
 	}
-	
+
 	@SuppressWarnings("NotNullFieldNotInitialized")
 	private Expression<?> what;
 	@SuppressWarnings("NotNullFieldNotInitialized")
 	private Expression<?> types;
-	
+
 	@SuppressWarnings("null")
 	@Override
 	public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelayed, ParseResult parseResult) {
@@ -64,29 +46,29 @@ public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelaye
 		setNegated(matchedPattern == 1);
 		return true;
 	}
-	
+
 	@Override
 	public boolean check(Event event) {
 		return what.check(event,
-				(Checker<Object>) o1 -> types.check(event,
-						(Checker<Object>) o2 -> {
-							if (o2 instanceof ItemType && o1 instanceof ItemStack) {
-								return ((ItemType) o2).isSupertypeOf(new ItemType((ItemStack) o1));
-							} else if (o2 instanceof EntityData && o1 instanceof Entity) {
-								return ((EntityData<?>) o2).isInstance((Entity) o1);
-							} else if (o2 instanceof ItemType && o1 instanceof Entity) {
-								return Relation.EQUAL.isImpliedBy(DefaultComparators.entityItemComparator.compare(EntityData.fromEntity((Entity) o1), (ItemType) o2));
-							} else {
-								return false;
-							}
-						}),
-				isNegated());
+			(Predicate<Object>) o1 -> types.check(event,
+				(Predicate<Object>) o2 -> {
+					if (o2 instanceof ItemType && o1 instanceof ItemStack) {
+						return ((ItemType) o2).isSupertypeOf(new ItemType((ItemStack) o1));
+					} else if (o2 instanceof EntityData && o1 instanceof Entity) {
+						return ((EntityData<?>) o2).isInstance((Entity) o1);
+					} else if (o2 instanceof ItemType && o1 instanceof Entity) {
+						return Relation.EQUAL.isImpliedBy(DefaultComparators.entityItemComparator.compare(EntityData.fromEntity((Entity) o1), (ItemType) o2));
+					} else {
+						return false;
+					}
+				}),
+			isNegated());
 	}
-	
+
 	@Override
 	public String toString(@Nullable Event event, boolean debug) {
 		return PropertyCondition.toString(this, PropertyType.BE, event, debug, what,
-				"of " + (types.isSingle() ? "type " : "types ") + types.toString(event, debug));
+			"of " + (types.isSingle() ? "type " : "types ") + types.toString(event, debug));
 	}
-	
+
 }
diff --git a/src/main/java/ch/njol/skript/conditions/CondIsOnGround.java b/src/main/java/ch/njol/skript/conditions/CondIsOnGround.java
index c557d0561f2..fc7e327f690 100644
--- a/src/main/java/ch/njol/skript/conditions/CondIsOnGround.java
+++ b/src/main/java/ch/njol/skript/conditions/CondIsOnGround.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.conditions;
 
 import org.bukkit.entity.Entity;
diff --git a/src/main/java/ch/njol/skript/conditions/CondIsOnline.java b/src/main/java/ch/njol/skript/conditions/CondIsOnline.java
index 6f3f22e40c5..98eee7e0c07 100644
--- a/src/main/java/ch/njol/skript/conditions/CondIsOnline.java
+++ b/src/main/java/ch/njol/skript/conditions/CondIsOnline.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.conditions;
 
 import ch.njol.skript.Skript;
diff --git a/src/main/java/ch/njol/skript/conditions/CondIsOp.java b/src/main/java/ch/njol/skript/conditions/CondIsOp.java
index 22304c3e589..63b0d24476e 100644
--- a/src/main/java/ch/njol/skript/conditions/CondIsOp.java
+++ b/src/main/java/ch/njol/skript/conditions/CondIsOp.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.conditions;
 
 import ch.njol.skript.conditions.base.PropertyCondition;
diff --git a/src/main/java/ch/njol/skript/conditions/CondIsPassable.java b/src/main/java/ch/njol/skript/conditions/CondIsPassable.java
index 2e6da4e7e26..200d442c6a2 100644
--- a/src/main/java/ch/njol/skript/conditions/CondIsPassable.java
+++ b/src/main/java/ch/njol/skript/conditions/CondIsPassable.java
@@ -1,22 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.conditions;
 
 import org.bukkit.block.Block;
diff --git a/src/main/java/ch/njol/skript/conditions/CondIsPathfinding.java b/src/main/java/ch/njol/skript/conditions/CondIsPathfinding.java
index 8a6768baefa..7c4fd18183c 100644
--- a/src/main/java/ch/njol/skript/conditions/CondIsPathfinding.java
+++ b/src/main/java/ch/njol/skript/conditions/CondIsPathfinding.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.conditions;
 
 import ch.njol.skript.Skript;
diff --git a/src/main/java/ch/njol/skript/conditions/CondIsPluginEnabled.java b/src/main/java/ch/njol/skript/conditions/CondIsPluginEnabled.java
index b80c6f7321b..e6d60df64d9 100644
--- a/src/main/java/ch/njol/skript/conditions/CondIsPluginEnabled.java
+++ b/src/main/java/ch/njol/skript/conditions/CondIsPluginEnabled.java
@@ -1,22 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.conditions;
 
 import ch.njol.skript.Skript;
diff --git a/src/main/java/ch/njol/skript/conditions/CondIsPoisoned.java b/src/main/java/ch/njol/skript/conditions/CondIsPoisoned.java
index 3f65f35ac83..89f85cacf02 100644
--- a/src/main/java/ch/njol/skript/conditions/CondIsPoisoned.java
+++ b/src/main/java/ch/njol/skript/conditions/CondIsPoisoned.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.conditions;
 
 import org.bukkit.entity.LivingEntity;
diff --git a/src/main/java/ch/njol/skript/conditions/CondIsPreferredTool.java b/src/main/java/ch/njol/skript/conditions/CondIsPreferredTool.java
index 04dbca4e938..945f10c05cd 100644
--- a/src/main/java/ch/njol/skript/conditions/CondIsPreferredTool.java
+++ b/src/main/java/ch/njol/skript/conditions/CondIsPreferredTool.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.conditions;
 
 import ch.njol.skript.Skript;
diff --git a/src/main/java/ch/njol/skript/conditions/CondIsResonating.java b/src/main/java/ch/njol/skript/conditions/CondIsResonating.java
index 0e255b87e16..ab6bef9e2dc 100644
--- a/src/main/java/ch/njol/skript/conditions/CondIsResonating.java
+++ b/src/main/java/ch/njol/skript/conditions/CondIsResonating.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.conditions;
 
 import ch.njol.skript.Skript;
diff --git a/src/main/java/ch/njol/skript/conditions/CondIsRiding.java b/src/main/java/ch/njol/skript/conditions/CondIsRiding.java
index 77567db83dd..d62b58fcd73 100644
--- a/src/main/java/ch/njol/skript/conditions/CondIsRiding.java
+++ b/src/main/java/ch/njol/skript/conditions/CondIsRiding.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.conditions;
 
 import org.bukkit.entity.Entity;
diff --git a/src/main/java/ch/njol/skript/conditions/CondIsRinging.java b/src/main/java/ch/njol/skript/conditions/CondIsRinging.java
index 49bda5d6672..68c1e5b4fcd 100644
--- a/src/main/java/ch/njol/skript/conditions/CondIsRinging.java
+++ b/src/main/java/ch/njol/skript/conditions/CondIsRinging.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.conditions;
 
 import ch.njol.skript.Skript;
diff --git a/src/main/java/ch/njol/skript/conditions/CondIsRiptiding.java b/src/main/java/ch/njol/skript/conditions/CondIsRiptiding.java
index e0d9d1c3b8a..ef891f4e065 100644
--- a/src/main/java/ch/njol/skript/conditions/CondIsRiptiding.java
+++ b/src/main/java/ch/njol/skript/conditions/CondIsRiptiding.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.conditions;
 
 import org.bukkit.entity.LivingEntity;
diff --git a/src/main/java/ch/njol/skript/conditions/CondIsSaddled.java b/src/main/java/ch/njol/skript/conditions/CondIsSaddled.java
new file mode 100644
index 00000000000..acfdc36517c
--- /dev/null
+++ b/src/main/java/ch/njol/skript/conditions/CondIsSaddled.java
@@ -0,0 +1,54 @@
+package ch.njol.skript.conditions;
+
+import ch.njol.skript.conditions.base.PropertyCondition;
+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.SkriptParser.ParseResult;
+import ch.njol.util.Kleenean;
+import org.bukkit.Material;
+import org.bukkit.entity.AbstractHorse;
+import org.bukkit.entity.LivingEntity;
+import org.bukkit.entity.Steerable;
+import org.bukkit.inventory.ItemStack;
+
+@Name("Is Saddled")
+@Description({
+	"Checks whether a given entity (horse or steerable) is saddled.",
+	"If 'properly' is used, this will only return true if the entity is wearing specifically a saddle item."
+})
+@Examples("send whether {_horse} is saddled")
+@Since("2.10")
+public class CondIsSaddled extends PropertyCondition<LivingEntity> {
+
+	static {
+		register(CondIsSaddled.class, "[:properly] saddled", "livingentities");
+	}
+
+	private boolean properly;
+
+	@Override
+	public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelayed, ParseResult parseResult) {
+		properly = parseResult.hasTag("properly");
+		return super.init(exprs, matchedPattern, isDelayed, parseResult);
+	}
+
+	@Override
+	public boolean check(LivingEntity entity) {
+		if (entity instanceof Steerable steerable) {
+			return steerable.hasSaddle();
+		} else if (entity instanceof AbstractHorse horse) {
+			ItemStack saddle = horse.getInventory().getSaddle();
+			return properly ? (saddle != null && saddle.equals(new ItemStack(Material.SADDLE))) : (saddle != null);
+		}
+		return false;
+	}
+
+	@Override
+	protected String getPropertyName() {
+		return properly ? "properly saddled" : "saddled";
+	}
+
+}
diff --git a/src/main/java/ch/njol/skript/conditions/CondIsSet.java b/src/main/java/ch/njol/skript/conditions/CondIsSet.java
index 0433476833a..f6afc2e5a6a 100644
--- a/src/main/java/ch/njol/skript/conditions/CondIsSet.java
+++ b/src/main/java/ch/njol/skript/conditions/CondIsSet.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.conditions;
 
 import ch.njol.skript.lang.VerboseAssert;
diff --git a/src/main/java/ch/njol/skript/conditions/CondIsSheared.java b/src/main/java/ch/njol/skript/conditions/CondIsSheared.java
index a000891be95..99f4fb6b138 100644
--- a/src/main/java/ch/njol/skript/conditions/CondIsSheared.java
+++ b/src/main/java/ch/njol/skript/conditions/CondIsSheared.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.conditions;
 
 import ch.njol.skript.Skript;
diff --git a/src/main/java/ch/njol/skript/conditions/CondIsSilent.java b/src/main/java/ch/njol/skript/conditions/CondIsSilent.java
index 64a7c67e2d4..46078b7b9c7 100644
--- a/src/main/java/ch/njol/skript/conditions/CondIsSilent.java
+++ b/src/main/java/ch/njol/skript/conditions/CondIsSilent.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.conditions;
 
 import org.bukkit.entity.Entity;
diff --git a/src/main/java/ch/njol/skript/conditions/CondIsSkriptCommand.java b/src/main/java/ch/njol/skript/conditions/CondIsSkriptCommand.java
index 4c4f8097ba4..ea6a21305c4 100644
--- a/src/main/java/ch/njol/skript/conditions/CondIsSkriptCommand.java
+++ b/src/main/java/ch/njol/skript/conditions/CondIsSkriptCommand.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.conditions;
 
 import static ch.njol.skript.command.Commands.scriptCommandExists;
diff --git a/src/main/java/ch/njol/skript/conditions/CondIsSleeping.java b/src/main/java/ch/njol/skript/conditions/CondIsSleeping.java
index 9ac5791ce8b..d253829b89d 100644
--- a/src/main/java/ch/njol/skript/conditions/CondIsSleeping.java
+++ b/src/main/java/ch/njol/skript/conditions/CondIsSleeping.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.conditions;
 
 import org.bukkit.entity.Player;
diff --git a/src/main/java/ch/njol/skript/conditions/CondIsSlimeChunk.java b/src/main/java/ch/njol/skript/conditions/CondIsSlimeChunk.java
index 1b71258482b..c8528b1bb43 100755
--- a/src/main/java/ch/njol/skript/conditions/CondIsSlimeChunk.java
+++ b/src/main/java/ch/njol/skript/conditions/CondIsSlimeChunk.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.conditions;
 
 import java.util.Random;
diff --git a/src/main/java/ch/njol/skript/conditions/CondIsSneaking.java b/src/main/java/ch/njol/skript/conditions/CondIsSneaking.java
index 9e1e4a83458..532ed58214b 100644
--- a/src/main/java/ch/njol/skript/conditions/CondIsSneaking.java
+++ b/src/main/java/ch/njol/skript/conditions/CondIsSneaking.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.conditions;
 
 import org.bukkit.entity.Player;
diff --git a/src/main/java/ch/njol/skript/conditions/CondIsSolid.java b/src/main/java/ch/njol/skript/conditions/CondIsSolid.java
index 67576570004..940672e82fc 100644
--- a/src/main/java/ch/njol/skript/conditions/CondIsSolid.java
+++ b/src/main/java/ch/njol/skript/conditions/CondIsSolid.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.conditions;
 
 import ch.njol.skript.aliases.ItemType;
diff --git a/src/main/java/ch/njol/skript/conditions/CondIsSprinting.java b/src/main/java/ch/njol/skript/conditions/CondIsSprinting.java
index e06b0fa289f..c1f25ea82e2 100644
--- a/src/main/java/ch/njol/skript/conditions/CondIsSprinting.java
+++ b/src/main/java/ch/njol/skript/conditions/CondIsSprinting.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.conditions;
 
 import org.bukkit.entity.Player;
diff --git a/src/main/java/ch/njol/skript/conditions/CondIsStackable.java b/src/main/java/ch/njol/skript/conditions/CondIsStackable.java
index 1db6e77a4f1..ed111e43436 100644
--- a/src/main/java/ch/njol/skript/conditions/CondIsStackable.java
+++ b/src/main/java/ch/njol/skript/conditions/CondIsStackable.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.conditions;
 
 import org.bukkit.inventory.ItemStack;
diff --git a/src/main/java/ch/njol/skript/conditions/CondIsSwimming.java b/src/main/java/ch/njol/skript/conditions/CondIsSwimming.java
index c469e8e4650..ef340e17f21 100644
--- a/src/main/java/ch/njol/skript/conditions/CondIsSwimming.java
+++ b/src/main/java/ch/njol/skript/conditions/CondIsSwimming.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.conditions;
 
 import org.bukkit.entity.LivingEntity;
diff --git a/src/main/java/ch/njol/skript/conditions/CondIsTameable.java b/src/main/java/ch/njol/skript/conditions/CondIsTameable.java
index 557cddf080f..b7e55382673 100644
--- a/src/main/java/ch/njol/skript/conditions/CondIsTameable.java
+++ b/src/main/java/ch/njol/skript/conditions/CondIsTameable.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.conditions;
 
 import org.bukkit.entity.LivingEntity;
diff --git a/src/main/java/ch/njol/skript/conditions/CondIsTamed.java b/src/main/java/ch/njol/skript/conditions/CondIsTamed.java
new file mode 100644
index 00000000000..20988bed324
--- /dev/null
+++ b/src/main/java/ch/njol/skript/conditions/CondIsTamed.java
@@ -0,0 +1,34 @@
+package ch.njol.skript.conditions;
+
+import ch.njol.skript.conditions.base.PropertyCondition;
+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 org.bukkit.entity.Entity;
+import org.bukkit.entity.Tameable;
+
+@Name("Is Tamed")
+@Description("Check if a tameable entity is tamed (horse, parrot, cat, etc.).")
+@Examples({
+    "send true if {_horse} is tamed",
+    "tame {_horse} if {_horse} is untamed"
+})
+@Since("2.10")
+public class CondIsTamed extends PropertyCondition<Entity> {
+
+	static {
+		register(CondIsTamed.class, "(tamed|domesticated)", "entities");
+	}
+
+	@Override
+	public boolean check(Entity entity) {
+		return (entity instanceof Tameable) && ((Tameable) entity).isTamed();
+	}
+
+	@Override
+	protected String getPropertyName() {
+		return "tamed";
+	}
+
+}
diff --git a/src/main/java/ch/njol/skript/conditions/CondIsTicking.java b/src/main/java/ch/njol/skript/conditions/CondIsTicking.java
new file mode 100644
index 00000000000..780c017dc88
--- /dev/null
+++ b/src/main/java/ch/njol/skript/conditions/CondIsTicking.java
@@ -0,0 +1,31 @@
+package ch.njol.skript.conditions;
+
+import ch.njol.skript.Skript;
+import ch.njol.skript.conditions.base.PropertyCondition;
+import ch.njol.skript.doc.*;
+import org.bukkit.entity.Entity;
+
+@Name("Is Ticking")
+@Description("Checks if an entity is ticking.")
+@Examples("send true if target is ticking")
+@RequiredPlugins("PaperMC")
+@Since("2.10")
+public class CondIsTicking extends PropertyCondition<Entity> {
+
+	static {
+		if (Skript.methodExists(Entity.class, "isTicking"))
+			register(CondIsTicking.class, "ticking", "entities");
+	}
+
+	@Override
+	public boolean check(Entity entity) {
+		return entity.isTicking();
+	}
+
+	@Override
+	protected String getPropertyName() {
+		return "ticking";
+	}
+
+}
+
diff --git a/src/main/java/ch/njol/skript/conditions/CondIsTransparent.java b/src/main/java/ch/njol/skript/conditions/CondIsTransparent.java
index bbb68125157..16a5b68a8d6 100644
--- a/src/main/java/ch/njol/skript/conditions/CondIsTransparent.java
+++ b/src/main/java/ch/njol/skript/conditions/CondIsTransparent.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.conditions;
 
 import ch.njol.skript.aliases.ItemType;
diff --git a/src/main/java/ch/njol/skript/conditions/CondIsUnbreakable.java b/src/main/java/ch/njol/skript/conditions/CondIsUnbreakable.java
index 5a0a7d4cd58..4f8f47e3ae1 100644
--- a/src/main/java/ch/njol/skript/conditions/CondIsUnbreakable.java
+++ b/src/main/java/ch/njol/skript/conditions/CondIsUnbreakable.java
@@ -1,22 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.conditions;
 
 import ch.njol.skript.aliases.ItemType;
diff --git a/src/main/java/ch/njol/skript/conditions/CondIsUsingFeature.java b/src/main/java/ch/njol/skript/conditions/CondIsUsingFeature.java
index 39a23b740ab..00661817dd4 100644
--- a/src/main/java/ch/njol/skript/conditions/CondIsUsingFeature.java
+++ b/src/main/java/ch/njol/skript/conditions/CondIsUsingFeature.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.conditions;
 
 import ch.njol.skript.Skript;
@@ -30,9 +12,9 @@
 import org.bukkit.event.Event;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.skriptlang.skript.lang.experiment.Experimented;
+import org.skriptlang.skript.lang.experiment.ExperimentSet;
+import org.skriptlang.skript.lang.script.Script;
 
-@SuppressWarnings("NotNullFieldNotInitialized")
 @Name("Is Using Experimental Feature")
 @Description("Checks whether a script is using an experimental feature by name.")
 @Examples({"the script is using \"example feature\"",
@@ -44,20 +26,23 @@ public class CondIsUsingFeature extends Condition {
 
 	static {
 		Skript.registerCondition(CondIsUsingFeature.class,
-				"[the] [current] script is using %strings%",
-				"[the] [current] script is(n't| not) using %strings%");
+				"%script% is using %strings%",
+				"%scripts% are using %strings%",
+				"%script% is(n't| not) using %strings%",
+				"%scripts% are(n't| not) using %strings%");
 	}
 
 	private Expression<String> names;
-	private Experimented snapshot;
+	private Expression<Script> scripts;
 
 	@SuppressWarnings("null")
 	@Override
 	public boolean init(Expression<?>[] expressions, int pattern, Kleenean delayed, ParseResult result) {
 		//noinspection unchecked
-		this.names = (Expression<String>) expressions[0];
-		this.setNegated(pattern == 1);
-		this.snapshot = this.getParser().experimentSnapshot();
+		this.names = (Expression<String>) expressions[1];
+		//noinspection unchecked
+		this.scripts = (Expression<Script>) expressions[0];
+		this.setNegated(pattern > 1);
 		return true;
 	}
 
@@ -67,15 +52,26 @@ public boolean check(Event event) {
 		if (array.length == 0)
 			return true;
 		boolean isUsing = true;
-		for (@NotNull String object : array) {
-			isUsing &= snapshot.hasExperiment(object);
+		for (Script script : this.scripts.getArray(event)) {
+			ExperimentSet data = script.getData(ExperimentSet.class);
+			if (data == null) {
+				isUsing = false;
+			} else {
+				for (@NotNull String object : array) {
+					isUsing &= data.hasExperiment(object);
+				}
+			}
 		}
 		return isUsing ^ this.isNegated();
 	}
 
 	@Override
 	public String toString(@Nullable Event event, boolean debug) {
-		return "the current script " + (isNegated() ? "isn't" : "is") + " using " + names.toString(event, debug);
+		String whether = scripts.isSingle()
+				? (isNegated() ? "isn't" : "is")
+				: (isNegated() ? "aren't" : "are");
+		return scripts.toString(event, debug) + " "
+				+ whether + " using " + names.toString(event, debug);
 	}
 
 }
diff --git a/src/main/java/ch/njol/skript/conditions/CondIsValid.java b/src/main/java/ch/njol/skript/conditions/CondIsValid.java
index a22e7f05b0e..f7edcf32ac9 100644
--- a/src/main/java/ch/njol/skript/conditions/CondIsValid.java
+++ b/src/main/java/ch/njol/skript/conditions/CondIsValid.java
@@ -1,44 +1,34 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.conditions;
 
-import org.bukkit.entity.Entity;
-
 import ch.njol.skript.conditions.base.PropertyCondition;
 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 org.bukkit.entity.Entity;
+import org.skriptlang.skript.util.Validated;
 
 @Name("Is Valid")
-@Description("Checks whether an entity has died or been despawned for some other reason.")
+@Description({
+	"Checks whether something (an entity, a script, a config, etc.) is valid.",
+	"An invalid entity may have died or de-spawned for some other reason.",
+	"An invalid script reference may have been reloaded, moved or disabled since."
+})
 @Examples("if event-entity is valid")
-@Since("2.7")
-public class CondIsValid extends PropertyCondition<Entity> {
+@Since("2.7, 2.10 (Scripts & Configs)")
+public class CondIsValid extends PropertyCondition<Object> {
 
 	static {
-		register(CondIsValid.class, "valid", "entities");
+		register(CondIsValid.class, "valid", "entities/scripts");
 	}
 
 	@Override
-	public boolean check(Entity entity) {
-		return entity.isValid();
+	public boolean check(Object value) {
+		if (value instanceof Entity entity)
+			return entity.isValid();
+		if (value instanceof Validated validated)
+			return validated.valid();
+		return false;
 	}
 
 	@Override
diff --git a/src/main/java/ch/njol/skript/conditions/CondIsVectorNormalized.java b/src/main/java/ch/njol/skript/conditions/CondIsVectorNormalized.java
index a93d02afa19..ce8444e26ae 100644
--- a/src/main/java/ch/njol/skript/conditions/CondIsVectorNormalized.java
+++ b/src/main/java/ch/njol/skript/conditions/CondIsVectorNormalized.java
@@ -1,21 +1,3 @@
-/**
-*  This file is part of Skript.
-*
-* Skript is free software: you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
-*
-* Skript is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with Skript.  If not, see <http://www.gnu.org/licenses/>.
-*
-* Copyright Peter Güttinger, SkriptLang team and contributors
-*/
 package ch.njol.skript.conditions;
 	
 	import org.bukkit.util.Vector;
diff --git a/src/main/java/ch/njol/skript/conditions/CondIsWearing.java b/src/main/java/ch/njol/skript/conditions/CondIsWearing.java
index 396ecf1b8ee..ece4ba03a29 100644
--- a/src/main/java/ch/njol/skript/conditions/CondIsWearing.java
+++ b/src/main/java/ch/njol/skript/conditions/CondIsWearing.java
@@ -1,29 +1,5 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.conditions;
 
-import org.bukkit.entity.LivingEntity;
-import org.bukkit.event.Event;
-import org.bukkit.inventory.EntityEquipment;
-import org.bukkit.inventory.ItemStack;
-import org.jetbrains.annotations.Nullable;
-
 import ch.njol.skript.aliases.ItemType;
 import ch.njol.skript.conditions.base.PropertyCondition;
 import ch.njol.skript.conditions.base.PropertyCondition.PropertyType;
@@ -34,15 +10,24 @@
 import ch.njol.skript.lang.Condition;
 import ch.njol.skript.lang.Expression;
 import ch.njol.skript.lang.SkriptParser.ParseResult;
+import ch.njol.skript.lang.util.SimpleExpression;
 import ch.njol.util.Kleenean;
+import org.bukkit.entity.LivingEntity;
+import org.bukkit.event.Event;
+import org.bukkit.inventory.EntityEquipment;
+import org.bukkit.inventory.EquipmentSlot;
+import org.bukkit.inventory.ItemStack;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.Arrays;
 
-/**
- * @author Peter Güttinger
- */
 @Name("Is Wearing")
-@Description("Checks whether a player is wearing some armour.")
-@Examples({"player is wearing an iron chestplate and iron leggings",
-		"player is wearing all diamond armour"})
+@Description("Checks whether an entity is wearing some items (usually armor).")
+@Examples({
+	"player is wearing an iron chestplate and iron leggings",
+	"player is wearing all diamond armour",
+	"target is wearing wolf armor"
+})
 @Since("1.0")
 public class CondIsWearing extends Condition {
 	
@@ -50,14 +35,14 @@ public class CondIsWearing extends Condition {
 		PropertyCondition.register(CondIsWearing.class, "wearing %itemtypes%", "livingentities");
 	}
 	
-	@SuppressWarnings("null")
+	@SuppressWarnings("NotNullFieldNotInitialized")
 	private Expression<LivingEntity> entities;
-	@SuppressWarnings("null")
+	@SuppressWarnings("NotNullFieldNotInitialized")
 	private Expression<ItemType> types;
 	
 	@SuppressWarnings({"unchecked", "null"})
 	@Override
-	public boolean init(final Expression<?>[] vars, final int matchedPattern, final Kleenean isDelayed, final ParseResult parseResult) {
+	public boolean init(Expression<?>[] vars, int matchedPattern, Kleenean isDelayed, ParseResult parseResult) {
 		entities = (Expression<LivingEntity>) vars[0];
 		types = (Expression<ItemType>) vars[1];
 		setNegated(matchedPattern == 1);
@@ -65,26 +50,32 @@ public boolean init(final Expression<?>[] vars, final int matchedPattern, final
 	}
 	
 	@Override
-	public boolean check(final Event e) {
-		return entities.check(e,
-				en -> types.check(e,
-						t -> {
-							EntityEquipment equip = en.getEquipment();
-							if (equip == null)
-								return false; // No equipment -> not wearing anything
-							for (final ItemStack is : equip.getArmorContents()) {
-								if (t.isOfType(is) ^ t.isAll())
-									return !t.isAll();
-							}
-							return t.isAll();
-						}),
-				isNegated());
+	public boolean check(Event event) {
+		ItemType[] cachedTypes = types.getAll(event);
+
+		return entities.check(event, entity -> {
+			EntityEquipment equipment = entity.getEquipment();
+			if (equipment == null)
+				return false; // spigot nullability, no identifier as to why this occurs
+
+			ItemStack[] contents = Arrays.stream(EquipmentSlot.values())
+				.map(equipment::getItem)
+				.toArray(ItemStack[]::new);
+
+			return SimpleExpression.check(cachedTypes, type -> {
+				for (ItemStack content : contents) {
+					if (type.isOfType(content) ^ type.isAll())
+						return !type.isAll();
+				}
+				return type.isAll();
+			}, false, false);
+		}, isNegated());
 	}
-	
+
 	@Override
-	public String toString(final @Nullable Event e, final boolean debug) {
-		return PropertyCondition.toString(this, PropertyType.BE, e, debug, entities,
-				"wearing " + types.toString(e, debug));
+	public String toString(@Nullable Event event, boolean debug) {
+		return PropertyCondition.toString(this, PropertyType.BE, event, debug, entities,
+				"wearing " + types.toString(event, debug));
 	}
 	
 }
diff --git a/src/main/java/ch/njol/skript/conditions/CondIsWhitelisted.java b/src/main/java/ch/njol/skript/conditions/CondIsWhitelisted.java
index deac66def49..6b45817e3a8 100644
--- a/src/main/java/ch/njol/skript/conditions/CondIsWhitelisted.java
+++ b/src/main/java/ch/njol/skript/conditions/CondIsWhitelisted.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.conditions;
 
 import ch.njol.skript.Skript;
diff --git a/src/main/java/ch/njol/skript/conditions/CondIsWithin.java b/src/main/java/ch/njol/skript/conditions/CondIsWithin.java
index 7ec25401ae8..9631a598a33 100644
--- a/src/main/java/ch/njol/skript/conditions/CondIsWithin.java
+++ b/src/main/java/ch/njol/skript/conditions/CondIsWithin.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.conditions;
 
 import ch.njol.skript.Skript;
diff --git a/src/main/java/ch/njol/skript/conditions/CondItemEnchantmentGlint.java b/src/main/java/ch/njol/skript/conditions/CondItemEnchantmentGlint.java
new file mode 100644
index 00000000000..149d6a82705
--- /dev/null
+++ b/src/main/java/ch/njol/skript/conditions/CondItemEnchantmentGlint.java
@@ -0,0 +1,64 @@
+package ch.njol.skript.conditions;
+
+import org.bukkit.inventory.meta.ItemMeta;
+
+import ch.njol.skript.Skript;
+import ch.njol.skript.aliases.ItemType;
+import ch.njol.skript.conditions.base.PropertyCondition;
+import ch.njol.skript.doc.*;
+import ch.njol.skript.lang.Expression;
+import ch.njol.skript.lang.SkriptParser.ParseResult;
+import ch.njol.util.Kleenean;
+
+@Name("Item Has Enchantment Glint Override")
+@Description("Checks whether an item has the enchantment glint overridden, or is forced to glint or not.")
+@Examples({
+	"if the player's tool has the enchantment glint override",
+	"\tsend \"Your tool has the enchantment glint override.\" to player",
+	"",
+	"if {_item} is forced to glint:",
+	"\tsend \"This item is forced to glint.\" to player",
+	"else if {_item} is forced to not glint:",
+	"\tsend \"This item is forced to not glint.\" to player",
+	"else:",
+	"\tsend \"This item does not have any glint override.\" to player"
+})
+@RequiredPlugins("Spigot 1.20.5+")
+@Since("2.10")
+public class CondItemEnchantmentGlint extends PropertyCondition<ItemType> {
+
+	static {
+		if (Skript.methodExists(ItemMeta.class, "getEnchantmentGlintOverride")) {
+			register(CondItemEnchantmentGlint.class, PropertyType.HAVE, "enchantment glint overrid(den|e)", "itemtypes");
+			register(CondItemEnchantmentGlint.class, PropertyType.BE, "forced to [:not] glint", "itemtypes");
+		}
+	}
+
+	private int matchedPattern;
+
+	@Override
+	public boolean init(Expression<?>[] expressions, int matchedPattern, Kleenean isDelayed, ParseResult parseResult) {
+		this.matchedPattern = matchedPattern;
+		return super.init(expressions, matchedPattern, isDelayed, parseResult);
+	}
+
+	@Override
+	public boolean check(ItemType itemType) {
+		ItemMeta meta = itemType.getItemMeta();
+		// enchantment glint override
+		if (matchedPattern == 0)
+			return meta.hasEnchantmentGlintOverride();
+		// forced to glint
+		if (!meta.hasEnchantmentGlintOverride())
+			return false;
+		return meta.getEnchantmentGlintOverride();
+	}
+
+	@Override
+	protected String getPropertyName() {
+		if (matchedPattern == 0)
+			return "enchantment glint overridden";
+		return "forced to " + (isNegated() ? "not " : "") + "glint";
+	}
+
+}
diff --git a/src/main/java/ch/njol/skript/conditions/CondItemInHand.java b/src/main/java/ch/njol/skript/conditions/CondItemInHand.java
index cdad86ce133..68bf091628b 100644
--- a/src/main/java/ch/njol/skript/conditions/CondItemInHand.java
+++ b/src/main/java/ch/njol/skript/conditions/CondItemInHand.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.conditions;
 
 import ch.njol.skript.Skript;
diff --git a/src/main/java/ch/njol/skript/conditions/CondLeashWillDrop.java b/src/main/java/ch/njol/skript/conditions/CondLeashWillDrop.java
new file mode 100644
index 00000000000..9a92af37cfd
--- /dev/null
+++ b/src/main/java/ch/njol/skript/conditions/CondLeashWillDrop.java
@@ -0,0 +1,56 @@
+package ch.njol.skript.conditions;
+
+import org.bukkit.event.Event;
+import org.bukkit.event.entity.EntityUnleashEvent;
+import org.jetbrains.annotations.Nullable;
+
+import ch.njol.skript.Skript;
+import ch.njol.skript.doc.*;
+import ch.njol.skript.lang.Condition;
+import ch.njol.skript.lang.Expression;
+import ch.njol.skript.lang.SkriptParser.ParseResult;
+import ch.njol.util.Kleenean;
+
+@Name("Leash Will Drop")
+@Description("Checks whether the leash item will drop during the leash detaching in an unleash event.")
+@Examples({
+	"on unleash:",
+		"\tif the leash will drop:",
+			"\t\tprevent the leash from dropping",
+		"\telse:",
+			"\t\tallow the leash to drop"
+})
+@Keywords("lead")
+@Events("Unleash")
+@RequiredPlugins("Paper 1.16+")
+@Since("2.10")
+public class CondLeashWillDrop extends Condition {
+
+	static {
+		if (Skript.methodExists(EntityUnleashEvent.class, "isDropLeash"))
+			Skript.registerCondition(CondLeashWillDrop.class, "[the] (lead|leash) [item] (will|not:(won't|will not)) (drop|be dropped)");
+	}
+
+	@Override
+	public boolean init(Expression<?>[] expressions, int matchedPattern, Kleenean isDelayed, ParseResult parseResult) {
+		if (!getParser().isCurrentEvent(EntityUnleashEvent.class)) {
+			Skript.error("The 'leash will drop' condition can only be used in an 'unleash' event");
+			return false;
+		}
+		setNegated(parseResult.hasTag("not"));
+		return true;
+	}
+
+	@Override
+	public boolean check(Event event) {
+		if (!(event instanceof EntityUnleashEvent unleashEvent))
+			return false;
+		return unleashEvent.isDropLeash() ^ isNegated();
+	}
+
+	@Override
+	public String toString(@Nullable Event event, boolean debug) {
+		return "the leash will" + (isNegated() ? " not" : "") + " be dropped";
+	}
+
+}
diff --git a/src/main/java/ch/njol/skript/conditions/CondLeashed.java b/src/main/java/ch/njol/skript/conditions/CondLeashed.java
index 9e9978623a2..f2fb1fa887d 100644
--- a/src/main/java/ch/njol/skript/conditions/CondLeashed.java
+++ b/src/main/java/ch/njol/skript/conditions/CondLeashed.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.conditions;
 
 import ch.njol.skript.conditions.base.PropertyCondition;
diff --git a/src/main/java/ch/njol/skript/conditions/CondLidState.java b/src/main/java/ch/njol/skript/conditions/CondLidState.java
new file mode 100644
index 00000000000..d401bd63461
--- /dev/null
+++ b/src/main/java/ch/njol/skript/conditions/CondLidState.java
@@ -0,0 +1,63 @@
+package ch.njol.skript.conditions;
+
+import ch.njol.skript.Skript;
+import ch.njol.skript.conditions.base.PropertyCondition;
+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.SkriptParser.ParseResult;
+import ch.njol.util.Kleenean;
+import org.bukkit.block.Block;
+import org.bukkit.block.Lidded;
+import org.bukkit.event.Event;
+import org.jetbrains.annotations.Nullable;
+
+@Name("Lid Is Open/Closed")
+@Description("Check to see whether lidded blocks (chests, shulkers, etc.) are open or closed.")
+@Examples({
+	"if the lid of {_chest} is closed:",
+		"\topen the lid of {_block}"
+})
+@Since("2.10")
+public class CondLidState extends PropertyCondition<Block> {
+
+	static {
+		Skript.registerCondition(CondLidState.class, ConditionType.PROPERTY,
+			"[the] lid[s] of %blocks% (is|are) (open[ed]|:close[d])",
+			"[the] lid[s] of %blocks% (isn't|is not|aren't|are not) (open[ed]|:close[d])",
+			"%blocks%'[s] lid[s] (is|are) (open[ed]|:close[d])",
+			"%blocks%'[s] lid[s] (isn't|is not|aren't|are not) (open[ed]|:close[d])"
+		);
+	}
+
+	private boolean checkOpen;
+	private Expression<Block> blocks;
+
+	@Override
+	@SuppressWarnings("unchecked")
+	public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelayed, ParseResult parseResult) {
+		checkOpen = !parseResult.hasTag("close");
+		blocks = (Expression<Block>) exprs[0];
+		setExpr(blocks);
+		setNegated(matchedPattern == 1 || matchedPattern == 3);
+		return true;
+	}
+
+	@Override
+	public boolean check(Block block) {
+		return (block.getState() instanceof Lidded lidded) ? lidded.isOpen() == checkOpen : false;
+	}
+
+	@Override
+	protected String getPropertyName() {
+		return (checkOpen ? "opened" : "closed") + " lid state";
+	}
+
+	@Override
+	public String toString(@Nullable Event event, boolean debug) {
+		return "the lids of " + blocks.toString(event, debug) + (isNegated() ? "are not " : "are ") + (checkOpen ? "opened" : "closed");
+	}
+
+}
diff --git a/src/main/java/ch/njol/skript/conditions/CondMatches.java b/src/main/java/ch/njol/skript/conditions/CondMatches.java
index f00c92950e9..6ce5facb581 100644
--- a/src/main/java/ch/njol/skript/conditions/CondMatches.java
+++ b/src/main/java/ch/njol/skript/conditions/CondMatches.java
@@ -1,22 +1,3 @@
-/**
- * This file is part of Skript.
- *
- * Skript is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Skript is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 
 package ch.njol.skript.conditions;
 
diff --git a/src/main/java/ch/njol/skript/conditions/CondMinecraftVersion.java b/src/main/java/ch/njol/skript/conditions/CondMinecraftVersion.java
index 0d93396f18b..682b6a144cd 100644
--- a/src/main/java/ch/njol/skript/conditions/CondMinecraftVersion.java
+++ b/src/main/java/ch/njol/skript/conditions/CondMinecraftVersion.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.conditions;
 
 import org.bukkit.event.Event;
diff --git a/src/main/java/ch/njol/skript/conditions/CondPastFuture.java b/src/main/java/ch/njol/skript/conditions/CondPastFuture.java
new file mode 100644
index 00000000000..2f8748f1a73
--- /dev/null
+++ b/src/main/java/ch/njol/skript/conditions/CondPastFuture.java
@@ -0,0 +1,86 @@
+package ch.njol.skript.conditions;
+
+import ch.njol.skript.Skript;
+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.expressions.ExprNow;
+import ch.njol.skript.lang.Condition;
+import ch.njol.skript.lang.Expression;
+import ch.njol.skript.lang.ExpressionList;
+import ch.njol.skript.lang.SkriptParser.ParseResult;
+import ch.njol.skript.util.Date;
+import ch.njol.util.Kleenean;
+import org.bukkit.event.Event;
+import org.jetbrains.annotations.Nullable;
+
+@Name("In The Past/Future")
+@Description({
+	"Checks whether a date is in the past or future.",
+	"Note that using the 'now' expression will not be in the past or future when used directly in the condition."
+})
+@Examples({
+	"set {_date} to now",
+	"wait 5 seconds",
+	"if {_date} is in the past:",
+		"\t# this will be true",
+	"",
+	"if now is in the future:",
+		"\t# this will be false",
+	"",
+	"set {_dates::*} to 1 day from now, 12 days from now, and 1 year from now",
+	"if {_dates::*} are in the future:",
+		"\t# this will be true",
+	"if {_dates::*} have passed:",
+		"\t# this will be false"
+})
+@Since("2.10")
+public class CondPastFuture extends Condition {
+
+	static {
+		Skript.registerCondition(CondPastFuture.class,
+				"%dates% (is|are)[negated:(n't| not)] in the (past|:future)",
+				"%dates% ha(s|ve)[negated:(n't| not)] passed");
+	}
+
+	private Expression<Date> dates;
+	private boolean isFuture;
+
+	@Override
+	public boolean init(Expression<?>[] expressions, int matchedPattern, Kleenean isDelayed, ParseResult parseResult) {
+		setNegated(parseResult.hasTag("negated"));
+		// we default to past, so we only need to check if it's future
+		isFuture = parseResult.hasTag("future");
+		dates = (Expression<Date>) expressions[0];
+		return true;
+	}
+
+	@Override
+	public boolean check(Event event) {
+		// now should never be in the past or future
+		if (dates instanceof ExprNow)
+			return isNegated();
+
+		// This may not be worth checking
+		if (dates instanceof ExpressionList<Date> list) {
+			for (Expression<? extends Date> dateExpression : list.getExpressions()) {
+				if (dateExpression instanceof ExprNow && list.getAnd())
+					return isNegated();
+			}
+		}
+
+		// using the same 'now' date for all checks is flawed, because the input dates are evaluated during the
+		// check, so it could cause 'now is in the future' to be true, when it should be false.
+		// This is still possible, but it's less likely to happen as the two dates are created closer together.
+		if (isFuture)
+			return dates.check(event, date -> date.compareTo(new Date()) > 0, isNegated());
+		return dates.check(event, date -> date.compareTo(new Date()) < 0, isNegated());
+	}
+
+	@Override
+	public String toString(@Nullable Event event, boolean debug) {
+		return dates.toString(event, debug) + (dates.isSingle() ? " is"  : " are") + " in the" + (isFuture ? " future" : " past");
+	}
+
+}
diff --git a/src/main/java/ch/njol/skript/conditions/CondPermission.java b/src/main/java/ch/njol/skript/conditions/CondPermission.java
index ed5ac0f6cb2..c6494171c22 100644
--- a/src/main/java/ch/njol/skript/conditions/CondPermission.java
+++ b/src/main/java/ch/njol/skript/conditions/CondPermission.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.conditions;
 
 import org.bukkit.command.CommandSender;
diff --git a/src/main/java/ch/njol/skript/conditions/CondPlayedBefore.java b/src/main/java/ch/njol/skript/conditions/CondPlayedBefore.java
index ef8a19fbfc1..ba2c1e611a9 100644
--- a/src/main/java/ch/njol/skript/conditions/CondPlayedBefore.java
+++ b/src/main/java/ch/njol/skript/conditions/CondPlayedBefore.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.conditions;
 
 import ch.njol.skript.Skript;
diff --git a/src/main/java/ch/njol/skript/conditions/CondPvP.java b/src/main/java/ch/njol/skript/conditions/CondPvP.java
index 5aff13b8964..250f38fd538 100644
--- a/src/main/java/ch/njol/skript/conditions/CondPvP.java
+++ b/src/main/java/ch/njol/skript/conditions/CondPvP.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.conditions;
 
 import org.bukkit.World;
diff --git a/src/main/java/ch/njol/skript/conditions/CondResourcePack.java b/src/main/java/ch/njol/skript/conditions/CondResourcePack.java
index c987e54f43a..1d1c208766c 100644
--- a/src/main/java/ch/njol/skript/conditions/CondResourcePack.java
+++ b/src/main/java/ch/njol/skript/conditions/CondResourcePack.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.conditions;
 
 import org.bukkit.event.Event;
diff --git a/src/main/java/ch/njol/skript/conditions/CondRespawnLocation.java b/src/main/java/ch/njol/skript/conditions/CondRespawnLocation.java
index 7a586cc09b8..56199bea961 100644
--- a/src/main/java/ch/njol/skript/conditions/CondRespawnLocation.java
+++ b/src/main/java/ch/njol/skript/conditions/CondRespawnLocation.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.conditions;
 
 import ch.njol.skript.Skript;
diff --git a/src/main/java/ch/njol/skript/conditions/CondScriptLoaded.java b/src/main/java/ch/njol/skript/conditions/CondScriptLoaded.java
index cf3c97cd9d1..67bdb250e10 100644
--- a/src/main/java/ch/njol/skript/conditions/CondScriptLoaded.java
+++ b/src/main/java/ch/njol/skript/conditions/CondScriptLoaded.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.conditions;
 
 import ch.njol.skript.ScriptLoader;
@@ -44,19 +26,19 @@
 })
 @Since("2.2-dev31")
 public class CondScriptLoaded extends Condition {
-	
+
 	static {
 		Skript.registerCondition(CondScriptLoaded.class,
 				"script[s] [%-strings%] (is|are) loaded",
 				"script[s] [%-strings%] (isn't|is not|aren't|are not) loaded"
 		);
 	}
-	
+
 	@Nullable
 	private Expression<String> scripts;
 	@Nullable
 	private Script currentScript;
-	
+
 	@Override
 	@SuppressWarnings("unchecked")
 	public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelayed, ParseResult parseResult) {
@@ -81,11 +63,11 @@ public boolean check(Event event) {
 		if (scripts == null)
 			return ScriptLoader.getLoadedScripts().contains(currentScript) ^ isNegated();
 		return scripts.check(event, scriptName -> {
-			File scriptFile = SkriptCommand.getScriptFromName(scriptName);
+			File scriptFile = ScriptLoader.getScriptFromName(scriptName);
 			return scriptFile != null && ScriptLoader.getLoadedScripts().contains(ScriptLoader.getScript(scriptFile));
 		}, isNegated());
 	}
-	
+
 	@Override
 	public String toString(@Nullable Event event, boolean debug) {
 		String scriptName = scripts == null ?
@@ -94,5 +76,5 @@ public String toString(@Nullable Event event, boolean debug) {
 			return scriptName + (isNegated() ? " isn't" : " is") + " loaded";
 		return scriptName + (isNegated() ? " aren't" : " are") + " loaded";
 	}
-	
+
 }
diff --git a/src/main/java/ch/njol/skript/conditions/CondStartsEndsWith.java b/src/main/java/ch/njol/skript/conditions/CondStartsEndsWith.java
index 9bdea38c61b..205db7eca53 100644
--- a/src/main/java/ch/njol/skript/conditions/CondStartsEndsWith.java
+++ b/src/main/java/ch/njol/skript/conditions/CondStartsEndsWith.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.conditions;
 
 import org.bukkit.event.Event;
diff --git a/src/main/java/ch/njol/skript/conditions/CondTooltip.java b/src/main/java/ch/njol/skript/conditions/CondTooltip.java
index b7ee0c928bd..7f84be363a4 100644
--- a/src/main/java/ch/njol/skript/conditions/CondTooltip.java
+++ b/src/main/java/ch/njol/skript/conditions/CondTooltip.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.conditions;
 
 import ch.njol.skript.Skript;
diff --git a/src/main/java/ch/njol/skript/conditions/CondWillHatch.java b/src/main/java/ch/njol/skript/conditions/CondWillHatch.java
index 14f5ddcc3f0..dfdc5d4854c 100644
--- a/src/main/java/ch/njol/skript/conditions/CondWillHatch.java
+++ b/src/main/java/ch/njol/skript/conditions/CondWillHatch.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.conditions;
 
 import ch.njol.skript.Skript;
diff --git a/src/main/java/ch/njol/skript/conditions/CondWithinRadius.java b/src/main/java/ch/njol/skript/conditions/CondWithinRadius.java
index b422e622b95..d11a2add4bd 100644
--- a/src/main/java/ch/njol/skript/conditions/CondWithinRadius.java
+++ b/src/main/java/ch/njol/skript/conditions/CondWithinRadius.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.conditions;
 
 import ch.njol.skript.Skript;
diff --git a/src/main/java/ch/njol/skript/conditions/base/PropertyCondition.java b/src/main/java/ch/njol/skript/conditions/base/PropertyCondition.java
index 1f16396bd64..1711fcfb812 100644
--- a/src/main/java/ch/njol/skript/conditions/base/PropertyCondition.java
+++ b/src/main/java/ch/njol/skript/conditions/base/PropertyCondition.java
@@ -1,33 +1,22 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.conditions.base;
 
-import org.bukkit.event.Event;
-import org.jetbrains.annotations.Nullable;
-
 import ch.njol.skript.Skript;
 import ch.njol.skript.SkriptAPIException;
 import ch.njol.skript.lang.Condition;
 import ch.njol.skript.lang.Expression;
 import ch.njol.skript.lang.SkriptParser.ParseResult;
-import ch.njol.util.Checker;
 import ch.njol.util.Kleenean;
+import org.bukkit.event.Event;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.function.Predicate;
+import org.jetbrains.annotations.ApiStatus;
+import org.skriptlang.skript.registration.SyntaxInfo;
+import org.skriptlang.skript.registration.SyntaxRegistry;
+import org.skriptlang.skript.util.Priority;
+
+import java.util.function.Predicate;
 
 /**
  * This class can be used for an easier writing of conditions that contain only one type in the pattern,
@@ -52,7 +41,15 @@
  * {@link PropertyCondition#register(Class, String, String)}, be aware that there can only be two patterns -
  * the first one needs to be a non-negated one and a negated one.
  */
-public abstract class PropertyCondition<T> extends Condition implements Checker<T> {
+public abstract class PropertyCondition<T> extends Condition implements Predicate<T> {
+
+	/**
+	 * A priority for {@link PropertyCondition}s.
+	 * They will be registered before {@link SyntaxInfo#PATTERN_MATCHES_EVERYTHING} expressions
+	 *  but after {@link SyntaxInfo#COMBINED} expressions.
+	 */
+	@ApiStatus.Experimental
+	public static final Priority DEFAULT_PRIORITY = Priority.before(SyntaxInfo.PATTERN_MATCHES_EVERYTHING);
 
 	/**
 	 * See {@link PropertyCondition} for more info
@@ -63,13 +60,13 @@ public enum PropertyType {
 		 * also possibly in the negated form
 		 */
 		BE,
-		
+
 		/**
 		 * Indicates that the condition is in a form of <code>something can something</code>,
 		 * also possibly in the negated form
 		 */
 		CAN,
-		
+
 		/**
 		 * Indicates that the condition is in a form of <code>something has/have something</code>,
 		 * also possibly in the negated form
@@ -83,59 +80,110 @@ public enum PropertyType {
 		WILL
 	}
 
-	private Expression<? extends T> expr;
+	/**
+	 * @param registry The SyntaxRegistry to register with.
+	 * @param condition The class to register
+	 * @param property The property name, for example <i>fly</i> in <i>players can fly</i>
+	 * @param type Must be plural, for example <i>players</i> in <i>players can fly</i>
+	 * @param <E> The Condition type.
+	 * @return The registered {@link SyntaxInfo}.
+	 */
+	@ApiStatus.Experimental
+	public static <E extends Condition> SyntaxInfo<E> register(SyntaxRegistry registry, Class<E> condition, String property, String type) {
+		return register(registry, condition, PropertyType.BE, property, type);
+	}
 
 	/**
+	 * @param registry The SyntaxRegistry to register with.
+	 * @param condition The class to register
+	 * @param propertyType The property type, see {@link PropertyType}
+	 * @param property The property name, for example <i>fly</i> in <i>players can fly</i>
+	 * @param type Must be plural, for example <i>players</i> in <i>players can fly</i>
+	 * @param <E> The Condition type.
+	 * @return The registered {@link SyntaxInfo}.
+	 */
+	@ApiStatus.Experimental
+	public static <E extends Condition> SyntaxInfo<E> register(SyntaxRegistry registry, Class<E> condition, PropertyType propertyType, String property, String type) {
+		if (type.contains("%"))
+			throw new SkriptAPIException("The type argument must not contain any '%'s");
+		SyntaxInfo.Builder<?, E> builder = SyntaxInfo.builder(condition).priority(DEFAULT_PRIORITY);
+		switch (propertyType) {
+			case BE -> builder.addPatterns("%" + type + "% (is|are) " + property,
+					"%" + type + "% (isn't|is not|aren't|are not) " + property);
+			case CAN -> builder.addPatterns("%" + type + "% can " + property,
+					"%" + type + "% (can't|cannot|can not) " + property);
+			case HAVE -> builder.addPatterns("%" + type + "% (has|have) " + property,
+					"%" + type + "% (doesn't|does not|do not|don't) have " + property);
+			case WILL -> builder.addPatterns("%" + type + "% will " + property,
+					"%" + type + "% (will (not|neither)|won't) " + property);
+		}
+		SyntaxInfo<E> info = builder.build();
+		registry.register(SyntaxRegistry.CONDITION, info);
+		return info;
+	}
+
+	/**
+	 * Registers a new property condition. The property type is set to {@link PropertyType#BE}.
+	 *
 	 * @param condition the class to register
 	 * @param property the property name, for example <i>fly</i> in <i>players can fly</i>
 	 * @param type must be plural, for example <i>players</i> in <i>players can fly</i>
 	 */
-
 	public static void register(Class<? extends Condition> condition, String property, String type) {
 		register(condition, PropertyType.BE, property, type);
 	}
 
 	/**
+	 * Registers a new property condition.
+	 *
 	 * @param condition the class to register
 	 * @param propertyType the property type, see {@link PropertyType}
 	 * @param property the property name, for example <i>fly</i> in <i>players can fly</i>
 	 * @param type must be plural, for example <i>players</i> in <i>players can fly</i>
 	 */
-
 	public static void register(Class<? extends Condition> condition, PropertyType propertyType, String property, String type) {
+		Skript.registerCondition(condition, ConditionType.PROPERTY,
+				getPatterns(propertyType, property, type));
+	}
+
+	/**
+	 * Returns the patterns for the given property type, property and type.
+	 *
+	 * @param propertyType the property type, see {@link PropertyType}
+	 * @param property the property name, for example <i>fly</i> in <i>players can fly</i>
+	 * @param type must be plural, for example <i>players</i> in <i>players can fly</i>
+	 * @return patterns formmated for {@link Skript#registerCondition(Class, String...)}
+	 */
+	public static String[] getPatterns(PropertyType propertyType, String property, String type) {
 		if (type.contains("%"))
 			throw new SkriptAPIException("The type argument must not contain any '%'s");
 
-		switch (propertyType) {
-			case BE:
-				Skript.registerCondition(condition,
-						"%" + type + "% (is|are) " + property,
-						"%" + type + "% (isn't|is not|aren't|are not) " + property);
-				break;
-			case CAN:
-				Skript.registerCondition(condition,
-						"%" + type + "% can " + property,
-						"%" + type + "% (can't|cannot|can not) " + property);
-				break;
-			case HAVE:
-				Skript.registerCondition(condition,
-						"%" + type + "% (has|have) " + property,
-						"%" + type + "% (doesn't|does not|do not|don't) have " + property);
-				break;
-			case WILL:
-				Skript.registerCondition(condition,
-						"%" + type + "% will " + property,
-						"%" + type + "% (will (not|neither)|won't) " + property);
-				break;
-			default:
-				assert false;
-		}
+		return switch (propertyType) {
+			case BE -> new String[] {
+				"%" + type + "% (is|are) " + property,
+				"%" + type + "% (isn't|is not|aren't|are not) " + property
+			};
+			case CAN -> new String[] {
+				"%" + type + "% can " + property,
+				"%" + type + "% (can't|cannot|can not) " + property
+			};
+			case HAVE -> new String[] {
+				"%" + type + "% (has|have) " + property,
+				"%" + type + "% (doesn't|does not|do not|don't) have " + property
+			};
+			case WILL -> new String[] {
+				"%" + type + "% will " + property,
+				"%" + type + "% (will (not|neither)|won't) " + property
+			};
+		};
 	}
 
+	private Expression<? extends T> expr;
+
 	@Override
 	public boolean init(Expression<?>[] expressions, int matchedPattern, Kleenean isDelayed, ParseResult parseResult) {
+		//noinspection unchecked
 		expr = (Expression<? extends T>) expressions[0];
-
 		setNegated(matchedPattern == 1);
 		return true;
 	}
@@ -145,9 +193,13 @@ public final boolean check(Event event) {
 		return expr.check(event, this, isNegated());
 	}
 
-	@Override
 	public abstract boolean check(T value);
-	
+
+	@Override
+	public final boolean test(T value) {
+		return check(value);
+	}
+
 	protected abstract String getPropertyName();
 
 	protected PropertyType getPropertyType() {
@@ -176,15 +228,32 @@ public static String toString(Condition condition, PropertyType propertyType, @N
 			case CAN:
 				return expr.toString(event, debug) + (condition.isNegated() ? " can't " : " can ") + property;
 			case HAVE:
-				if (expr.isSingle())
+				if (expr.isSingle()) {
 					return expr.toString(event, debug) + (condition.isNegated() ? " doesn't have " : " has ") + property;
-				else
+				} else {
 					return expr.toString(event, debug) + (condition.isNegated() ? " don't have " : " have ") + property;
+				}
 			case WILL:
 				return expr.toString(event, debug) + (condition.isNegated() ? " won't " : " will ") + "be " + property;
 			default:
 				assert false;
-				throw new AssertionError();
+				return null;
 		}
 	}
+
+	@Override
+	public @NotNull Predicate<T> and(@NotNull Predicate<? super T> other) {
+		throw new UnsupportedOperationException("Combining property conditions is undefined behaviour");
+	}
+
+	@Override
+	public @NotNull Predicate<T> negate() {
+		throw new UnsupportedOperationException("Negating property conditions without setNegated is undefined behaviour");
+	}
+
+	@Override
+	public @NotNull Predicate<T> or(@NotNull Predicate<? super T> other) {
+		throw new UnsupportedOperationException("Combining property conditions is undefined behaviour");
+	}
+
 }
diff --git a/src/main/java/ch/njol/skript/config/Config.java b/src/main/java/ch/njol/skript/config/Config.java
index 621a12b1a17..82d370e1a39 100644
--- a/src/main/java/ch/njol/skript/config/Config.java
+++ b/src/main/java/ch/njol/skript/config/Config.java
@@ -1,27 +1,16 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.config;
 
 import ch.njol.skript.Skript;
 import ch.njol.skript.config.validate.SectionValidator;
+import ch.njol.skript.lang.util.common.AnyNamed;
+import ch.njol.skript.log.SkriptLogger;
+import com.google.common.base.Preconditions;
+import org.jetbrains.annotations.ApiStatus;
+import org.jetbrains.annotations.Contract;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+import org.skriptlang.skript.util.Validated;
 
-import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
@@ -30,48 +19,42 @@
 import java.lang.reflect.Modifier;
 import java.nio.channels.Channels;
 import java.nio.channels.FileChannel;
+import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.util.HashMap;
-
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import java.util.*;
 
 /**
  * Represents a config file.
- * 
- * @author Peter Güttinger
  */
-public class Config implements Comparable<Config> {
-	
-	boolean simple;
-	
+public class Config implements Comparable<Config>, Validated, NodeNavigator, AnyNamed {
+
 	/**
 	 * One level of the indentation, e.g. a tab or 4 spaces.
 	 */
 	private String indentation = "\t";
+
 	/**
 	 * The indentation's name, i.e. 'tab' or 'space'.
 	 */
 	private String indentationName = "tab";
-	
+
+	private final SectionNode main;
+
 	final String defaultSeparator;
 	String separator;
-	
+	boolean simple;
 	int level = 0;
-	
-	private final SectionNode main;
-	
 	int errors = 0;
-	
 	final boolean allowEmptySections;
-	
+
 	String fileName;
-	@Nullable
-	Path file = null;
-	
-	public Config(final InputStream source, final String fileName, @Nullable final File file, final boolean simple, final boolean allowEmptySections, final String defaultSeparator) throws IOException {
-		try {
+	@Nullable Path file = null;
+	private final Validated validator = Validated.validator();
+
+	public Config(InputStream source, String fileName, @Nullable File file,
+				  boolean simple, boolean allowEmptySections, String defaultSeparator) throws IOException {
+		try (source) {
 			this.fileName = fileName;
 			if (file != null) // Must check for null before converting to path
 				this.file = file.toPath();
@@ -79,236 +62,369 @@ public Config(final InputStream source, final String fileName, @Nullable final F
 			this.allowEmptySections = allowEmptySections;
 			this.defaultSeparator = defaultSeparator;
 			separator = defaultSeparator;
-			
+
 			if (source.available() == 0) {
 				main = new SectionNode(this);
 				Skript.warning("'" + getFileName() + "' is empty");
 				return;
 			}
-			
+
 			if (Skript.logVeryHigh())
 				Skript.info("loading '" + fileName + "'");
-			
+
 			try (ConfigReader reader = new ConfigReader(source)) {
 				main = SectionNode.load(this, reader);
 			}
-		} finally {
-			source.close();
 		}
 	}
-	
-	public Config(final InputStream source, final String fileName, final boolean simple, final boolean allowEmptySections, final String defaultSeparator) throws IOException {
+
+	public Config(InputStream source, String fileName, boolean simple,
+				  boolean allowEmptySections, String defaultSeparator) throws IOException {
 		this(source, fileName, null, simple, allowEmptySections, defaultSeparator);
 	}
-	
-	public Config(final File file, final boolean simple, final boolean allowEmptySections, final String defaultSeparator) throws IOException {
+
+	public Config(File file, boolean simple,
+				  boolean allowEmptySections, String defaultSeparator) throws IOException {
 		this(Files.newInputStream(file.toPath()), file.getName(), simple, allowEmptySections, defaultSeparator);
 		this.file = file.toPath();
 	}
-	
-	@SuppressWarnings("null")
-	public Config(final Path file, final boolean simple, final boolean allowEmptySections, final String defaultSeparator) throws IOException {
+
+	public Config(@NotNull Path file, boolean simple,
+				  boolean allowEmptySections, String defaultSeparator) throws IOException {
 		this(Channels.newInputStream(FileChannel.open(file)), "" + file.getFileName(), simple, allowEmptySections, defaultSeparator);
 		this.file = file;
 	}
-	
+
 	/**
-	 * For testing
-	 *
-	 * @param s
-	 * @param fileName
-	 * @param simple
-	 * @param allowEmptySections
-	 * @param defaultSeparator
-	 * @throws IOException
+	 * Sets all {@link Option} fields of the given object to the values from this config
+	 */
+	public void load(Object object) {
+		load(object.getClass(), object, "");
+	}
+
+	/**
+	 * A dummy config with no (known) content.
 	 */
-	public Config(final String s, final String fileName, final boolean simple, final boolean allowEmptySections, final String defaultSeparator) throws IOException {
-		this(new ByteArrayInputStream(s.getBytes(ConfigReader.UTF_8)), fileName, simple, allowEmptySections, defaultSeparator);
+	@ApiStatus.Internal
+	public Config(String fileName, @Nullable final File file) {
+		this.fileName = fileName;
+		if (file != null)
+			this.file = file.toPath();
+		this.simple = false;
+		this.allowEmptySections = false;
+		this.separator = defaultSeparator = "";
+		this.main = new SectionNode(this);
+		SkriptLogger.setNode(null); // clean-up after section node
+	}
+
+	/**
+	 * Sets all static {@link Option} fields of the given class to the values from this config
+	 */
+	public void load(Class<?> clazz) {
+		load(clazz, null, "");
+	}
+
+	private void load(Class<?> clazz, @Nullable Object object, String path) {
+		for (Field field : clazz.getDeclaredFields()) {
+			field.setAccessible(true);
+			if (object != null || Modifier.isStatic(field.getModifiers())) {
+				try {
+					if (OptionSection.class.isAssignableFrom(field.getType())) {
+						OptionSection section = (OptionSection) field.get(object);
+						@NotNull Class<?> pc = section.getClass();
+						load(pc, section, path + section.key + ".");
+					} else if (Option.class.isAssignableFrom(field.getType())) {
+						((Option<?>) field.get(object)).set(this, path);
+					}
+				} catch (IllegalArgumentException | IllegalAccessException e) {
+					assert false;
+				}
+			}
+		}
 	}
 
-	void setIndentation(final String indent) {
+	void setIndentation(String indent) {
 		assert indent != null && !indent.isEmpty() : indent;
 		indentation = indent;
-		indentationName = (indent.charAt(0) == ' ' ? "space" : "tab");
+		indentationName = indent.charAt(0) == ' ' ? "space" : "tab";
 	}
-	
+
 	String getIndentation() {
 		return indentation;
 	}
-	
+
 	String getIndentationName() {
 		return indentationName;
 	}
-	
+
 	public SectionNode getMainNode() {
 		return main;
 	}
-	
+
 	public String getFileName() {
 		return fileName;
 	}
-	
+
 	/**
 	 * Saves the config to a file.
 	 *
-	 * @param f The file to save to
+	 * @param file The file to save to
 	 * @throws IOException If the file could not be written to.
 	 */
-	public void save(final File f) throws IOException {
-		separator = defaultSeparator;
-		final PrintWriter w = new PrintWriter(f, "UTF-8");
-		try {
-			main.save(w);
-		} finally {
-			w.flush();
-			w.close();
+	public void save(File file) throws IOException {
+		this.separator = defaultSeparator;
+		try (final PrintWriter writer = new PrintWriter(file, StandardCharsets.UTF_8)) {
+			this.main.save(writer);
+			writer.flush();
 		}
 	}
-	
+
 	/**
-	 * Sets this config's values to those in the given config.
-	 * <p>
-	 * Used by Skript to import old settings into the updated config. The return value is used to not modify the config if no new options were added.
-	 *
-	 * @param other
-	 * @return Whether the configs' keys differ, i.e. false == configs only differ in values, not keys.
+	 * @deprecated This copies all values from the other config and sets them in this config,
+	 * which could be destructive for sensitive data if something goes wrong.
+	 * Also removes user comments.
+	 * Use {@link #updateNodes(Config)} instead.
 	 */
+	@Deprecated(forRemoval = true)
 	public boolean setValues(final Config other) {
 		return getMainNode().setValues(other.getMainNode());
 	}
-	
+
+	/**
+	 * @deprecated This copies all values from the other config and sets them in this config,
+	 * which could be destructive for sensitive data if something goes wrong.
+	 * Also removes user comments.
+	 * Use {@link #updateNodes(Config)} instead.
+	 */
+	@Deprecated(forRemoval = true)
 	public boolean setValues(final Config other, final String... excluded) {
 		return getMainNode().setValues(other.getMainNode(), excluded);
 	}
 
 	/**
-	 * Compares the keys and values of this Config and another.
-	 * @param other The other Config.
-	 * @param excluded Keys to exclude from this comparison.
-	 * @return True if there are differences in the keys and their values
-	 *  of this Config and the other Config.
+	 * Updates the nodes of this config with the nodes of another config.
+	 * Used for updating a config file to a newer version.
+	 * <p>
+	 * This method only sets nodes that are missing in this config, thus preserving any existing values.
+	 * </p>
+	 *
+	 * @param newer The newer config to update from.
+	 * @return True if any keys were added to this config, false otherwise.
 	 */
-	public boolean compareValues(Config other, String... excluded) {
-		return getMainNode().compareValues(other.getMainNode(), excluded);
-	}
-	
-	@Nullable
-	public File getFile() {
-		if (file != null) {
-			try {
-				return file.toFile();
-			} catch (Exception e) {
-				return null; // ZipPath, for example, throws undocumented exception
+	public boolean updateNodes(@NotNull Config newer) {
+		Skript.debug("Updating config %s", newer.getFileName());
+		Set<Node> newNodes = discoverNodes(newer.getMainNode());
+		Set<Node> oldNodes = discoverNodes(getMainNode());
+
+		// find the nodes that are in the new config but not in the old one
+		newNodes.removeAll(oldNodes);
+		Set<Node> nodesToUpdate = new LinkedHashSet<>(newNodes);
+
+		if (nodesToUpdate.isEmpty())
+			return false;
+
+		for (Node node : nodesToUpdate) {
+			/*
+			 prevents nodes that are already in the config from being added again
+			 this happens when section nodes are added to the config, as their children
+			 are also carried over from the new config, but are also in 'nodesToUpdate'
+
+			 example:
+			 nodesToUpdate is this
+			 - x
+			 - x.y
+			 - x.z
+
+			 and if the method adds x, since x has children in the new config,
+			 it'll add the children to the to-be-updated config, so it'll add
+			 x:
+			   y: 'whatever'
+			   z: 'whatever'
+
+			 but it also wants to add x.y since that node previously did not exist,
+			 but now it does, so it duplicates it without that if statement
+			 x:
+			  y: 'whatever'
+			  y: 'whatever'
+			  z: 'whatever'
+			*/
+			if (get(node.getPathSteps()) != null)
+				continue;
+
+			Skript.debug("Updating node %s", node);
+			SectionNode newParent = node.getParent();
+			Preconditions.checkNotNull(newParent);
+
+			SectionNode parent = getNode(newParent.getPathSteps());
+			Preconditions.checkNotNull(parent);
+
+			int index = node.getIndex();
+			if (index >= parent.size()) {
+				// in case we have some user-added comments or something goes wrong, to ensure index is within bounds
+
+				Skript.debug("Adding node %s to %s (size mismatch)", node, parent);
+				parent.add(node);
+				continue;
+			}
+
+			Node existing = parent.getAt(index);
+			if (existing != null) {
+				// there's already something at the node we want to add the new node
+
+				Skript.debug("Adding node %s to %s at index %s", node, parent, index);
+				parent.add(index, node);
+			} else {
+				// there's nothing at the index we want to add the new node
+
+				Skript.debug("Adding node %s to %s", node, parent);
+				parent.add(node);
 			}
 		}
-		return null;
+		return true;
 	}
-	
-	@Nullable
-	public Path getPath() {
-		return file;
+
+	/**
+	 * Recursively finds <i>all</i> nodes in a section node, including other
+	 * section nodes, entry nodes, and void nodes.
+	 *
+	 * @param node The parent node to search.
+	 * @return A set of the discovered nodes, guaranteed to be in the order of discovery.
+	 */
+	@Contract(pure = true)
+	static @NotNull Set<Node> discoverNodes(@NotNull SectionNode node) {
+		Set<Node> nodes = new LinkedHashSet<>();
+
+		for (Iterator<Node> iterator = node.fullIterator(); iterator.hasNext(); ) {
+			Node child = iterator.next();
+			if (child instanceof SectionNode sectionChild) {
+				nodes.add(child);
+				nodes.addAll(discoverNodes(sectionChild));
+			} else if (child instanceof EntryNode || child instanceof VoidNode) {
+				nodes.add(child);
+			}
+		}
+		return nodes;
 	}
-	
+
 	/**
-	 * @return The most recent separator. Only useful while the file is loading.
+	 * Returns the {@link SectionNode} at the given path from the root,
+	 * where {@code path} is an array of keys to traverse.
+	 *
+	 * @param path The path to the node.
+	 * @return The {@link SectionNode} at the given path.
 	 */
-	public String getSeparator() {
-		return separator;
+	private SectionNode getNode(String... path) {
+		SectionNode node = getMainNode();
+		for (String key : path) {
+			Node child = node.get(key);
+
+			if (child instanceof SectionNode sectionNode) {
+				node = sectionNode;
+			} else {
+				return node;
+			}
+		}
+		return node;
 	}
-	
+
 	/**
-	 * @return A separator string useful for saving, e.g. ": " or " = ".
+	 * Compares the keys and values of this Config and another.
+	 *
+	 * @param other    The other Config.
+	 * @param excluded Keys to exclude from this comparison.
+	 * @return True if there are differences in the keys and their values
+	 * of this Config and the other Config.
 	 */
-	public String getSaveSeparator() {
-		if (separator.equals(":"))
-			return ": ";
-		if (separator.equals("="))
-			return " = ";
-		return " " + separator + " ";
+	public boolean compareValues(Config other, String... excluded) {
+		return getMainNode().compareValues(other.getMainNode(), excluded);
 	}
-	
+
 	/**
 	 * Splits the given path at the dot character and passes the result to {@link #get(String...)}.
 	 *
 	 * @param path
 	 * @return <tt>get(path.split("\\."))</tt>
 	 */
-	@SuppressWarnings("null")
-	@Nullable
-	public String getByPath(final String path) {
+	public @Nullable String getByPath(@NotNull String path) {
 		return get(path.split("\\."));
 	}
-	
+
 	/**
 	 * Gets an entry node's value at the designated path
 	 *
 	 * @param path
 	 * @return The entry node's value at the location defined by path or null if it either doesn't exist or is not an entry.
 	 */
-	@Nullable
-	public String get(final String... path) {
+	public @Nullable String get(String... path) {
 		SectionNode section = main;
 		for (int i = 0; i < path.length; i++) {
-			final Node n = section.get(path[i]);
-			if (n == null)
+			Node node = section.get(path[i]);
+			if (node == null)
 				return null;
-			if (n instanceof SectionNode) {
+			if (node instanceof SectionNode sectionNode) {
 				if (i == path.length - 1)
 					return null;
-				section = (SectionNode) n;
+				section = sectionNode;
 			} else {
-				if (n instanceof EntryNode && i == path.length - 1)
-					return ((EntryNode) n).getValue();
+				if (node instanceof EntryNode entryNode && i == path.length - 1)
+					return entryNode.getValue();
 				else
 					return null;
 			}
 		}
 		return null;
 	}
-	
-	public boolean isEmpty() {
-		return main.isEmpty();
-	}
-	
-	public HashMap<String, String> toMap(final String separator) {
+
+	public Map<String, String> toMap(String separator) {
 		return main.toMap("", separator);
 	}
-	
-	public boolean validate(final SectionValidator validator) {
+
+	public boolean validate(SectionValidator validator) {
 		return validator.validate(getMainNode());
 	}
-	
-	private void load(final Class<?> cls, final @Nullable Object object, final String path) {
-		for (final Field field : cls.getDeclaredFields()) {
-			field.setAccessible(true);
-			if (object != null || Modifier.isStatic(field.getModifiers())) {
-				try {
-					if (OptionSection.class.isAssignableFrom(field.getType())) {
-						final OptionSection section = (OptionSection) field.get(object);
-						@NotNull final Class<?> pc = section.getClass();
-						load(pc, section, path + section.key + ".");
-					} else if (Option.class.isAssignableFrom(field.getType())) {
-						((Option<?>) field.get(object)).set(this, path);
-					}
-				} catch (final IllegalArgumentException | IllegalAccessException e) {
-					assert false;
-				}
-			}
+
+	/**
+	 * @return Whether the config is empty.
+	 */
+	public boolean isEmpty() {
+		return main.isEmpty();
+	}
+
+	/**
+	 * @return The file this config was loaded from, or null if it was loaded from an InputStream.
+	 */
+	public @Nullable File getFile() {
+		if (file == null)
+			return null;
+
+		try {
+			return file.toFile();
+		} catch (Exception e) {
+			return null; // ZipPath, for example, throws undocumented exception
 		}
 	}
-	
+
 	/**
-	 * Sets all {@link Option} fields of the given object to the values from this config
+	 * @return The path this config was loaded from, or null if it was loaded from an InputStream.
 	 */
-	public void load(final Object o) {
-		load(o.getClass(), o, "");
+	public @Nullable Path getPath() {
+		return file;
 	}
-	
+
 	/**
-	 * Sets all static {@link Option} fields of the given class to the values from this config
+	 * @return The most recent separator. Only useful while the file is loading.
 	 */
-	public void load(final Class<?> c) {
-		load(c, null, "");
+	public String getSeparator() {
+		return separator;
+	}
+
+	/**
+	 * @return A separator string useful for saving, e.g. ": ".
+	 */
+	public String getSaveSeparator() {
+		if (separator.equals(":"))
+			return ": ";
+		return " " + separator + " ";
 	}
 
 	@Override
@@ -317,5 +433,51 @@ public int compareTo(@Nullable Config other) {
 			return 0;
 		return fileName.compareTo(other.fileName);
 	}
-	
+
+	@Override
+	public void invalidate() {
+		this.validator.invalidate();
+	}
+
+	@Override
+	public boolean valid() {
+		return validator.valid();
+	}
+
+	@Override
+	public @NotNull Node getCurrentNode() {
+		return main;
+	}
+
+	@Override
+	public @Nullable Node getNodeAt(@NotNull String @NotNull ... steps) {
+		return main.getNodeAt(steps);
+	}
+
+	@NotNull
+	@Override
+	public Iterator<Node> iterator() {
+		return main.iterator();
+	}
+
+	@Override
+	public @Nullable Node get(String step) {
+		return main.get(step);
+	}
+
+	/**
+	 * @return The name of this config (excluding path and file extensions)
+	 */
+	@Override
+	public String name() {
+		String name = this.getFileName();
+		if (name == null)
+			return null;
+		if (name.contains(File.separator))
+			name = name.substring(name.lastIndexOf(File.separator) + 1);
+		if (name.contains("."))
+			return name.substring(0, name.lastIndexOf('.'));
+		return name;
+	}
+
 }
diff --git a/src/main/java/ch/njol/skript/config/ConfigReader.java b/src/main/java/ch/njol/skript/config/ConfigReader.java
index 8891efd3d6b..c81e755d6b5 100644
--- a/src/main/java/ch/njol/skript/config/ConfigReader.java
+++ b/src/main/java/ch/njol/skript/config/ConfigReader.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.config;
 
 import java.io.BufferedReader;
diff --git a/src/main/java/ch/njol/skript/config/EntryNode.java b/src/main/java/ch/njol/skript/config/EntryNode.java
index 93a84ffa5a0..67faa517d7f 100644
--- a/src/main/java/ch/njol/skript/config/EntryNode.java
+++ b/src/main/java/ch/njol/skript/config/EntryNode.java
@@ -1,55 +1,47 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.config;
 
+import java.util.Arrays;
 import java.util.Map.Entry;
+import java.util.Objects;
 
+import ch.njol.skript.lang.util.common.AnyValued;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
+import org.jetbrains.annotations.UnknownNullability;
 
 /**
  * @author Peter Güttinger
  */
-public class EntryNode extends Node implements Entry<String, String> {
-	
+public class EntryNode extends Node implements Entry<String, String>, AnyValued<String> {
+
 	private String value;
-	
+
 	public EntryNode(final String key, final String value, final String comment, final SectionNode parent, final int lineNum) {
 		super(key, comment, parent, lineNum);
 		this.value = value;
 	}
-	
+
 	public EntryNode(final String key, final String value, final SectionNode parent) {
 		super(key, parent);
 		this.value = value;
 	}
-	
+
 	@SuppressWarnings("null")
 	@Override
 	public String getKey() {
 		return key;
 	}
-	
+
 	@Override
 	public String getValue() {
 		return value;
 	}
-	
+
+	@Override
+	public @UnknownNullability String value() {
+		return this.getValue();
+	}
+
 	@Override
 	public String setValue(final @Nullable String v) {
 		if (v == null)
@@ -58,10 +50,46 @@ public String setValue(final @Nullable String v) {
 		value = v;
 		return r;
 	}
-	
+
+	@Override
+	public void changeValue(String value) throws UnsupportedOperationException {
+		this.setValue(value);
+	}
+
+	@Override
+	public Class<String> valueType() {
+		return String.class;
+	}
+
+	@Override
+	public boolean supportsValueChange() {
+		return false; // todo editable configs soon
+	}
+
 	@Override
 	String save_i() {
 		return key + config.getSaveSeparator() + value;
 	}
-	
+
+	@Override
+	public @Nullable Node get(String step) {
+		return null;
+	}
+
+	@Override
+	public boolean equals(Object object) {
+		if (!(object instanceof EntryNode other))
+			return false;
+
+		// ignores comment as changing the comment would create
+		// a new node which may change the value, leading to
+		// unexpected config changes for the user
+		return Arrays.equals(this.getPathSteps(), other.getPathSteps());
+	}
+
+	@Override
+	public int hashCode() {
+		return Arrays.hashCode(this.getPathSteps());
+	}
+
 }
diff --git a/src/main/java/ch/njol/skript/config/EnumParser.java b/src/main/java/ch/njol/skript/config/EnumParser.java
index 132c7284c0a..3e40e2e0d1b 100644
--- a/src/main/java/ch/njol/skript/config/EnumParser.java
+++ b/src/main/java/ch/njol/skript/config/EnumParser.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.config;
 
 import java.util.Locale;
diff --git a/src/main/java/ch/njol/skript/config/InvalidNode.java b/src/main/java/ch/njol/skript/config/InvalidNode.java
index 20922c9413f..b858417bfe6 100644
--- a/src/main/java/ch/njol/skript/config/InvalidNode.java
+++ b/src/main/java/ch/njol/skript/config/InvalidNode.java
@@ -1,38 +1,20 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.config;
 
 /**
  * A line of a config that could not be parsed.
- * 
+ *
  * @author Peter Güttinger
  */
 public class InvalidNode extends VoidNode {
-	
+
 //	public InvalidNode(final SectionNode parent, final ConfigReader r) {
 //		super(parent, r);
 //		config.errors++;
 //	}
-	
+
 	public InvalidNode(final String value, final String comment, final SectionNode parent, final int lineNum) {
 		super(value, comment, parent, lineNum);
 		config.errors++;
 	}
-	
+
 }
diff --git a/src/main/java/ch/njol/skript/config/Node.java b/src/main/java/ch/njol/skript/config/Node.java
index 65504aa5526..f7002456f20 100644
--- a/src/main/java/ch/njol/skript/config/Node.java
+++ b/src/main/java/ch/njol/skript/config/Node.java
@@ -1,61 +1,40 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.config;
 
-import java.io.PrintWriter;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import ch.njol.skript.SkriptConfig;
-import org.jetbrains.annotations.Nullable;
-
 import ch.njol.skript.Skript;
+import ch.njol.skript.lang.util.common.AnyNamed;
 import ch.njol.skript.log.SkriptLogger;
 import ch.njol.util.NonNullPair;
 import ch.njol.util.StringUtils;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+import org.skriptlang.skript.util.Validated;
+
+import java.io.PrintWriter;
+import java.util.*;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+public abstract class Node implements AnyNamed, Validated, NodeNavigator {
 
-/**
- * @author Peter Güttinger
- */
-public abstract class Node {
-	
 	@Nullable
 	protected String key;
-	
+
 	protected String comment = "";
-	
+
 	protected final int lineNum;
-	
+
 	private final boolean debug;
-	
+
 	@Nullable
 	protected SectionNode parent;
 	protected Config config;
-	
+
 //	protected Node() {
 //		key = null;
 //		debug = false;
 //		lineNum = -1;
 //		SkriptLogger.setNode(this);
 //	}
-	
+
 	protected Node(final Config c) {
 		key = null;
 		debug = false;
@@ -63,7 +42,7 @@ protected Node(final Config c) {
 		config = c;
 		SkriptLogger.setNode(this);
 	}
-	
+
 	protected Node(final String key, final SectionNode parent) {
 		this.key = key;
 		debug = false;
@@ -72,7 +51,7 @@ protected Node(final String key, final SectionNode parent) {
 		config = parent.getConfig();
 		SkriptLogger.setNode(this);
 	}
-	
+
 	protected Node(final String key, final String comment, final SectionNode parent, final int lineNum) {
 		this.key = key;
 		this.comment = comment;
@@ -82,7 +61,7 @@ protected Node(final String key, final String comment, final SectionNode parent,
 		config = parent.getConfig();
 		SkriptLogger.setNode(this);
 	}
-	
+
 //	protected Node(final String key, final SectionNode parent, final ConfigReader r) {
 //		this(key, parent, r.getLine(), r.getLineNum());
 //	}
@@ -94,11 +73,11 @@ protected Node(final String key, final String comment, final SectionNode parent,
 	public String getKey() {
 		return key;
 	}
-	
+
 	public final Config getConfig() {
 		return config;
 	}
-	
+
 	public void rename(final String newname) {
 		if (key == null)
 			throw new IllegalStateException("can't rename an anonymous node");
@@ -107,7 +86,7 @@ public void rename(final String newname) {
 		if (parent != null)
 			parent.renamed(this, oldKey);
 	}
-	
+
 	public void move(final SectionNode newParent) {
 		final SectionNode p = parent;
 		if (p == null)
@@ -134,7 +113,7 @@ public static NonNullPair<String, String> splitLine(String line) {
 	 * <p>
 	 * Whitespace is preserved (whitespace in front of the comment is added to the value), and any ## not in quoted strings in the value are replaced by a single #. The comment is returned with a
 	 * leading #, except if there is no comment in which case it will be the empty string.
-	 * 
+	 *
 	 * @param line the line to split
 	 * @param inBlockComment Whether we are currently inside a block comment
 	 * @return A pair (value, comment).
@@ -238,39 +217,39 @@ private static SplitLineState update(char c, SplitLineState state, SplitLineStat
 			return state;
 		}
 	}
-	
+
 	static void handleNodeStackOverflow(StackOverflowError e, String line) {
 		Node n = SkriptLogger.getNode();
 		SkriptLogger.setNode(null); // Avoid duplicating the which node error occurred in parentheses on every error message
-		
+
 		Skript.error("There was a StackOverFlowError occurred when loading a node. This maybe from your scripts, aliases or Skript configuration.");
 		Skript.error("Please make your script lines shorter! Do NOT report this to SkriptLang unless it occurs with a short script line or built-in aliases!");
-		
+
 		Skript.error("");
 		Skript.error("Updating your Java and/or using respective 64-bit versions for your operating system may also help and is always a good practice.");
 		Skript.error("If it is still not fixed, try moderately increasing the thread stack size (-Xss flag) in your startup script.");
 		Skript.error("");
 		Skript.error("Using a different Java Virtual Machine (JVM) like OpenJ9 or GraalVM may also help; though be aware that not all plugins may support them.");
 		Skript.error("");
-		
+
 		Skript.error("Line that caused the issue:");
-		
+
 		// Print the line caused the issue for diagnosing (will be very long most probably), in case of someone pasting this in an issue and not providing the code.
 		Skript.error(line);
-		
+
 		// If testing (assertions enabled) - print the whole stack trace.
 		if (Skript.testing()) {
 			Skript.exception(e);
 		}
-		
+
 		SkriptLogger.setNode(n); // Revert the node back
 	}
-	
+
 	@Nullable
 	protected String getComment() {
 		return comment;
 	}
-	
+
 	int getLevel() {
 		int l = 0;
 		Node n = this;
@@ -279,20 +258,20 @@ int getLevel() {
 		}
 		return Math.max(0, l - 1);
 	}
-	
+
 	protected String getIndentation() {
 		return StringUtils.multiply(config.getIndentation(), getLevel());
 	}
-	
+
 	/**
 	 * @return String to save this node as. The correct indentation and the comment will be added automatically, as well as all '#'s will be escaped.
 	 */
 	abstract String save_i();
-	
+
 	public final String save() {
 		return getIndentation() + escapeUnquotedHashtags(save_i()) + comment;
 	}
-	
+
 	public void save(final PrintWriter w) {
 		w.println(save());
 	}
@@ -327,12 +306,12 @@ private static String escapeUnquotedHashtags(String input) {
 		return output.toString();
 	}
 
-	
+
 	@Nullable
 	public SectionNode getParent() {
 		return parent;
 	}
-	
+
 	/**
 	 * Removes this node from its parent. Does nothing if this node does not have a parent node.
 	 */
@@ -342,21 +321,21 @@ public void remove() {
 			return;
 		p.remove(this);
 	}
-	
+
 	/**
 	 * @return Original line of this node at the time it was loaded. <tt>-1</tt> if this node was created dynamically.
 	 */
 	public int getLine() {
 		return lineNum;
 	}
-	
+
 	/**
 	 * @return Whether this node does not hold information (i.e. is empty or invalid)
 	 */
 	public boolean isVoid() {
 		return this instanceof VoidNode;// || this instanceof ParseOptionNode;
 	}
-	
+
 //	/**
 //	 * get a node via path:to:the:node. relative paths are possible by starting with a ':'; a double colon '::' will go up a node.<br/>
 //	 * selecting the n-th node can be done with #n.
@@ -409,7 +388,7 @@ public boolean isVoid() {
 //		}
 //		return n;
 //	}
-	
+
 	/**
 	 * returns information about this node which looks like the following:<br/>
 	 * <code>node value #including comments (config.sk, line xyz)</code>
@@ -422,9 +401,108 @@ public String toString() {
 			+ (comment.isEmpty() ? "" : " " + comment)
 			+ " (" + config.getFileName() + ", " + (lineNum == -1 ? "unknown line" : "line " + lineNum) + ")";
 	}
-	
+
 	public boolean debug() {
 		return debug;
 	}
-	
+
+	@Override
+	public void invalidate() throws UnsupportedOperationException {
+		throw new UnsupportedOperationException();
+	}
+
+	@Override
+	public boolean valid() {
+		//noinspection ConstantValue
+		return config != null && config.valid();
+	}
+
+	public @Nullable String getPath() {
+		if (key == null)
+			return null;
+		if (parent == null)
+			return key;
+		@Nullable String path = parent.getPath();
+		if (path == null)
+			return key;
+		return path + '.' + key;
+	}
+
+	@Override
+	public @NotNull Node getCurrentNode() {
+		return this;
+	}
+
+
+	/**
+	 * @return The index of this node relative to the other children of this node's parent,
+	 * or -1 if this node does not have a parent. The index includes counted void nodes.
+	 */
+	int getIndex() {
+		if (parent == null)
+			return -1;
+
+		int index = 0;
+		for (Iterator<Node> iterator = parent.fullIterator(); iterator.hasNext(); ) {
+			Node node = iterator.next();
+			if (node == this)
+				return index;
+
+			index++;
+		}
+		return -1;
+	}
+
+	/**
+	 * Returns the node names in the path to this node from the config root.
+	 * If this is not a section node, returns the path to its parent node.
+	 *
+	 * <p>
+	 * Getting the path of node {@code z} in the following example would
+	 * return an array with {@code w.x, y, z}.
+	 * <pre>
+	 *     w.x:
+	 *      y:
+	 *       z: true # this node
+	 * </pre></p>
+	 *
+	 * @return The path to this node in the config file.
+	 */
+	public @NotNull String[] getPathSteps() {
+		List<String> path = new ArrayList<>();
+		Node node = this;
+
+		while (node != null) {
+			if (node.getKey() == null || node.getKey().isEmpty())
+				break;
+
+			path.add(0, node.getKey());
+			node = node.getParent();
+		}
+
+		if (path.isEmpty())
+			return new String[0];
+
+		return path.toArray(new String[0]);
+	}
+
+	@Override
+	public @Nullable String name() {
+		return this.getKey();
+	}
+
+	@Override
+	public boolean equals(Object object) {
+		if (!(object instanceof Node other))
+			return false;
+
+		return Arrays.equals(this.getPathSteps(), other.getPathSteps()) // for entry/section nodes
+			&& Objects.equals(comment, other.comment); // for void nodes
+	}
+
+	@Override
+	public int hashCode() {
+		return Objects.hash(Arrays.hashCode(this.getPathSteps()), comment);
+	}
+
 }
diff --git a/src/main/java/ch/njol/skript/config/NodeMap.java b/src/main/java/ch/njol/skript/config/NodeMap.java
index aa45b1490c8..43d0bba521e 100644
--- a/src/main/java/ch/njol/skript/config/NodeMap.java
+++ b/src/main/java/ch/njol/skript/config/NodeMap.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.config;
 
 import java.util.HashMap;
diff --git a/src/main/java/ch/njol/skript/config/NodeNavigator.java b/src/main/java/ch/njol/skript/config/NodeNavigator.java
new file mode 100644
index 00000000000..7b7816c6e0b
--- /dev/null
+++ b/src/main/java/ch/njol/skript/config/NodeNavigator.java
@@ -0,0 +1,119 @@
+package ch.njol.skript.config;
+
+import org.jetbrains.annotations.Contract;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.Collections;
+import java.util.Iterator;
+
+/**
+ * Something that contains or references nodes and can be navigated.
+ * Not all navigation options are universally-supported.
+ * <br/><br/>
+ * All nodes are node navigators, even if they are {@link EntryNode}s that do not support
+ * children.
+ * Entry nodes will return {@code null} for all child-based operations
+ * (as if the requested node was simply not present).
+ */
+public interface NodeNavigator extends Iterable<Node> {
+
+	/**
+	 * If this navigator represents a node with no children (e.g. an entry node)
+	 * this iterator will be empty.
+	 *
+	 * @return An iterator for all children represented by this node navigator
+	 */
+	default Iterator<Node> iterator() {
+		return Collections.emptyIterator();
+	}
+
+	/**
+	 * Obtains the immediate child node at this (direct) key.
+	 * If this does not represent a node that can have children (e.g. an {@link EntryNode}) then
+	 * it <em>must</em> return {@code null}.
+	 *
+	 * @param key The name of the node
+	 * @return The child node if one is present, otherwise {@code null}
+	 */
+	@Nullable Node get(String key);
+
+	/**
+	 * Obtains the current node represented by this navigator.
+	 * If this navigator is itself a node, it should return itself.
+	 *
+	 * @return The main node represented by this navigator
+	 */
+	@NotNull Node getCurrentNode();
+
+	/**
+	 * Fetches a node at position {@param steps} inside the current node.
+	 * If any stage represents a node with no children (e.g. an entry node)
+	 * the result will be null.
+	 * <br/><br/>
+	 * In the following example, the two entry nodes can be obtained from the root with
+	 * {@code "first", "one"} and {@code "first", "two", "three"} (respectively).
+	 * <pre>{@code
+	 * first:
+	 * 	one: value
+	 * 	two:
+	 * 		three: value
+	 * }</pre>
+	 *
+	 * @param steps The node steps to traverse
+	 * @return The node at the final step (or nothing)
+	 */
+	default @Nullable Node getNodeAt(@NotNull String @NotNull... steps) {
+		Node node = this.getCurrentNode();
+		for (String step : steps) {
+			if (node == null)
+				return null;
+			node = node.get(step);
+		}
+		return node;
+	}
+
+	/**
+	 * Fetches a node at a path inside the current node.
+	 * If any stage represents a node with no children (e.g. an entry node)
+	 * the result will be null.
+	 * <br/><br/>
+	 * In the following example, the two entry nodes can be obtained from the root with
+	 * {@code "first.one"} and {@code "first.two.three"} (respectively).
+	 * <pre>{@code
+	 * first:
+	 * 	one: value
+	 * 	two:
+	 * 		three: value
+	 * }</pre>
+	 * <br/><br/>
+	 * If the path is {@code null} or empty, this node will be returned.
+	 *
+	 * @see	#getNodeAt(String...)
+	 * @param path The path to the node, separated by {@code .}
+	 * @return The node at the path (or nothing)
+	 */
+	@Contract("null -> this")
+	default @Nullable Node getNodeAt(@Nullable String path) {
+		if (path == null || path.isEmpty())
+			return this.getCurrentNode();
+		if (!path.contains("."))
+			return this.getNodeAt(new String[]{path});
+		return this.getNodeAt(path.split("\\."));
+	}
+
+	/**
+	 * Gets the raw value from the node at the given path.
+	 * If any part of the path is invalid, this will return null.
+	 *
+	 * @param path The node path from which to get the value
+	 * @return If such a node exists, its value, otherwise null
+	 */
+	default @Nullable String getValue(String path) {
+		@Nullable Node node = this.getNodeAt(path);
+		if (node instanceof EntryNode entryNode)
+			return entryNode.getValue();
+		return null;
+	}
+
+}
diff --git a/src/main/java/ch/njol/skript/config/Option.java b/src/main/java/ch/njol/skript/config/Option.java
index e1f3e441573..e918f715394 100644
--- a/src/main/java/ch/njol/skript/config/Option.java
+++ b/src/main/java/ch/njol/skript/config/Option.java
@@ -1,33 +1,32 @@
 package ch.njol.skript.config;
 
+import java.util.Locale;
+import java.util.function.Consumer;
 import ch.njol.skript.Skript;
 import ch.njol.skript.classes.ClassInfo;
 import ch.njol.skript.classes.Parser;
 import ch.njol.skript.lang.ParseContext;
 import ch.njol.skript.registrations.Classes;
-import ch.njol.util.Setter;
 import org.jetbrains.annotations.Nullable;
 import org.skriptlang.skript.lang.converter.Converter;
 
 import java.util.Locale;
+import java.util.function.Consumer;
 
-/**
- * @author Peter Güttinger
- */
 public class Option<T> {
-	
+
 	public final String key;
 	private boolean optional = false;
-	
+
 	@Nullable
 	private String value = null;
 	private final Converter<String, ? extends T> parser;
 	private final T defaultValue;
 	private T parsedValue;
-	
+
 	@Nullable
-	private Setter<? super T> setter;
-	
+	private Consumer<? super T> setter;
+
 	public Option(final String key, final T defaultValue) {
 		this.key = "" + key.toLowerCase(Locale.ENGLISH);
 		this.defaultValue = defaultValue;
@@ -35,13 +34,7 @@ public Option(final String key, final T defaultValue) {
 		@SuppressWarnings("unchecked")
 		final Class<T> c = (Class<T>) defaultValue.getClass();
 		if (c == String.class) {
-			parser = new Converter<String, T>() {
-				@SuppressWarnings("unchecked")
-				@Override
-				public T convert(final String s) {
-					return (T) s;
-				}
-			};
+			parser = (Converter<String, T>) s -> (T) s;
 		} else {
 			final ClassInfo<T> ci = Classes.getExactClassInfo(c);
 			final Parser<? extends T> p;
@@ -60,24 +53,24 @@ public T convert(final String s) {
 			};
 		}
 	}
-	
+
 	public Option(final String key, final T defaultValue, final Converter<String, ? extends T> parser) {
 		this.key = "" + key.toLowerCase(Locale.ENGLISH);
 		this.defaultValue = defaultValue;
 		parsedValue = defaultValue;
 		this.parser = parser;
 	}
-	
-	public final Option<T> setter(final Setter<? super T> setter) {
+
+	public final Option<T> setter(final Consumer<? super T> setter) {
 		this.setter = setter;
 		return this;
 	}
-	
+
 	public final Option<T> optional(final boolean optional) {
 		this.optional = optional;
 		return this;
 	}
-	
+
 	public final void set(final Config config, final String path) {
 		final String oldValue = value;
 		value = config.getByPath(path + key);
@@ -91,12 +84,12 @@ public final void set(final Config config, final String path) {
 			onValueChange();
 		}
 	}
-	
+
 	protected void onValueChange() {
 		if (setter != null)
-			setter.set(parsedValue);
+			setter.accept(parsedValue);
 	}
-	
+
 	public final T value() {
 		return parsedValue;
 	}
@@ -104,9 +97,9 @@ public final T value() {
 	public final T defaultValue() {
 		return defaultValue;
 	}
-	
+
 	public final boolean isOptional() {
 		return optional;
 	}
-	
+
 }
diff --git a/src/main/java/ch/njol/skript/config/OptionSection.java b/src/main/java/ch/njol/skript/config/OptionSection.java
index 7d87ff7a10d..be2417d81f1 100644
--- a/src/main/java/ch/njol/skript/config/OptionSection.java
+++ b/src/main/java/ch/njol/skript/config/OptionSection.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.config;
 
 import java.lang.reflect.Field;
diff --git a/src/main/java/ch/njol/skript/config/SectionNode.java b/src/main/java/ch/njol/skript/config/SectionNode.java
index 8ccc97be625..14309d7d6b2 100644
--- a/src/main/java/ch/njol/skript/config/SectionNode.java
+++ b/src/main/java/ch/njol/skript/config/SectionNode.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.config;
 
 import ch.njol.skript.Skript;
@@ -24,17 +6,15 @@
 import ch.njol.skript.config.validate.SectionValidator;
 import ch.njol.skript.log.SkriptLogger;
 import ch.njol.util.NonNullPair;
-import ch.njol.util.NullableChecker;
 import ch.njol.util.coll.CollectionUtils;
 import ch.njol.util.coll.iterator.CheckedIterator;
+import com.google.common.base.Preconditions;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.io.IOException;
 import java.io.PrintWriter;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
+import java.util.*;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.regex.Pattern;
 
@@ -42,23 +22,23 @@
  * @author Peter Güttinger
  */
 public class SectionNode extends Node implements Iterable<Node> {
-	
+
 	private final ArrayList<Node> nodes = new ArrayList<>();
-	
+
 	public SectionNode(final String key, final String comment, final SectionNode parent, final int lineNum) {
 		super(key, comment, parent, lineNum);
 	}
-	
+
 	SectionNode(final Config c) {
 		super(c);
 	}
-	
+
 	/**
 	 * Note to self: use getNodeMap()
 	 */
 	@Nullable
 	private NodeMap nodeMap = null;
-	
+
 	private NodeMap getNodeMap() {
 		NodeMap nodeMap = this.nodeMap;
 		if (nodeMap == null) {
@@ -70,17 +50,17 @@ private NodeMap getNodeMap() {
 		}
 		return nodeMap;
 	}
-	
+
 	/**
 	 * @return Total amount of nodes (including void nodes) in this section.
 	 */
 	public int size() {
 		return nodes.size();
 	}
-	
+
 	/**
 	 * Adds the given node at the end of this section.
-	 * 
+	 *
 	 * @param n
 	 */
 	public void add(final Node n) {
@@ -90,23 +70,34 @@ public void add(final Node n) {
 		n.config = config;
 		getNodeMap().put(n);
 	}
-	
+
 	/**
-	 * Inserts the given node into this section at the specified position.
-	 * 
-	 * @param n
-	 * @param index between 0 and {@link #size()}, inclusive
+	 * Inserts {@code node} into this section at the specified position.
+	 *
+	 * @param node  The node to insert
+	 * @param index The index, between 0 and {@link #size()} (inclusive), at which to insert the node
 	 */
-	public void insert(final Node n, final int index) {
-		nodes.add(index, n);
-		n.parent = this;
-		n.config = config;
-		getNodeMap().put(n);
+	public void add(int index, @NotNull Node node) {
+		Preconditions.checkArgument(index >= 0 && index <= size(), "index out of bounds: %s", index);
+
+		node.remove();
+		nodes.add(index, node);
+		node.parent = this;
+		node.config = config;
+		getNodeMap().put(node);
+	}
+
+	/**
+	 * @deprecated Use {@link #add(int, Node)} instead.
+	 */
+	@Deprecated(forRemoval = true)
+	public void insert(Node node, int index) {
+		add(index, node);
 	}
-	
+
 	/**
 	 * Removes the given node from this section.
-	 * 
+	 *
 	 * @param n
 	 */
 	public void remove(final Node n) {
@@ -114,10 +105,10 @@ public void remove(final Node n) {
 		n.parent = null;
 		getNodeMap().remove(n);
 	}
-	
+
 	/**
 	 * Removes an entry with the given key.
-	 * 
+	 *
 	 * @param key
 	 * @return The removed node, or null if the key didn't match any node.
 	 */
@@ -130,47 +121,59 @@ public Node remove(final String key) {
 		n.parent = null;
 		return n;
 	}
-	
+
+	/**
+	 * Gets the node at the specified index. May be null.
+	 * The index includes all nodes, including void nodes.
+	 *
+	 * @param index The index of the node to get
+	 * @return The node at the specified index. May be null.
+	 * @throws IllegalArgumentException if the index is out of bounds
+	 */
+	@Nullable Node getAt(int index) {
+		Preconditions.checkArgument(index >= 0 && index < size(), "index out of bounds: %s", index);
+		return nodes.get(index);
+	}
+
 	/**
-	 * Iterator over all non-void nodes of this section.
+	 * @return An iterator over all non-void nodes in this section.
 	 */
 	@Override
-	public Iterator<Node> iterator() {
-		@SuppressWarnings("null")
-		@NotNull
-		final Iterator<Node> iter = nodes.iterator();
-		return new CheckedIterator<Node>(iter, new NullableChecker<Node>() {
-			@Override
-			public boolean check(final @Nullable Node n) {
-				return n != null && !n.isVoid();
-			}
-		}) {
+	public @NotNull Iterator<Node> iterator() {
+		//noinspection ConstantConditions - Null check is present in fullIterator()
+		return new CheckedIterator<>(fullIterator(), n -> !n.isVoid());
+	}
+
+	/**
+	 * @return An iterator over all nodes in this section, including void nodes.
+	 */
+	public @NotNull Iterator<Node> fullIterator() {
+		return new CheckedIterator<>(nodes.iterator(), Objects::nonNull) {
 			@Override
 			public boolean hasNext() {
-				final boolean hasNext = super.hasNext();
+				boolean hasNext = super.hasNext();
 				if (!hasNext)
 					SkriptLogger.setNode(SectionNode.this);
 				return hasNext;
 			}
-			
+
 			@Override
-			@Nullable
-			public Node next() {
-				final Node n = super.next();
-				SkriptLogger.setNode(n);
-				return n;
+			public @Nullable Node next() {
+				Node node = super.next();
+				SkriptLogger.setNode(node);
+				return node;
 			}
-			
+
 			@Override
 			public void remove() {
 				throw new UnsupportedOperationException();
 			}
 		};
 	}
-	
+
 	/**
 	 * Gets a subnode (EntryNode or SectionNode) with the specified name.
-	 * 
+	 *
 	 * @param key
 	 * @return The node with the given name
 	 */
@@ -178,7 +181,7 @@ public void remove() {
 	public Node get(final @Nullable String key) {
 		return getNodeMap().get(key);
 	}
-	
+
 	@Nullable
 	public String getValue(final String key) {
 		final Node n = get(key);
@@ -186,10 +189,10 @@ public String getValue(final String key) {
 			return ((EntryNode) n).getValue();
 		return null;
 	}
-	
+
 	/**
 	 * Gets an entry's value or the default value if it doesn't exist or is not an EntryNode.
-	 * 
+	 *
 	 * @param name The name of the node (case insensitive)
 	 * @param def The default value
 	 * @return The value of the entry node with the give node, or <tt>def</tt> if there's no entry with the given name.
@@ -200,7 +203,7 @@ public String get(final String name, final String def) {
 			return def;
 		return ((EntryNode) n).getValue();
 	}
-	
+
 	public void set(final String key, final String value) {
 		final Node n = get(key);
 		if (n instanceof EntryNode) {
@@ -209,7 +212,7 @@ public void set(final String key, final String value) {
 			add(new EntryNode(key, value, this));
 		}
 	}
-	
+
 	public void set(final String key, final @Nullable Node node) {
 		if (node == null) {
 			remove(key);
@@ -231,14 +234,14 @@ public void set(final String key, final @Nullable Node node) {
 		}
 		add(node);
 	}
-	
+
 	void renamed(final Node node, final @Nullable String oldKey) {
 		if (!nodes.contains(node))
 			throw new IllegalArgumentException();
 		getNodeMap().remove(oldKey);
 		getNodeMap().put(node);
 	}
-	
+
 	public boolean isEmpty() {
 		for (final Node node : nodes) {
 			if (!node.isVoid())
@@ -246,11 +249,11 @@ public boolean isEmpty() {
 		}
 		return true;
 	}
-	
+
 	static SectionNode load(final Config c, final ConfigReader r) throws IOException {
 		return new SectionNode(c).load_i(r);
 	}
-	
+
 	static SectionNode load(final String name, final String comment, final SectionNode parent, final ConfigReader r) throws IOException {
 		parent.config.level++;
 		final SectionNode node = new SectionNode(name, comment, parent, r.getLineNum()).load_i(r);
@@ -258,7 +261,7 @@ static SectionNode load(final String name, final String comment, final SectionNo
 		parent.config.level--;
 		return node;
 	}
-	
+
 	private static String readableWhitespace(final String s) {
 		if (s.matches(" +"))
 			return s.length() + " space" + (s.length() == 1 ? "" : "s");
@@ -266,9 +269,9 @@ private static String readableWhitespace(final String s) {
 			return s.length() + " tab" + (s.length() == 1 ? "" : "s");
 		return "'" + s.replace("\t", "->").replace(' ', '_').replaceAll("\\s", "?") + "' [-> = tab, _ = space, ? = other whitespace]";
 	}
-	
+
 	private static final Pattern fullLinePattern = Pattern.compile("([^#]|##)*#-#(\\s.*)?");
-	
+
 	private SectionNode load_i(final ConfigReader r) throws IOException {
 		boolean indentationSet = false;
 		String fullLine;
@@ -282,7 +285,7 @@ private SectionNode load_i(final ConfigReader r) throws IOException {
 			final NonNullPair<String, String> line = Node.splitLine(fullLine, inBlockComment);
 			String value = line.getFirst();
 			final String comment = line.getSecond();
-			
+
 			final SectionNode parent = this.parent;
 			if (!indentationSet && parent != null && parent.parent == null && !value.isEmpty() && !value.matches("\\s*") && !value.matches("\\S.*")) {
 				final String s = value.replaceFirst("\\S.*$", "");
@@ -305,20 +308,20 @@ private SectionNode load_i(final ConfigReader r) throws IOException {
 				} else {
 					if (parent != null && !config.allowEmptySections && isEmpty()) {
 						Skript.warning("Empty configuration section! You might want to indent one or more of the subsequent lines to make them belong to this section" +
-								" or remove the colon at the end of the line if you don't want this line to start a section.");
+							" or remove the colon at the end of the line if you don't want this line to start a section.");
 					}
 					r.reset();
 					return this;
 				}
 			}
-			
+
 			value = value.trim();
-			
-			if (value.isEmpty()) {
+
+			if (value.isEmpty()) { // entire line is a comment or empty
 				nodes.add(new VoidNode(value, comment, this, r.getLineNum()));
 				continue;
 			}
-			
+
 //			if (line.startsWith("!") && line.indexOf('[') != -1 && line.endsWith("]")) {
 //				final String option = line.substring(1, line.indexOf('['));
 //				final String value = line.substring(line.indexOf('[') + 1, line.length() - 1);
@@ -342,11 +345,11 @@ private SectionNode load_i(final ConfigReader r) throws IOException {
 //				nodes.add(new ParseOptionNode(line.substring(0, line.indexOf('[')), this, r));
 //				continue;
 //			}
-			
+
 			if (value.endsWith(":") && (config.simple
-					|| value.indexOf(config.separator) == -1
-					|| config.separator.endsWith(":") && value.indexOf(config.separator) == value.length() - config.separator.length()
-					)) {
+				|| value.indexOf(config.separator) == -1
+				|| config.separator.endsWith(":") && value.indexOf(config.separator) == value.length() - config.separator.length()
+			)) {
 				boolean matches = false;
 				try {
 					matches = fullLine.contains("#") && fullLinePattern.matcher(fullLine).matches();
@@ -358,22 +361,22 @@ private SectionNode load_i(final ConfigReader r) throws IOException {
 					continue;
 				}
 			}
-			
+
 			if (config.simple) {
 				nodes.add(new SimpleNode(value, comment, r.getLineNum(), this));
 			} else {
 				nodes.add(getEntry(value, comment, r.getLineNum(), config.separator));
 			}
-			
+
 		}
 		if (inBlockComment.get()) {
 			Skript.error("A block comment (###) was opened on line " + blockCommentStartLine + " but never closed.");
 		}
 		SkriptLogger.setNode(parent);
-		
+
 		return this;
 	}
-	
+
 	private Node getEntry(final String keyAndValue, final String comment, final int lineNum, final String separator) {
 		final int x = keyAndValue.indexOf(separator);
 		if (x == -1) {
@@ -386,19 +389,19 @@ private Node getEntry(final String keyAndValue, final String comment, final int
 		final String value = "" + keyAndValue.substring(x + separator.length()).trim();
 		return new EntryNode(key, value, comment, this, lineNum);
 	}
-	
+
 	/**
 	 * Converts all SimpleNodes in this section to EntryNodes.
-	 * 
+	 *
 	 * @param levels Amount of levels to go down, e.g. 0 to only convert direct subnodes of this section or -1 for all subnodes including subnodes of subnodes etc.
 	 */
 	public void convertToEntries(final int levels) {
 		convertToEntries(levels, config.separator);
 	}
-	
+
 	/**
 	 * REMIND breaks saving - separator argument can be different from config.sepator
-	 * 
+	 *
 	 * @param levels Maximum depth of recursion, <tt>-1</tt> for no limit.
 	 * @param separator Some separator, e.g. ":" or "=".
 	 */
@@ -421,7 +424,7 @@ public void convertToEntries(final int levels, final String separator) {
 				assert false;
 		}
 	}
-	
+
 	@Override
 	public void save(final PrintWriter w) {
 		if (parent != null)
@@ -429,19 +432,19 @@ public void save(final PrintWriter w) {
 		for (final Node node : nodes)
 			node.save(w);
 	}
-	
+
 	@Override
 	String save_i() {
 		assert key != null;
 		return key + ":";
 	}
-	
+
 	public boolean validate(final SectionValidator validator) {
 		return validator.validate(this);
 	}
-	
-	HashMap<String, String> toMap(final String prefix, final String separator) {
-		final HashMap<String, String> r = new HashMap<>();
+
+	Map<String, String> toMap(final String prefix, final String separator) {
+		final Map<String, String> r = new HashMap<>();
 		for (final Node n : this) {
 			if (n instanceof EntryNode) {
 				r.put(prefix + n.getKey(), ((EntryNode) n).getValue());
@@ -452,6 +455,18 @@ HashMap<String, String> toMap(final String prefix, final String separator) {
 		return r;
 	}
 
+	/**
+	 * @return True if this section and all children are valid, i.e. they contain no invalid nodes.
+	 */
+	public boolean isValid() {
+		for (Node node : nodes) {
+			if ((node instanceof SectionNode sectionNode && !sectionNode.isValid())
+				|| node instanceof InvalidNode)
+				return false;
+		}
+		return true;
+	}
+
 	/**
 	 * Updates the values of this SectionNode based on the values of another SectionNode.
 	 * @param other The other SectionNode.
@@ -526,5 +541,16 @@ private boolean modify(SectionNode other, boolean compareValues, String... exclu
 
 		return different;
 	}
-	
+
+	@Override
+	public @Nullable Node getNodeAt(@NotNull String @NotNull ... keys) {
+		Node node = this;
+		for (String s : keys) {
+			if (!(node instanceof SectionNode sectionNode))
+				return null;
+			node = sectionNode.get(s);
+		}
+		return node;
+	}
+
 }
diff --git a/src/main/java/ch/njol/skript/config/SimpleNode.java b/src/main/java/ch/njol/skript/config/SimpleNode.java
index 3da391c0d5e..0eb120fbf56 100644
--- a/src/main/java/ch/njol/skript/config/SimpleNode.java
+++ b/src/main/java/ch/njol/skript/config/SimpleNode.java
@@ -1,44 +1,33 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.config;
 
+import org.jetbrains.annotations.Nullable;
+
 /**
  * @author Peter Güttinger
  */
 public class SimpleNode extends Node {
-	
+
 	public SimpleNode(final String value, final String comment, final int lineNum, final SectionNode parent) {
 		super(value, comment, parent, lineNum);
 	}
-	
+
 	public SimpleNode(final Config c) {
 		super(c);
 	}
-	
+
 	@SuppressWarnings("null")
 	@Override
 	String save_i() {
 		return key;
 	}
-	
+
 	public void set(final String s) {
 		key = s;
 	}
-	
+
+	@Override
+	public @Nullable Node get(String key) {
+		return null;
+	}
+
 }
diff --git a/src/main/java/ch/njol/skript/config/VoidNode.java b/src/main/java/ch/njol/skript/config/VoidNode.java
index c94f4512175..389f40b4d12 100644
--- a/src/main/java/ch/njol/skript/config/VoidNode.java
+++ b/src/main/java/ch/njol/skript/config/VoidNode.java
@@ -1,51 +1,35 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.config;
 
+import org.jetbrains.annotations.Nullable;
+
 /**
  * An empty line or a comment.
  * <p>
  * The subclass {@link InvalidNode} is used for invalid non-empty nodes, i.e. where a parsing error occurred.
- * 
+ *
  * @author Peter Güttinger
  */
 public class VoidNode extends Node {
-	
+
 //	private final int initialLevel;
 //	private final String initialIndentation;
-	
+
 	VoidNode(final String line, final String comment, final SectionNode parent, final int lineNum) {
 		super("" + line.trim(), comment, parent, lineNum);
 //		initialLevel = getLevel();
 //		initialIndentation = "" + line.replaceFirst("\\S.*$", "");
 	}
-	
+
 	@SuppressWarnings("null")
 	@Override
 	public String getKey() {
 		return key;
 	}
-	
+
 	public void set(final String s) {
 		key = s;
 	}
-	
+
 	// doesn't work reliably
 //	@Override
 //	protected String getIndentation() {
@@ -62,10 +46,15 @@ public void set(final String s) {
 //			return ind;
 //		}
 //	}
-	
+
 	@Override
 	String save_i() {
 		return "" + key;
 	}
-	
+
+	@Override
+	public @Nullable Node get(String key) {
+		return null;
+	}
+
 }
diff --git a/src/main/java/ch/njol/skript/config/validate/EntryValidator.java b/src/main/java/ch/njol/skript/config/validate/EntryValidator.java
index 16efab55581..56b005906a6 100644
--- a/src/main/java/ch/njol/skript/config/validate/EntryValidator.java
+++ b/src/main/java/ch/njol/skript/config/validate/EntryValidator.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.config.validate;
 
 import org.jetbrains.annotations.Nullable;
@@ -24,42 +6,40 @@
 import ch.njol.skript.config.EntryNode;
 import ch.njol.skript.config.Node;
 import ch.njol.skript.log.SkriptLogger;
-import ch.njol.util.Setter;
 
-/**
- * @author Peter Güttinger
- */
+import java.util.function.Consumer;
+
 public class EntryValidator implements NodeValidator {
-	
+
 	@Nullable
-	private final Setter<String> setter;
-	
+	private final Consumer<String> setter;
+
 	public EntryValidator() {
 		setter = null;
 	}
-	
-	public EntryValidator(final Setter<String> setter) {
+
+	public EntryValidator(Consumer<String> setter) {
 		this.setter = setter;
 	}
-	
+
 	@Override
-	public boolean validate(final Node node) {
+	public boolean validate(Node node) {
 		if (!(node instanceof EntryNode)) {
 			notAnEntryError(node);
 			return false;
 		}
 		if (setter != null)
-			setter.set(((EntryNode) node).getValue());
+			setter.accept(((EntryNode) node).getValue());
 		return true;
 	}
-	
-	public static void notAnEntryError(final Node node) {
+
+	public static void notAnEntryError(Node node) {
 		notAnEntryError(node, node.getConfig().getSeparator());
 	}
 
-	public static void notAnEntryError(final Node node, String separator) {
+	public static void notAnEntryError(Node node, String separator) {
 		SkriptLogger.setNode(node);
 		Skript.error("'" + node.getKey() + "' is not an entry (like 'name " + separator + " value')");
 	}
-	
+
 }
diff --git a/src/main/java/ch/njol/skript/config/validate/EnumEntryValidator.java b/src/main/java/ch/njol/skript/config/validate/EnumEntryValidator.java
index 274c08be6ea..a6d68981752 100644
--- a/src/main/java/ch/njol/skript/config/validate/EnumEntryValidator.java
+++ b/src/main/java/ch/njol/skript/config/validate/EnumEntryValidator.java
@@ -1,43 +1,22 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.config.validate;
 
 import java.util.Locale;
+import java.util.function.Consumer;
 
 import org.jetbrains.annotations.Nullable;
 
 import ch.njol.skript.Skript;
 import ch.njol.skript.config.EntryNode;
 import ch.njol.skript.config.Node;
-import ch.njol.util.Setter;
 
-/**
- * @author Peter Güttinger
- */
+@Deprecated(forRemoval = true)
 public class EnumEntryValidator<E extends Enum<E>> extends EntryValidator {
-	
+
 	private final Class<E> enumType;
-	private final Setter<E> setter;
-	@Nullable
-	private String allowedValues = null;
-	
-	public EnumEntryValidator(final Class<E> enumType, final Setter<E> setter) {
+	private final Consumer<E> setter;
+	private @Nullable String allowedValues = null;
+
+	public EnumEntryValidator(final Class<E> enumType, final Consumer<E> setter) {
 		assert enumType != null;
 		this.enumType = enumType;
 		this.setter = setter;
@@ -51,14 +30,14 @@ public EnumEntryValidator(final Class<E> enumType, final Setter<E> setter) {
 			allowedValues = "" + b.toString();
 		}
 	}
-	
-	public EnumEntryValidator(final Class<E> enumType, final Setter<E> setter, final String allowedValues) {
+
+	public EnumEntryValidator(final Class<E> enumType, final Consumer<E> setter, final String allowedValues) {
 		assert enumType != null;
 		this.enumType = enumType;
 		this.setter = setter;
 		this.allowedValues = allowedValues;
 	}
-	
+
 	@Override
 	public boolean validate(final Node node) {
 		if (!super.validate(node))
@@ -68,12 +47,12 @@ public boolean validate(final Node node) {
 			final E e = Enum.valueOf(enumType, n.getValue().toUpperCase(Locale.ENGLISH).replace(' ', '_'));
 			assert e != null;
 //			if (setter != null)
-			setter.set(e);
+			setter.accept(e);
 		} catch (final IllegalArgumentException e) {
 			Skript.error("'" + n.getValue() + "' is not a valid value for '" + n.getKey() + "'" + (allowedValues == null ? "" : ". Allowed values are: " + allowedValues));
 			return false;
 		}
 		return true;
 	}
-	
+
 }
diff --git a/src/main/java/ch/njol/skript/config/validate/NodeValidator.java b/src/main/java/ch/njol/skript/config/validate/NodeValidator.java
index a5dd5b32c2f..1f4b5fc068d 100644
--- a/src/main/java/ch/njol/skript/config/validate/NodeValidator.java
+++ b/src/main/java/ch/njol/skript/config/validate/NodeValidator.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.config.validate;
 
 import ch.njol.skript.config.Node;
diff --git a/src/main/java/ch/njol/skript/config/validate/ParsedEntryValidator.java b/src/main/java/ch/njol/skript/config/validate/ParsedEntryValidator.java
index d949279741a..b941a1d22a3 100644
--- a/src/main/java/ch/njol/skript/config/validate/ParsedEntryValidator.java
+++ b/src/main/java/ch/njol/skript/config/validate/ParsedEntryValidator.java
@@ -1,53 +1,33 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.config.validate;
 
 import ch.njol.skript.classes.Parser;
 import ch.njol.skript.config.EntryNode;
 import ch.njol.skript.config.Node;
 import ch.njol.skript.lang.ParseContext;
-import ch.njol.util.Setter;
 
-/**
- * @author Peter Güttinger
- */
+import java.util.function.Consumer;
+
 public class ParsedEntryValidator<T> extends EntryValidator {
-	
+
 	private final Parser<? extends T> parser;
-	private final Setter<T> setter;
-	
-	public ParsedEntryValidator(final Parser<? extends T> parser, final Setter<T> setter) {
+	private final Consumer<T> setter;
+
+	public ParsedEntryValidator(Parser<? extends T> parser, Consumer<T> setter) {
 		assert parser != null;
 		assert setter != null;
 		this.parser = parser;
 		this.setter = setter;
 	}
-	
+
 	@Override
-	public boolean validate(final Node node) {
+	public boolean validate(Node node) {
 		if (!super.validate(node))
 			return false;
-		final T t = parser.parse(((EntryNode) node).getValue(), ParseContext.CONFIG);
+		T t = parser.parse(((EntryNode) node).getValue(), ParseContext.CONFIG);
 		if (t == null)
 			return false;
-		setter.set(t);
+		setter.accept(t);
 		return true;
 	}
-	
+
 }
diff --git a/src/main/java/ch/njol/skript/config/validate/SectionValidator.java b/src/main/java/ch/njol/skript/config/validate/SectionValidator.java
index 322c53e5bba..909ec29f55e 100644
--- a/src/main/java/ch/njol/skript/config/validate/SectionValidator.java
+++ b/src/main/java/ch/njol/skript/config/validate/SectionValidator.java
@@ -1,26 +1,9 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.config.validate;
 
 import java.util.HashMap;
 import java.util.Locale;
 import java.util.Map.Entry;
+import java.util.function.Consumer;
 
 import ch.njol.skript.Skript;
 import ch.njol.skript.classes.Parser;
@@ -28,56 +11,52 @@
 import ch.njol.skript.config.Node;
 import ch.njol.skript.config.SectionNode;
 import ch.njol.skript.log.SkriptLogger;
-import ch.njol.util.Setter;
 
-/**
- * @author Peter Güttinger
- */
 public class SectionValidator implements NodeValidator {
-	
+
 	private final static class NodeInfo {
 		public NodeValidator v;
 		public boolean optional;
-		
+
 		public NodeInfo(final NodeValidator v, final boolean optional) {
 			this.v = v;
 			this.optional = optional;
 		}
 	}
-	
+
 	private final HashMap<String, NodeInfo> nodes = new HashMap<>();
 	private boolean allowUndefinedSections = false;
 	private boolean allowUndefinedEntries = false;
-	
+
 	public SectionValidator() {}
-	
+
 	public SectionValidator addNode(final String name, final NodeValidator v, final boolean optional) {
 		assert name != null;
 		assert v != null;
 		nodes.put(name.toLowerCase(Locale.ENGLISH), new NodeInfo(v, optional));
 		return this;
 	}
-	
+
 	public SectionValidator addEntry(final String name, final boolean optional) {
 		addNode(name, new EntryValidator(), optional);
 		return this;
 	}
-	
-	public SectionValidator addEntry(final String name, final Setter<String> setter, final boolean optional) {
+
+	public SectionValidator addEntry(final String name, final Consumer<String> setter, final boolean optional) {
 		addNode(name, new EntryValidator(setter), optional);
 		return this;
 	}
-	
-	public <T> SectionValidator addEntry(final String name, final Parser<? extends T> parser, final Setter<T> setter, final boolean optional) {
+
+	public <T> SectionValidator addEntry(final String name, final Parser<? extends T> parser, final Consumer<T> setter, final boolean optional) {
 		addNode(name, new ParsedEntryValidator<>(parser, setter), optional);
 		return this;
 	}
-	
+
 	public SectionValidator addSection(final String name, final boolean optional) {
 		addNode(name, new SectionValidator().setAllowUndefinedEntries(true).setAllowUndefinedSections(true), optional);
 		return this;
 	}
-	
+
 	@Override
 	public boolean validate(final Node node) {
 		if (!(node instanceof SectionNode)) {
@@ -111,20 +90,20 @@ public boolean validate(final Node node) {
 		SkriptLogger.setNode(null);
 		return ok;
 	}
-	
+
 	public static void notASectionError(final Node node) {
 		SkriptLogger.setNode(node);
 		Skript.error("'" + node.getKey() + "' is not a section (like 'name:', followed by one or more indented lines)");
 	}
-	
+
 	public SectionValidator setAllowUndefinedSections(final boolean b) {
 		allowUndefinedSections = b;
 		return this;
 	}
-	
+
 	public SectionValidator setAllowUndefinedEntries(final boolean b) {
 		allowUndefinedEntries = b;
 		return this;
 	}
-	
+
 }
diff --git a/src/main/java/ch/njol/skript/doc/Description.java b/src/main/java/ch/njol/skript/doc/Description.java
index b5eb0f17ef5..a24b8bad012 100644
--- a/src/main/java/ch/njol/skript/doc/Description.java
+++ b/src/main/java/ch/njol/skript/doc/Description.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.doc;
 
 import java.lang.annotation.Documented;
diff --git a/src/main/java/ch/njol/skript/doc/Documentation.java b/src/main/java/ch/njol/skript/doc/Documentation.java
index 7b5b2ac7044..d1509f84a42 100644
--- a/src/main/java/ch/njol/skript/doc/Documentation.java
+++ b/src/main/java/ch/njol/skript/doc/Documentation.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.doc;
 
 import ch.njol.skript.Skript;
@@ -29,7 +11,6 @@
 import ch.njol.skript.lang.function.Parameter;
 import ch.njol.skript.registrations.Classes;
 import ch.njol.skript.util.Utils;
-import ch.njol.util.Callback;
 import ch.njol.util.NonNullPair;
 import ch.njol.util.StringUtils;
 import ch.njol.util.coll.CollectionUtils;
@@ -44,6 +25,7 @@
 import java.io.PrintWriter;
 import java.io.UnsupportedEncodingException;
 import java.util.ArrayList;
+import java.util.function.Function;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -205,7 +187,7 @@ protected static String cleanPatterns(String patterns, boolean escapeHTML) {
 		cleanedPatterns = CP_PARSE_TAGS_PATTERN.matcher(cleanedPatterns).replaceAll(""); // Remove new parse tags, see https://regex101.com/r/mTebpn/1
 		cleanedPatterns = CP_EXTRA_OPTIONAL_PATTERN.matcher(cleanedPatterns).replaceAll("[$1]"); // Remove unnecessary parentheses such as [(script)]
 
-		Callback<String, Matcher> callback = m -> { // Replace optional parentheses with optional brackets
+		Function<Matcher, String> callback = m -> { // Replace optional parentheses with optional brackets
 			String group = m.group();
 
 			boolean startToEnd = group.contains("(|"); // Due to regex limitation we search from the beginning to the end but if it has '|)' we will begin from the opposite direction
@@ -264,40 +246,37 @@ protected static String cleanPatterns(String patterns, boolean escapeHTML) {
 		assert cleanedPatterns != null;
 
 		final String s = StringUtils.replaceAll(cleanedPatterns, "(?<!\\\\)%(.+?)(?<!\\\\)%", // Convert %+?% (aka types) inside patterns to links
-			new Callback<String, Matcher>() {
-				@Override
-				public String run(final Matcher m) {
-					String s = m.group(1);
-					if (s.startsWith("-"))
-						s = s.substring(1);
-					String flag = "";
-					if (s.startsWith("*") || s.startsWith("~")) {
-						flag = s.substring(0, 1);
-						s = s.substring(1);
-					}
-					final int a = s.indexOf("@");
-					if (a != -1)
-						s = s.substring(0, a);
-					final StringBuilder b = new StringBuilder("%");
-					b.append(flag);
-					boolean first = true;
-					for (final String c : s.split("/")) {
-						assert c != null;
-						if (!first)
-							b.append("/");
-						first = false;
-						final NonNullPair<String, Boolean> p = Utils.getEnglishPlural(c);
-						final ClassInfo<?> ci = Classes.getClassInfoNoError(p.getFirst());
-						if (ci != null && ci.hasDocs()) { // equals method throws null error when doc name is null
-							b.append("<a href='./classes.html#").append(p.getFirst()).append("'>").append(ci.getName().toString(p.getSecond())).append("</a>");
-						} else {
-							b.append(c);
-							if (ci != null && ci.hasDocs())
-								Skript.warning("Used class " + p.getFirst() + " has no docName/name defined");
-						}
+			m -> {
+				String s1 = m.group(1);
+				if (s1.startsWith("-"))
+					s1 = s1.substring(1);
+				String flag = "";
+				if (s1.startsWith("*") || s1.startsWith("~")) {
+					flag = s1.substring(0, 1);
+					s1 = s1.substring(1);
+				}
+				final int a = s1.indexOf("@");
+				if (a != -1)
+					s1 = s1.substring(0, a);
+				final StringBuilder b = new StringBuilder("%");
+				b.append(flag);
+				boolean first = true;
+				for (final String c : s1.split("/")) {
+					assert c != null;
+					if (!first)
+						b.append("/");
+					first = false;
+					final NonNullPair<String, Boolean> p = Utils.getEnglishPlural(c);
+					final ClassInfo<?> ci = Classes.getClassInfoNoError(p.getFirst());
+					if (ci != null && ci.hasDocs()) { // equals method throws null error when doc name is null
+						b.append("<a href='./classes.html#").append(p.getFirst()).append("'>").append(ci.getName().toString(p.getSecond())).append("</a>");
+					} else {
+						b.append(c);
+						if (ci != null && ci.hasDocs())
+							Skript.warning("Used class " + p.getFirst() + " has no docName/name defined");
 					}
-					return "" + b.append("%").toString();
 				}
+				return b.append("%").toString();
 			});
 		assert s != null : patterns;
 		return s;
@@ -312,7 +291,7 @@ private static void insertSyntaxElement(final PrintWriter pw, final SyntaxElemen
 			return;
 		}
 		final String desc = validateHTML(StringUtils.join(elementClass.getAnnotation(Description.class).value(), "<br/>"), type + "s");
-		final String since = validateHTML(elementClass.getAnnotation(Since.class).value(), type + "s");
+		final String since = validateHTML(StringUtils.join(elementClass.getAnnotation(Since.class).value(), "<br/>"), type + "s");
 		if (desc == null || since == null) {
 			Skript.warning("" + elementClass.getSimpleName() + "'s description or 'since' is invalid");
 			return;
diff --git a/src/main/java/ch/njol/skript/doc/DocumentationGenerator.java b/src/main/java/ch/njol/skript/doc/DocumentationGenerator.java
new file mode 100644
index 00000000000..949e59f3ca5
--- /dev/null
+++ b/src/main/java/ch/njol/skript/doc/DocumentationGenerator.java
@@ -0,0 +1,23 @@
+package ch.njol.skript.doc;
+
+import java.io.File;
+
+/**
+ * Represents a class which generates a documentation format (like HTML or JSON)
+ */
+public abstract class DocumentationGenerator {
+
+	protected File templateDir;
+	protected File outputDir;
+
+	public DocumentationGenerator(File templateDir, File outputDir) {
+		this.templateDir = templateDir;
+		this.outputDir = outputDir;
+	}
+
+	/**
+	 * Generates the documentation file
+	 */
+	public abstract void generate();
+
+}
diff --git a/src/main/java/ch/njol/skript/doc/DocumentationId.java b/src/main/java/ch/njol/skript/doc/DocumentationId.java
index e1d1543f2e6..2929a1fe757 100644
--- a/src/main/java/ch/njol/skript/doc/DocumentationId.java
+++ b/src/main/java/ch/njol/skript/doc/DocumentationId.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.doc;
 
 import java.lang.annotation.Documented;
@@ -32,6 +14,7 @@
 @Retention(RetentionPolicy.RUNTIME)
 @Documented
 public @interface DocumentationId {
-	
-    public String value();
+
+	public String value();
+
 }
diff --git a/src/main/java/ch/njol/skript/doc/DocumentationIdProvider.java b/src/main/java/ch/njol/skript/doc/DocumentationIdProvider.java
new file mode 100644
index 00000000000..35a01c143b3
--- /dev/null
+++ b/src/main/java/ch/njol/skript/doc/DocumentationIdProvider.java
@@ -0,0 +1,146 @@
+package ch.njol.skript.doc;
+
+import ch.njol.skript.Skript;
+import ch.njol.skript.classes.ClassInfo;
+import ch.njol.skript.lang.Condition;
+import ch.njol.skript.lang.Effect;
+import ch.njol.skript.lang.Expression;
+import ch.njol.skript.lang.Section;
+import ch.njol.skript.lang.SkriptEventInfo;
+import ch.njol.skript.lang.SyntaxElementInfo;
+import ch.njol.skript.lang.function.Function;
+import ch.njol.skript.lang.function.Functions;
+import ch.njol.skript.registrations.Classes;
+import org.skriptlang.skript.lang.structure.Structure;
+
+import java.util.Arrays;
+import java.util.Iterator;
+import java.util.Objects;
+import java.util.function.Predicate;
+
+public class DocumentationIdProvider {
+
+	/**
+	 * Some syntax classes are registered more than once. This method applies a suffix
+	 * to the id in order to differentiate them
+	 * @param id the potentially conflicting ID
+	 * @param collisionCount the number of conflicts this element has
+	 * @return the unique ID for the element
+	 */
+	private static String addCollisionSuffix(String id, int collisionCount) {
+		if (collisionCount == 0) {
+			return id;
+		}
+		return id + "-" + (collisionCount + 1);
+	}
+
+	/**
+	 * Calculates the number of collisions in an iterator
+	 * @param potentialCollisions the iterator of potential collisions
+	 * @param collisionCriteria a predicate which checks whether a potential collision is really a collision
+	 * @param equalsCriteria a predicate which checks whether a potential collision equals the current element we are generating
+	 * @return the number of collisions in potentialCollisions up until equalsCriteria was true
+	 */
+	private static <T> int calculateCollisionCount(Iterator<? extends T> potentialCollisions, Predicate<T> collisionCriteria,
+											Predicate<T> equalsCriteria) {
+		int collisionCount = 0;
+		while (potentialCollisions.hasNext()) {
+			T potentialCollision = potentialCollisions.next();
+			if (collisionCriteria.test(potentialCollision)) {
+				if (equalsCriteria.test(potentialCollision)) {
+					break;
+				}
+				collisionCount += 1;
+			}
+		}
+		return collisionCount;
+	}
+
+	/**
+	 * Gets the documentation ID of a syntax element
+	 * @param syntaxInfo the SyntaxElementInfo to get the ID of
+	 * @return the ID of the syntax element
+	 */
+	public static <T> String getId(SyntaxElementInfo<? extends T> syntaxInfo) {
+		Class<?> syntaxClass = syntaxInfo.getElementClass();
+		Iterator<? extends SyntaxElementInfo<?>> syntaxElementIterator;
+		if (Effect.class.isAssignableFrom(syntaxClass)) {
+			syntaxElementIterator = Skript.getEffects().iterator();
+		} else if (Condition.class.isAssignableFrom(syntaxClass)) {
+			syntaxElementIterator = Skript.getConditions().iterator();
+		} else if (Expression.class.isAssignableFrom(syntaxClass)) {
+			syntaxElementIterator = Skript.getExpressions();
+		} else if (Section.class.isAssignableFrom(syntaxClass)) {
+			syntaxElementIterator = Skript.getSections().iterator();
+		} else if (Structure.class.isAssignableFrom(syntaxClass)) {
+			syntaxElementIterator = Skript.getStructures().iterator();
+		} else {
+			throw new IllegalStateException("Unsupported syntax type provided");
+		}
+		int collisionCount = calculateCollisionCount(syntaxElementIterator,
+			elementInfo -> elementInfo.getElementClass() == syntaxClass,
+			elementInfo -> Arrays.equals(elementInfo.getPatterns(), syntaxInfo.getPatterns()));
+		DocumentationId documentationIdAnnotation = syntaxClass.getAnnotation(DocumentationId.class);
+		if (documentationIdAnnotation == null) {
+			return addCollisionSuffix(syntaxClass.getSimpleName(), collisionCount);
+		}
+		return addCollisionSuffix(documentationIdAnnotation.value(), collisionCount);
+	}
+
+	/**
+	 * Gets the documentation ID of a function
+	 * @param function the function to get the ID of
+	 * @return the documentation ID of the function
+	 */
+	public static String getId(Function<?> function) {
+		int collisionCount = calculateCollisionCount(Functions.getJavaFunctions().iterator(),
+			javaFunction -> function.getName().equals(javaFunction.getName()),
+			javaFunction -> javaFunction == function);
+		return addCollisionSuffix(function.getName(), collisionCount);
+	}
+
+	/**
+	 * Gets either the explicitly declared documentation ID or code name of a classinfo
+	 * @param classInfo the ClassInfo to get the ID of
+	 * @return the ID of the ClassInfo
+	 */
+	private static String getClassInfoId(ClassInfo<?> classInfo) {
+		return Objects.requireNonNullElse(classInfo.getDocumentationID(), classInfo.getCodeName());
+	}
+
+	/**
+	 * Gets the documentation ID of a ClassInfo
+	 * @param classInfo the ClassInfo to get the ID of
+	 * @return the ID of the ClassInfo
+	 */
+	public static String getId(ClassInfo<?> classInfo) {
+		String classInfoId = getClassInfoId(classInfo);
+		int collisionCount = calculateCollisionCount(Classes.getClassInfos().iterator(),
+			otherClassInfo -> classInfoId.equals(getClassInfoId(otherClassInfo)),
+			otherClassInfo -> classInfo == otherClassInfo);
+		return addCollisionSuffix(classInfoId, collisionCount);
+	}
+
+	/**
+	 * Gets either the explicitly declared documentation ID or default ID of an event
+	 * @param eventInfo the event to get the ID of
+	 * @return the ID of the event
+	 */
+	private static String getEventId(SkriptEventInfo<?> eventInfo) {
+		return Objects.requireNonNullElse(eventInfo.getDocumentationID(), eventInfo.getId());
+	}
+
+	/**
+	 * Gets the documentation ID of an event
+	 * @param eventInfo the event to get the ID of
+	 * @return the ID of the event
+	 */
+	public static String getId(SkriptEventInfo<?> eventInfo) {
+		String eventId = getEventId(eventInfo);
+		int collisionCount = calculateCollisionCount(Skript.getEvents().iterator(),
+			otherEventInfo -> eventId.equals(getEventId(otherEventInfo)),
+			otherEventInfo -> Arrays.equals(otherEventInfo.getPatterns(), eventInfo.getPatterns()));
+		return addCollisionSuffix(eventId, collisionCount);
+	}
+
+}
diff --git a/src/main/java/ch/njol/skript/doc/Events.java b/src/main/java/ch/njol/skript/doc/Events.java
index 8982905871e..592cdc1bb82 100644
--- a/src/main/java/ch/njol/skript/doc/Events.java
+++ b/src/main/java/ch/njol/skript/doc/Events.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.doc;
 
 import java.lang.annotation.Documented;
diff --git a/src/main/java/ch/njol/skript/doc/Examples.java b/src/main/java/ch/njol/skript/doc/Examples.java
index 1873ffaabf3..b8946e8ac1c 100644
--- a/src/main/java/ch/njol/skript/doc/Examples.java
+++ b/src/main/java/ch/njol/skript/doc/Examples.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.doc;
 
 import java.lang.annotation.Documented;
diff --git a/src/main/java/ch/njol/skript/doc/HTMLGenerator.java b/src/main/java/ch/njol/skript/doc/HTMLGenerator.java
index 23e6018eed7..63dbb2900a4 100644
--- a/src/main/java/ch/njol/skript/doc/HTMLGenerator.java
+++ b/src/main/java/ch/njol/skript/doc/HTMLGenerator.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.doc;
 
 import ch.njol.skript.Skript;
@@ -30,12 +12,11 @@
 import ch.njol.skript.lang.SyntaxElementInfo;
 import ch.njol.skript.lang.function.Functions;
 import ch.njol.skript.lang.function.JavaFunction;
-import ch.njol.skript.lang.function.Parameter;
 import ch.njol.skript.registrations.Classes;
 import com.google.common.base.Joiner;
 import com.google.common.collect.Lists;
 import com.google.common.io.Files;
-import org.apache.commons.lang.StringUtils;
+
 import org.bukkit.event.Cancellable;
 import org.bukkit.event.Event;
 import org.bukkit.event.block.BlockCanBuildEvent;
@@ -60,23 +41,19 @@
 /**
  * Template engine, primarily used for generating Skript documentation
  * pages by combining data from annotations and templates.
- * 
+ *
  */
-public class HTMLGenerator {
+public class HTMLGenerator extends DocumentationGenerator {
 
-	private static final String SKRIPT_VERSION = Skript.getVersion().toString().replaceAll("-(dev|alpha|beta)\\d*", ""); // Filter branches
-	private static final Pattern NEW_TAG_PATTERN = Pattern.compile(SKRIPT_VERSION + "(?!\\.)"); // (?!\\.) to avoid matching 2.6 in 2.6.1 etc.
+	private static final String SKRIPT_VERSION = Skript.getVersion().toString().replaceAll("-(dev|alpha|beta|pre)\\d*", "").replace(".0", ""); // Filter branches
+	private static final Pattern NEW_TAG_PATTERN = Pattern.compile(SKRIPT_VERSION + "(?!\\.[1-9])"); // (?!\\.) to avoid matching 2.6 in 2.6.1 etc.
 	private static final Pattern RETURN_TYPE_LINK_PATTERN = Pattern.compile("( ?href=\"(classes\\.html|)#|)\\$\\{element\\.return-type-linkcheck}");
 
-	private final File template;
-	private final File output;
 	private final String skeleton;
 
 	public HTMLGenerator(File templateDir, File outputDir) {
-		this.template = templateDir;
-		this.output = outputDir;
-		
-		this.skeleton = readFile(new File(template + "/template.html")); // Skeleton which contains every other page
+		super(templateDir, outputDir);
+		this.skeleton = readFile(new File(this.templateDir + "/template.html")); // Skeleton which contains every other page
 	}
 
 	/**
@@ -128,7 +105,7 @@ private static <T> Iterator<SyntaxElementInfo<? extends T>> sortedAnnotatedItera
 		list.sort(annotatedComparator);
 		return list.iterator();
 	}
-	
+
 	/**
 	 * Sorts events alphabetically.
 	 */
@@ -143,19 +120,19 @@ public int compare(@Nullable SkriptEventInfo<?> o1, @Nullable SkriptEventInfo<?>
 				assert false;
 				throw new NullPointerException();
 			}
-			
+
 			if (o1.getElementClass().getAnnotation(NoDoc.class) != null)
 				return 1;
 			else if (o2.getElementClass().getAnnotation(NoDoc.class) != null)
 				return -1;
-			
+
 			return o1.name.compareTo(o2.name);
 		}
 
 	}
-	
+
 	private static final EventComparator eventComparator = new EventComparator();
-	
+
 	/**
 	 * Sorts class infos alphabetically.
 	 */
@@ -170,21 +147,21 @@ public int compare(@Nullable ClassInfo<?> o1, @Nullable ClassInfo<?> o2) {
 				assert false;
 				throw new NullPointerException();
 			}
-			
+
 			String name1 = o1.getDocName();
 			if (name1 == null)
 				name1 = o1.getCodeName();
 			String name2 = o2.getDocName();
 			if (name2 == null)
 				name2 = o2.getCodeName();
-			
+
 			return name1.compareTo(name2);
 		}
-		
+
 	}
-	
+
 	private static final ClassInfoComparator classInfoComparator = new ClassInfoComparator();
-	
+
 	/**
 	 * Sorts functions by their names, alphabetically.
 	 */
@@ -199,40 +176,41 @@ public int compare(@Nullable JavaFunction<?> o1, @Nullable JavaFunction<?> o2) {
 				assert false;
 				throw new NullPointerException();
 			}
-			
+
 			return o1.getName().compareTo(o2.getName());
 		}
-		
+
 	}
-	
+
 	private static final FunctionComparator functionComparator = new FunctionComparator();
 
 	/**
 	 * Generates documentation using template and output directories
 	 * given in the constructor.
 	 */
+	@Override
 	@SuppressWarnings("unchecked")
 	public void generate() {
-		for (File f : template.listFiles()) {
+		for (File f : templateDir.listFiles()) {
 			if (f.getName().matches("css|js|assets")) { // Copy CSS/JS/Assets folders
 				String slashName = "/" + f.getName();
-				File fileTo = new File(output + slashName);
+				File fileTo = new File(outputDir + slashName);
 				fileTo.mkdirs();
-				for (File filesInside : new File(template + slashName).listFiles()) {
-					if (filesInside.isDirectory()) 
+				for (File filesInside : new File(templateDir + slashName).listFiles()) {
+					if (filesInside.isDirectory())
 						continue;
-						
+
 					if (!filesInside.getName().toLowerCase(Locale.ENGLISH).endsWith(".png")) { // Copy images
 						writeFile(new File(fileTo + "/" + filesInside.getName()), readFile(filesInside));
 					}
-					
+
 					else if (!filesInside.getName().matches("(?i)(.*)\\.(html?|js|css|json)")) {
 						try {
 							Files.copy(filesInside, new File(fileTo + "/" + filesInside.getName()));
 						} catch (IOException e) {
 							e.printStackTrace();
 						}
-							
+
 					}
 				}
 				continue;
@@ -265,7 +243,7 @@ else if (!filesInside.getName().matches("(?i)(.*)\\.(html?|js|css|json)")) {
 			}
 
 			for (String name : replace) {
-				String temp = readFile(new File(template + "/templates/" + name));
+				String temp = readFile(new File(templateDir + "/templates/" + name));
 				temp = temp.replace("${skript.version}", Skript.getVersion().toString());
 				page = page.replace("${include " + name + "}", temp);
 			}
@@ -276,15 +254,15 @@ else if (!filesInside.getName().matches("(?i)(.*)\\.(html?|js|css|json)")) {
 				String[] genParams = page.substring(generate + 11, nextBracket).split(" ");
 				StringBuilder generated = new StringBuilder();
 
-				String descTemp = readFile(new File(template + "/templates/" + genParams[1]));
+				String descTemp = readFile(new File(templateDir + "/templates/" + genParams[1]));
 				String genType = genParams[0];
 				boolean isDocsPage = genType.equals("docs");
 
 				if (genType.equals("structures") || isDocsPage) {
 
 					for (Iterator<StructureInfo<?>> it = sortedAnnotatedIterator(
-							(Iterator) Skript.getStructures().stream().filter(structure -> structure.getClass() == StructureInfo.class).iterator());
-							it.hasNext(); ) {
+						(Iterator) Skript.getStructures().stream().filter(structure -> structure.getClass() == StructureInfo.class).iterator());
+						 it.hasNext(); ) {
 
 						StructureInfo<?> info = it.next();
 						assert info != null;
@@ -372,12 +350,12 @@ else if (!filesInside.getName().matches("(?i)(.*)\\.(html?|js|css|json)")) {
 						generated.append(generateFunction(descTemp, info));
 					}
 				}
-				
+
 				page = page.replace(page.substring(generate, nextBracket + 1), generated.toString());
-				
+
 				generate = page.indexOf("${generate", nextBracket);
 			}
-			
+
 			String name = f.getName();
 			if (name.endsWith(".html")) { // Fix some stuff specially for HTML
 				page = page.replace("\t", "&nbsp;&nbsp;&nbsp;&nbsp;"); // Tab to 4 non-collapsible spaces
@@ -385,10 +363,10 @@ else if (!filesInside.getName().matches("(?i)(.*)\\.(html?|js|css|json)")) {
 				page = minifyHtml(page);
 			}
 			assert page != null;
-			writeFile(new File(output + File.separator + name), page);
+			writeFile(new File(outputDir + File.separator + name), page);
 		}
 	}
-	
+
 	private static String minifyHtml(String page) {
 		StringBuilder sb = new StringBuilder(page.length());
 		boolean space = false;
@@ -403,40 +381,32 @@ private static String minifyHtml(String page) {
 				space = false;
 				sb.appendCodePoint(c);
 			}
-			
+
 			i += Character.charCount(c);
 		}
-		return replaceBr(sb.toString());
+		return sb.toString();
 	}
 
-	/**
-	 * Replaces specifically `<br/>` with `\n` - This is useful in code blocks where you can't use newlines due to the
-	 * minifyHtml method (execute after minifyHtml)
-	 */
-	private static String replaceBr(String page) {
-		return page.replaceAll("<br/>", "\n");
-	}
-	
 	private static String handleIf(String desc, String start, boolean value) {
 		assert desc != null;
 		int ifStart = desc.indexOf(start);
 		while (ifStart != -1) {
 			int ifEnd = desc.indexOf("${end}", ifStart);
 			String data = desc.substring(ifStart + start.length() + 1, ifEnd);
-			
+
 			String before = desc.substring(0, ifStart);
 			String after = desc.substring(ifEnd + 6);
 			if (value)
 				desc = before + data + after;
 			else
 				desc = before + after;
-			
+
 			ifStart = desc.indexOf(start, ifEnd);
 		}
-		
+
 		return desc;
 	}
-	
+
 	/**
 	 * Generates documentation entry for a type which is documented using
 	 * annotations. This means expressions, effects and conditions.
@@ -456,33 +426,25 @@ private String generateAnnotated(String descTemp, SyntaxElementInfo<?> info, @Nu
 
 		// Since
 		Since since = c.getAnnotation(Since.class);
-		desc = desc.replace("${element.since}", getDefaultIfNullOrEmpty((since != null ? since.value() : null), "Unknown"));
+		desc = desc.replace("${element.since}", Joiner.on("<br/>").join(getDefaultIfNullOrEmpty((since != null ? since.value() : null), "Unknown")));
 
 		Keywords keywords = c.getAnnotation(Keywords.class);
 		desc = desc.replace("${element.keywords}", keywords == null ? "" : Joiner.on(", ").join(keywords.value()));
 
 		// Description
 		Description description = c.getAnnotation(Description.class);
-		desc = desc.replace("${element.desc}", Joiner.on("\n").join(getDefaultIfNullOrEmpty((description != null ? description.value() : null), "Unknown description.")).replace("\n\n", "<p>"));
-		desc = desc.replace("${element.desc-safe}", Joiner.on("\n").join(getDefaultIfNullOrEmpty((description != null ? description.value() : null), "Unknown description."))
-				.replace("\\", "\\\\").replace("\"", "\\\"").replace("\t", "    "));
+		desc = desc.replace("${element.desc}", Joiner.on("<br>").join(getDefaultIfNullOrEmpty((description != null ? description.value() : null), "Unknown description.")).replace("\n\n", "<p>"));
+		desc = desc.replace("${element.desc-safe}", Joiner.on("<br>").join(getDefaultIfNullOrEmpty((description != null ? description.value() : null), "Unknown description."))
+			.replace("\\", "\\\\").replace("\"", "\\\"").replace("\t", "    "));
 
 		// Examples
 		Examples examples = c.getAnnotation(Examples.class);
 		desc = desc.replace("${element.examples}", Joiner.on("<br>").join(getDefaultIfNullOrEmpty((examples != null ? Documentation.escapeHTML(examples.value()) : null), "Missing examples.")));
-		desc = desc.replace("${element.examples-safe}", Joiner.on("\\n").join(getDefaultIfNullOrEmpty((examples != null ? Documentation.escapeHTML(examples.value()) : null), "Missing examples."))
-				.replace("\\", "\\\\").replace("\"", "\\\"").replace("\t", "    "));
+		desc = desc.replace("${element.examples-safe}", Joiner.on("<br>").join(getDefaultIfNullOrEmpty((examples != null ? Documentation.escapeHTML(examples.value()) : null), "Missing examples."))
+			.replace("\\", "\\\\").replace("\"", "\\\"").replace("\t", "    "));
 
 		// Documentation ID
-		DocumentationId docId = c.getAnnotation(DocumentationId.class);
-		String ID = docId != null ? (docId != null ? docId.value() : null) : c.getSimpleName();
-		// Fix duplicated IDs
-		if (page != null) {
-			if (page.contains("href=\"#" + ID + "\"")) {
-				ID = ID + "-" + (StringUtils.countMatches(page, "href=\"#" + ID + "\"") + 1);
-			}
-		}
-		desc = desc.replace("${element.id}", ID);
+		desc = desc.replace("${element.id}", DocumentationIdProvider.getId(info));
 
 		// Cancellable
 		desc = handleIf(desc, "${if cancellable}", false);
@@ -518,7 +480,13 @@ private String generateAnnotated(String descTemp, SyntaxElementInfo<?> info, @Nu
 		desc = handleIf(desc, "${if by-addon}", false);
 
 		// New Elements
-		desc = handleIf(desc, "${if new-element}", NEW_TAG_PATTERN.matcher((since != null ? since.value() : "")).find());
+		if (since != null) {
+			String[] value = since.value();
+			String s = value[value.length - 1];
+			desc = handleIf(desc, "${if new-element}", NEW_TAG_PATTERN.matcher(s).find());
+		} else {
+			desc = handleIf(desc, "${if new-element}", false);
+		}
 
 		// Structure - EntryData
 		if (info instanceof StructureInfo) {
@@ -552,11 +520,11 @@ private String generateAnnotated(String descTemp, SyntaxElementInfo<?> info, @Nu
 
 			generate = desc.indexOf("${generate", nextBracket);
 		}
-		
+
 		// Assume element.pattern generate
 		for (String data : toGen) {
 			String[] split = data.split(" ");
-			String pattern = readFile(new File(template + "/templates/" + split[1]));
+			String pattern = readFile(new File(templateDir + "/templates/" + split[1]));
 			StringBuilder patterns = new StringBuilder();
 			for (String line : getDefaultIfNullOrEmpty(info.patterns, "Missing patterns.")) {
 				assert line != null;
@@ -564,7 +532,7 @@ private String generateAnnotated(String descTemp, SyntaxElementInfo<?> info, @Nu
 				String parsed = pattern.replace("${element.pattern}", line);
 				patterns.append(parsed);
 			}
-			
+
 			String toReplace = "${generate element.patterns " + split[1] + "}";
 			desc = desc.replace(toReplace, patterns.toString());
 			desc = desc.replace("${generate element.patterns-safe " + split[1] + "}", patterns.toString().replace("\\", "\\\\"));
@@ -573,7 +541,7 @@ private String generateAnnotated(String descTemp, SyntaxElementInfo<?> info, @Nu
 		assert desc != null;
 		return desc;
 	}
-	
+
 	private String generateEvent(String descTemp, SkriptEventInfo<?> info, @Nullable String page) {
 		Class<?> c = info.getElementClass();
 		String desc;
@@ -588,9 +556,9 @@ private String generateEvent(String descTemp, SkriptEventInfo<?> info, @Nullable
 
 		// Description
 		String[] description = getDefaultIfNullOrEmpty(info.getDescription(), "Missing description.");
-		desc = desc.replace("${element.desc}", Joiner.on("\n").join(description).replace("\n\n", "<p>"));
+		desc = desc.replace("${element.desc}", Joiner.on("<br>").join(description).replace("\n\n", "<p>"));
 		desc = desc
-				.replace("${element.desc-safe}", Joiner.on("\\n").join(description)
+			.replace("${element.desc-safe}", Joiner.on("<br>").join(description)
 				.replace("\\", "\\\\").replace("\"", "\\\"").replace("\t", "    "));
 
 		// By Addon
@@ -603,7 +571,7 @@ private String generateEvent(String descTemp, SkriptEventInfo<?> info, @Nullable
 		String[] examples = getDefaultIfNullOrEmpty(info.getExamples(), "Missing examples.");
 		desc = desc.replace("${element.examples}", Joiner.on("\n<br>").join(Documentation.escapeHTML(examples)));
 		desc = desc
-				.replace("${element.examples-safe}", Joiner.on("\\n").join(examples)
+			.replace("${element.examples-safe}", Joiner.on("<br>").join(examples)
 				.replace("\\", "\\\\").replace("\"", "\\\"").replace("\t", "    "));
 
 		String[] keywords = info.getKeywords();
@@ -621,14 +589,7 @@ private String generateEvent(String descTemp, SkriptEventInfo<?> info, @Nullable
 		desc = desc.replace("${element.cancellable}", cancellable ? "Yes" : ""); // if not cancellable the section is hidden
 
 		// Documentation ID
-		String ID = info.getDocumentationID() != null ? info.getDocumentationID() : info.getId();
-		// Fix duplicated IDs
-		if (page != null) {
-			if (page.contains("href=\"#" + ID + "\"")) {
-				ID = ID + "-" + (StringUtils.countMatches(page, "href=\"#" + ID + "\"") + 1);
-			}
-		}
-		desc = desc.replace("${element.id}", ID);
+		desc = desc.replace("${element.id}", DocumentationIdProvider.getId(info));
 
 		// Events
 		Events events = c.getAnnotation(Events.class);
@@ -668,14 +629,14 @@ private String generateEvent(String descTemp, SkriptEventInfo<?> info, @Nullable
 			int nextBracket = desc.indexOf("}", generate);
 			String data = desc.substring(generate + 11, nextBracket);
 			toGen.add(data);
-			
+
 			generate = desc.indexOf("${generate", nextBracket);
 		}
-		
+
 		// Assume element.pattern generate
 		for (String data : toGen) {
 			String[] split = data.split(" ");
-			String pattern = readFile(new File(template + "/templates/" + split[1]));
+			String pattern = readFile(new File(templateDir + "/templates/" + split[1]));
 			StringBuilder patterns = new StringBuilder();
 			for (String line : getDefaultIfNullOrEmpty(info.patterns, "Missing patterns.")) {
 				assert line != null;
@@ -683,7 +644,7 @@ private String generateEvent(String descTemp, SkriptEventInfo<?> info, @Nullable
 				String parsed = pattern.replace("${element.pattern}", line);
 				patterns.append(parsed);
 			}
-			
+
 			desc = desc.replace("${generate element.patterns " + split[1] + "}", patterns.toString());
 			desc = desc.replace("${generate element.patterns-safe " + split[1] + "}", patterns.toString().replace("\\", "\\\\"));
 		}
@@ -691,7 +652,7 @@ private String generateEvent(String descTemp, SkriptEventInfo<?> info, @Nullable
 		assert desc != null;
 		return desc;
 	}
-	
+
 	private String generateClass(String descTemp, ClassInfo<?> info, @Nullable String page) {
 		Class<?> c = info.getC();
 		String desc;
@@ -706,9 +667,9 @@ private String generateClass(String descTemp, ClassInfo<?> info, @Nullable Strin
 
 		// Description
 		String[] description = getDefaultIfNullOrEmpty(info.getDescription(), "Missing description.");
-		desc = desc.replace("${element.desc}", Joiner.on("\n").join(description).replace("\n\n", "<p>"));
+		desc = desc.replace("${element.desc}", Joiner.on("<br>").join(description).replace("\n\n", "<p>"));
 		desc = desc
-				.replace("${element.desc-safe}", Joiner.on("\\n").join(description)
+			.replace("${element.desc-safe}", Joiner.on("<br>").join(description)
 				.replace("\\", "\\\\").replace("\"", "\\\"").replace("\t", "    "));
 
 		// By Addon
@@ -720,21 +681,14 @@ private String generateClass(String descTemp, ClassInfo<?> info, @Nullable Strin
 		// Examples
 		String[] examples = getDefaultIfNullOrEmpty(info.getExamples(), "Missing examples.");
 		desc = desc.replace("${element.examples}", Joiner.on("\n<br>").join(Documentation.escapeHTML(examples)));
-		desc = desc.replace("${element.examples-safe}", Joiner.on("\\n").join(Documentation.escapeHTML(examples))
-				.replace("\\", "\\\\").replace("\"", "\\\"").replace("\t", "    "));
+		desc = desc.replace("${element.examples-safe}", Joiner.on("<br>").join(Documentation.escapeHTML(examples))
+			.replace("\\", "\\\\").replace("\"", "\\\"").replace("\t", "    "));
 
 		Keywords keywords = c.getAnnotation(Keywords.class);
 		desc = desc.replace("${element.keywords}", keywords == null ? "" : Joiner.on(", ").join(keywords.value()));
 
 		// Documentation ID
-		String ID = info.getDocumentationID() != null ? info.getDocumentationID() : info.getCodeName();
-		// Fix duplicated IDs
-		if (page != null) {
-			if (page.contains("href=\"#" + ID + "\"")) {
-				ID = ID + "-" + (StringUtils.countMatches(page, "href=\"#" + ID + "\"") + 1);
-			}
-		}
-		desc = desc.replace("${element.id}", ID);
+		desc = desc.replace("${element.id}", DocumentationIdProvider.getId(info));
 
 		// Cancellable
 		desc = handleIf(desc, "${if cancellable}", false);
@@ -777,14 +731,14 @@ private String generateClass(String descTemp, ClassInfo<?> info, @Nullable Strin
 			int nextBracket = desc.indexOf("}", generate);
 			String data = desc.substring(generate + 11, nextBracket);
 			toGen.add(data);
-			
+
 			generate = desc.indexOf("${generate", nextBracket);
 		}
-		
+
 		// Assume element.pattern generate
 		for (String data : toGen) {
 			String[] split = data.split(" ");
-			String pattern = readFile(new File(template + "/templates/" + split[1]));
+			String pattern = readFile(new File(templateDir + "/templates/" + split[1]));
 			StringBuilder patterns = new StringBuilder();
 			String[] lines = getDefaultIfNullOrEmpty(info.getUsage(), "Missing patterns.");
 			if (lines == null)
@@ -795,15 +749,15 @@ private String generateClass(String descTemp, ClassInfo<?> info, @Nullable Strin
 				String parsed = pattern.replace("${element.pattern}", line);
 				patterns.append(parsed);
 			}
-			
+
 			desc = desc.replace("${generate element.patterns " + split[1] + "}", patterns.toString());
 			desc = desc.replace("${generate element.patterns-safe " + split[1] + "}", patterns.toString().replace("\\", "\\\\"));
 		}
-		
+
 		assert desc != null;
 		return desc;
 	}
-	
+
 	private String generateFunction(String descTemp, JavaFunction<?> info) {
 		String desc = "";
 
@@ -817,9 +771,9 @@ private String generateFunction(String descTemp, JavaFunction<?> info) {
 
 		// Description
 		String[] description = getDefaultIfNullOrEmpty(info.getDescription(), "Missing description.");
-		desc = desc.replace("${element.desc}", Joiner.on("\n").join(description));
+		desc = desc.replace("${element.desc}", Joiner.on("<br>").join(description));
 		desc = desc
-				.replace("${element.desc-safe}", Joiner.on("\\n").join(description)
+			.replace("${element.desc-safe}", Joiner.on("<br>").join(description)
 				.replace("\\", "\\\\").replace("\"", "\\\"").replace("\t", "    "));
 
 		// By Addon
@@ -832,14 +786,14 @@ private String generateFunction(String descTemp, JavaFunction<?> info) {
 		String[] examples = getDefaultIfNullOrEmpty(info.getExamples(), "Missing examples.");
 		desc = desc.replace("${element.examples}", Joiner.on("\n<br>").join(Documentation.escapeHTML(examples)));
 		desc = desc
-				.replace("${element.examples-safe}", Joiner.on("\\n").join(examples)
+			.replace("${element.examples-safe}", Joiner.on("<br>").join(examples)
 				.replace("\\", "\\\\").replace("\"", "\\\"").replace("\t", "    "));
 
 		String[] keywords = info.getKeywords();
 		desc = desc.replace("${element.keywords}", keywords == null ? "" : Joiner.on(", ").join(keywords));
 
 		// Documentation ID
-		desc = desc.replace("${element.id}", info.getName());
+		desc = desc.replace("${element.id}", DocumentationIdProvider.getId(info));
 
 		// Cancellable
 		desc = handleIf(desc, "${if cancellable}", false);
@@ -870,31 +824,26 @@ private String generateFunction(String descTemp, JavaFunction<?> info) {
 			int nextBracket = desc.indexOf("}", generate);
 			String data = desc.substring(generate + 11, nextBracket);
 			toGen.add(data);
-			
+
 			generate = desc.indexOf("${generate", nextBracket);
 		}
-		
+
 		// Assume element.pattern generate
 		for (String data : toGen) {
 			String[] split = data.split(" ");
-			String pattern = readFile(new File(template + "/templates/" + split[1]));
+			String pattern = readFile(new File(templateDir + "/templates/" + split[1]));
 			String patterns = "";
-			Parameter<?>[] params = info.getParameters();
-			String[] types = new String[params.length];
-			for (int i = 0; i < types.length; i++) {
-				types[i] = params[i].toString();
-			}
-			String line = docName + "(" + Joiner.on(", ").join(types) + ")"; // Better not have nulls
+			String line = info.getSignature().toString(false, false); // Better not have nulls
 			patterns += pattern.replace("${element.pattern}", line);
-			
+
 			desc = desc.replace("${generate element.patterns " + split[1] + "}", patterns);
 			desc = desc.replace("${generate element.patterns-safe " + split[1] + "}", patterns.replace("\\", "\\\\"));
 		}
-		
+
 		assert desc != null;
 		return desc;
 	}
-	
+
 	@SuppressWarnings("null")
 	private static String readFile(File f) {
 		try {
@@ -904,7 +853,7 @@ private static String readFile(File f) {
 			return "";
 		}
 	}
-	
+
 	private static void writeFile(File f, String data) {
 		try {
 			Files.write(data, f, StandardCharsets.UTF_8);
@@ -912,7 +861,7 @@ private static void writeFile(File f, String data) {
 			e.printStackTrace();
 		}
 	}
-	
+
 	private static String cleanPatterns(final String patterns) {
 		return Documentation.cleanPatterns(patterns);
 	}
@@ -926,14 +875,14 @@ private static String cleanPatterns(final String patterns, boolean escapeHTML) {
 
 	/**
 	 * Checks if a string is empty or null then it will return the message provided
-	 * 
+	 *
 	 * @param string the String to check
 	 * @param message the String to return if either condition is true
 	 */
 	public String getDefaultIfNullOrEmpty(@Nullable String string, String message) {
 		return (string == null || string.isEmpty()) ? message : string; // Null check first otherwise NullPointerException is thrown
 	}
-	
+
 	public String[] getDefaultIfNullOrEmpty(@Nullable String[] string, String message) {
 		return (string == null || string.length == 0 || string[0].equals("")) ? new String[]{ message } : string; // Null check first otherwise NullPointerException is thrown
 	}
diff --git a/src/main/java/ch/njol/skript/doc/JSONGenerator.java b/src/main/java/ch/njol/skript/doc/JSONGenerator.java
new file mode 100644
index 00000000000..f8c9827474e
--- /dev/null
+++ b/src/main/java/ch/njol/skript/doc/JSONGenerator.java
@@ -0,0 +1,251 @@
+package ch.njol.skript.doc;
+
+import ch.njol.skript.Skript;
+import ch.njol.skript.classes.ClassInfo;
+import ch.njol.skript.lang.SkriptEventInfo;
+import ch.njol.skript.lang.SyntaxElement;
+import ch.njol.skript.lang.SyntaxElementInfo;
+import ch.njol.skript.lang.function.Functions;
+import ch.njol.skript.lang.function.JavaFunction;
+import ch.njol.skript.registrations.Classes;
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import com.google.gson.JsonArray;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonPrimitive;
+import org.jetbrains.annotations.Nullable;
+import org.skriptlang.skript.lang.structure.Structure;
+import org.skriptlang.skript.lang.structure.StructureInfo;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Iterator;
+import java.util.Objects;
+import java.util.stream.Stream;
+
+/**
+ * Generates JSON docs
+ */
+public class JSONGenerator extends DocumentationGenerator {
+
+	public JSONGenerator(File templateDir, File outputDir) {
+		super(templateDir, outputDir);
+	}
+
+	/**
+	 * Coverts a String array to a JsonArray
+	 * @param strings the String array to convert
+	 * @return the JsonArray containing the Strings
+	 */
+	private static @Nullable JsonArray convertToJsonArray(String @Nullable [] strings) {
+		if (strings == null)
+			return null;
+		JsonArray jsonArray = new JsonArray();
+		for (String string : strings)
+			jsonArray.add(new JsonPrimitive(string));
+		return jsonArray;
+	}
+
+	/**
+	 * Generates the documentation JsonObject for an element that is annotated with documentation
+	 * annotations (e.g. effects, conditions, etc.)
+	 * @param syntaxInfo the syntax info element to generate the documentation object of
+	 * @return the JsonObject representing the documentation of the provided syntax element
+	 */
+	private @Nullable JsonObject generatedAnnotatedElement(SyntaxElementInfo<?> syntaxInfo) {
+		Class<?> syntaxClass = syntaxInfo.getElementClass();
+		Name nameAnnotation = syntaxClass.getAnnotation(Name.class);
+		if (nameAnnotation == null || syntaxClass.getAnnotation(NoDoc.class) != null)
+			return null;
+		JsonObject syntaxJsonObject = new JsonObject();
+		syntaxJsonObject.addProperty("id", DocumentationIdProvider.getId(syntaxInfo));
+		syntaxJsonObject.addProperty("name", nameAnnotation.value());
+
+		Since sinceAnnotation = syntaxClass.getAnnotation(Since.class);
+		syntaxJsonObject.add("since", sinceAnnotation == null ? null : convertToJsonArray(sinceAnnotation.value()));
+
+		Description descriptionAnnotation = syntaxClass.getAnnotation(Description.class);
+		if (descriptionAnnotation != null) {
+			syntaxJsonObject.add("description", convertToJsonArray(descriptionAnnotation.value()));
+		} else {
+			syntaxJsonObject.add("description", new JsonArray());
+		}
+
+		Examples examplesAnnotation = syntaxClass.getAnnotation(Examples.class);
+		if (examplesAnnotation != null) {
+			syntaxJsonObject.add("examples", convertToJsonArray(examplesAnnotation.value()));
+		} else {
+			syntaxJsonObject.add("examples", new JsonArray());
+		}
+
+
+		syntaxJsonObject.add("patterns", convertToJsonArray(syntaxInfo.getPatterns()));
+		return syntaxJsonObject;
+	}
+
+	/**
+	 * Generates the documentation JsonObject for an event
+	 * @param eventInfo the event to generate the documentation object for
+	 * @return a documentation JsonObject for the event
+	 */
+	private JsonObject generateEventElement(SkriptEventInfo<?> eventInfo) {
+		JsonObject syntaxJsonObject = new JsonObject();
+		syntaxJsonObject.addProperty("id", DocumentationIdProvider.getId(eventInfo));
+		syntaxJsonObject.addProperty("name", eventInfo.name);
+		syntaxJsonObject.addProperty("since", eventInfo.getSince());
+		syntaxJsonObject.add("description", convertToJsonArray(eventInfo.getDescription()));
+		syntaxJsonObject.add("examples", convertToJsonArray(eventInfo.getExamples()));
+		syntaxJsonObject.add("patterns", convertToJsonArray(eventInfo.patterns));
+		return syntaxJsonObject;
+	}
+
+
+	/**
+	 * Generates a JsonArray containing the documentation JsonObjects for each structure in the iterator
+	 * @param infos the structures to generate documentation for
+	 * @return a JsonArray containing the documentation JsonObjects for each structure
+	 */
+	private <T extends StructureInfo<? extends Structure>> JsonArray generateStructureElementArray(Iterator<T> infos) {
+		JsonArray syntaxArray = new JsonArray();
+		infos.forEachRemaining(info -> {
+			if (info instanceof SkriptEventInfo<?> eventInfo) {
+				syntaxArray.add(generateEventElement(eventInfo));
+			} else {
+				JsonObject structureElementJsonObject = generatedAnnotatedElement(info);
+				if (structureElementJsonObject != null)
+					syntaxArray.add(structureElementJsonObject);
+			}
+		});
+		return syntaxArray;
+	}
+
+	/**
+	 * Generates a JsonArray containing the documentation JsonObjects for each syntax element in the iterator
+	 * @param infos the syntax elements to generate documentation for
+	 * @return a JsonArray containing the documentation JsonObjects for each syntax element
+	 */
+	private <T extends SyntaxElementInfo<? extends SyntaxElement>> JsonArray generateSyntaxElementArray(Iterator<T> infos) {
+		JsonArray syntaxArray = new JsonArray();
+		infos.forEachRemaining(info -> {
+			JsonObject syntaxJsonObject = generatedAnnotatedElement(info);
+			if (syntaxJsonObject != null)
+				syntaxArray.add(syntaxJsonObject);
+		});
+		return syntaxArray;
+	}
+
+	/**
+	 * Generates the documentation JsonObject for a classinfo
+	 * @param classInfo the ClassInfo to generate the documentation of
+	 * @return the documentation Jsonobject of the ClassInfo
+	 */
+	private @Nullable JsonObject generateClassInfoElement(ClassInfo<?> classInfo) {
+		if (!classInfo.hasDocs())
+			return null;
+		JsonObject syntaxJsonObject = new JsonObject();
+		syntaxJsonObject.addProperty("id", DocumentationIdProvider.getId(classInfo));
+		syntaxJsonObject.addProperty("name", getClassInfoName(classInfo));
+		syntaxJsonObject.addProperty("since", classInfo.getSince());
+		syntaxJsonObject.add("description", convertToJsonArray(classInfo.getDescription()));
+		syntaxJsonObject.add("examples", convertToJsonArray(classInfo.getExamples()));
+		syntaxJsonObject.add("patterns", convertToJsonArray(classInfo.getUsage()));
+		return syntaxJsonObject;
+	}
+
+	/**
+	 * Generates a JsonArray containing the documentation JsonObjects for each classinfo in the iterator
+	 * @param classInfos the classinfos to generate documentation for
+	 * @return a JsonArray containing the documentation JsonObjects for each classinfo
+	 */
+	private JsonArray generateClassInfoArray(Iterator<ClassInfo<?>> classInfos) {
+		JsonArray syntaxArray = new JsonArray();
+		classInfos.forEachRemaining(classInfo -> {
+			JsonObject classInfoElement = generateClassInfoElement(classInfo);
+			if (classInfoElement != null)
+				syntaxArray.add(classInfoElement);
+		});
+		return syntaxArray;
+	}
+
+	/**
+	 * Gets either the explicitly declared documentation name or code name of a ClassInfo
+	 * @param classInfo the ClassInfo to get the effective name of
+	 * @return the effective name of the ClassInfo
+	 */
+	private String getClassInfoName(ClassInfo<?> classInfo) {
+		return Objects.requireNonNullElse(classInfo.getDocName(), classInfo.getCodeName());
+	}
+
+	/**
+	 * Generates the documentation JsonObject for a JavaFunction
+	 * @param function the JavaFunction to generate the JsonObject of
+	 * @return the JsonObject of the JavaFunction
+	 */
+	private JsonObject generateFunctionElement(JavaFunction<?> function) {
+		JsonObject functionJsonObject = new JsonObject();
+		functionJsonObject.addProperty("id", DocumentationIdProvider.getId(function));
+		functionJsonObject.addProperty("name", function.getName());
+		functionJsonObject.addProperty("since", function.getSince());
+		functionJsonObject.add("description", convertToJsonArray(function.getDescription()));
+		functionJsonObject.add("examples", convertToJsonArray(function.getExamples()));
+
+		ClassInfo<?> returnType = function.getReturnType();
+		if (returnType != null) {
+			functionJsonObject.addProperty("return-type", getClassInfoName(returnType));
+		}
+
+		String functionSignature = function.getSignature().toString(false, false);
+		functionJsonObject.add("patterns", convertToJsonArray(new String[] { functionSignature }));
+		return functionJsonObject;
+	}
+
+	/**
+	 * Generates a JsonArray containing the documentation JsonObjects for each function in the iterator
+	 * @param functions the functions to generate documentation for
+	 * @return a JsonArray containing the documentation JsonObjects for each function
+	 */
+	private JsonArray generateFunctionArray(Iterator<JavaFunction<?>> functions) {
+		JsonArray syntaxArray = new JsonArray();
+		functions.forEachRemaining(function -> syntaxArray.add(generateFunctionElement(function)));
+		return syntaxArray;
+	}
+
+	/**
+	 * Writes the documentation JsonObject to an output path
+	 * @param outputPath the path to write the documentation to
+	 * @param jsonDocs the documentation JsonObject
+	 */
+	private void saveDocs(Path outputPath, JsonObject jsonDocs) {
+		try {
+			Gson jsonGenerator = new GsonBuilder().disableHtmlEscaping().setPrettyPrinting().create();
+			Files.writeString(outputPath, jsonGenerator.toJson(jsonDocs));
+		} catch (IOException exception) {
+			//noinspection ThrowableNotThrown
+			Skript.exception(exception, "An error occurred while trying to generate JSON documentation");
+		}
+	}
+
+	@Override
+	public void generate() {
+		JsonObject jsonDocs = new JsonObject();
+
+		jsonDocs.add("skriptVersion", new JsonPrimitive(Skript.getVersion().toString()));
+		jsonDocs.add("conditions", generateSyntaxElementArray(Skript.getConditions().iterator()));
+		jsonDocs.add("effects", generateSyntaxElementArray(Skript.getEffects().iterator()));
+		jsonDocs.add("expressions", generateSyntaxElementArray(Skript.getExpressions()));
+		jsonDocs.add("events", generateStructureElementArray(Skript.getEvents().iterator()));
+		jsonDocs.add("classes", generateClassInfoArray(Classes.getClassInfos().iterator()));
+
+		Stream<StructureInfo<? extends Structure>> structuresExcludingEvents = Skript.getStructures().stream()
+			.filter(structureInfo -> !(structureInfo instanceof SkriptEventInfo));
+		jsonDocs.add("structures", generateStructureElementArray(structuresExcludingEvents.iterator()));
+		jsonDocs.add("sections", generateSyntaxElementArray(Skript.getSections().iterator()));
+
+		jsonDocs.add("functions", generateFunctionArray(Functions.getJavaFunctions().iterator()));
+
+		saveDocs(outputDir.toPath().resolve("docs.json"), jsonDocs);
+	}
+
+}
diff --git a/src/main/java/ch/njol/skript/doc/Keywords.java b/src/main/java/ch/njol/skript/doc/Keywords.java
index b9c69ccf5bf..1d10575aa75 100644
--- a/src/main/java/ch/njol/skript/doc/Keywords.java
+++ b/src/main/java/ch/njol/skript/doc/Keywords.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.doc;
 
 import java.lang.annotation.Documented;
diff --git a/src/main/java/ch/njol/skript/doc/Name.java b/src/main/java/ch/njol/skript/doc/Name.java
index 162af205ec0..b41aec52ade 100644
--- a/src/main/java/ch/njol/skript/doc/Name.java
+++ b/src/main/java/ch/njol/skript/doc/Name.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.doc;
 
 import java.lang.annotation.Documented;
diff --git a/src/main/java/ch/njol/skript/doc/NoDoc.java b/src/main/java/ch/njol/skript/doc/NoDoc.java
index 7298002e603..8368643012b 100644
--- a/src/main/java/ch/njol/skript/doc/NoDoc.java
+++ b/src/main/java/ch/njol/skript/doc/NoDoc.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.doc;
 
 import java.lang.annotation.Documented;
diff --git a/src/main/java/ch/njol/skript/doc/RequiredPlugins.java b/src/main/java/ch/njol/skript/doc/RequiredPlugins.java
index 911b4fc50f5..ce36a2639c1 100644
--- a/src/main/java/ch/njol/skript/doc/RequiredPlugins.java
+++ b/src/main/java/ch/njol/skript/doc/RequiredPlugins.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.doc;
 
 import java.lang.annotation.Documented;
@@ -28,12 +10,13 @@
  * Provides a list of plugins other than Skript that the annotated
  * element requires to be used. Non-Spigot server software can be considered
  * to be plugins.
- * 
+ *
  */
 @Target(ElementType.TYPE)
 @Retention(RetentionPolicy.RUNTIME)
 @Documented
 public @interface RequiredPlugins {
-	
-    String[] value();
+
+	String[] value();
+
 }
diff --git a/src/main/java/ch/njol/skript/doc/Since.java b/src/main/java/ch/njol/skript/doc/Since.java
index fda08173456..d39ddab5b7b 100644
--- a/src/main/java/ch/njol/skript/doc/Since.java
+++ b/src/main/java/ch/njol/skript/doc/Since.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.doc;
 
 import java.lang.annotation.Documented;
@@ -33,5 +15,5 @@
 @Documented
 public @interface Since {
 	
-	public String value();
+	public String[] value();
 }
diff --git a/src/main/java/ch/njol/skript/effects/Delay.java b/src/main/java/ch/njol/skript/effects/Delay.java
index 1794e9c37d0..72e1a0dd786 100644
--- a/src/main/java/ch/njol/skript/effects/Delay.java
+++ b/src/main/java/ch/njol/skript/effects/Delay.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.effects;
 
 import ch.njol.skript.Skript;
@@ -65,7 +47,7 @@ public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelaye
 
 		duration = (Expression<Timespan>) exprs[0];
 		if (duration instanceof Literal) { // If we can, do sanity check for delays
-			long millis = ((Literal<Timespan>) duration).getSingle().getMilliSeconds();
+			long millis = ((Literal<Timespan>) duration).getSingle().getAs(Timespan.TimePeriod.MILLISECOND);
 			if (millis < 50) {
 				Skript.warning("Delays less than one tick are not possible, defaulting to one tick.");
 			}
@@ -108,7 +90,7 @@ protected TriggerItem walk(Event event) {
 				Variables.removeLocals(event); // Clean up local vars, we may be exiting now
 
 				SkriptTimings.stop(timing); // Stop timing if it was even started
-			}, Math.max(duration.getTicks(), 1)); // Minimum delay is one tick, less than it is useless!
+			}, Math.max(duration.getAs(Timespan.TimePeriod.TICK), 1)); // Minimum delay is one tick, less than it is useless!
 		}
 		return null;
 	}
diff --git a/src/main/java/ch/njol/skript/effects/EffActionBar.java b/src/main/java/ch/njol/skript/effects/EffActionBar.java
index 30f260f5807..07647482d3c 100644
--- a/src/main/java/ch/njol/skript/effects/EffActionBar.java
+++ b/src/main/java/ch/njol/skript/effects/EffActionBar.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.effects;
 
 import org.bukkit.entity.Player;
diff --git a/src/main/java/ch/njol/skript/effects/EffApplyBoneMeal.java b/src/main/java/ch/njol/skript/effects/EffApplyBoneMeal.java
index a758ebbc5eb..1a1712eedbf 100644
--- a/src/main/java/ch/njol/skript/effects/EffApplyBoneMeal.java
+++ b/src/main/java/ch/njol/skript/effects/EffApplyBoneMeal.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.effects;
 
 import ch.njol.skript.Skript;
diff --git a/src/main/java/ch/njol/skript/effects/EffBan.java b/src/main/java/ch/njol/skript/effects/EffBan.java
index 88f815c96df..02fd79af8d2 100644
--- a/src/main/java/ch/njol/skript/effects/EffBan.java
+++ b/src/main/java/ch/njol/skript/effects/EffBan.java
@@ -1,32 +1,5 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.effects;
 
-import java.net.InetSocketAddress;
-import java.util.Date;
-
-import org.bukkit.BanList;
-import org.bukkit.Bukkit;
-import org.bukkit.OfflinePlayer;
-import org.bukkit.entity.Player;
-import org.bukkit.event.Event;
-
 import ch.njol.skript.Skript;
 import ch.njol.skript.doc.Description;
 import ch.njol.skript.doc.Examples;
@@ -35,10 +8,19 @@
 import ch.njol.skript.lang.Effect;
 import ch.njol.skript.lang.Expression;
 import ch.njol.skript.lang.SkriptParser.ParseResult;
+import ch.njol.skript.lang.SyntaxStringBuilder;
 import ch.njol.skript.util.Timespan;
 import ch.njol.util.Kleenean;
+import org.bukkit.BanList;
+import org.bukkit.Bukkit;
+import org.bukkit.OfflinePlayer;
+import org.bukkit.entity.Player;
+import org.bukkit.event.Event;
 import org.jetbrains.annotations.Nullable;
 
+import java.net.InetSocketAddress;
+import java.util.Date;
+
 @Name("Ban")
 @Description({"Bans or unbans a player or an IP address.",
 	"If a reason is given, it will be shown to the player when they try to join the server while banned.",
@@ -54,7 +36,7 @@
 	"ban and kick player due to \"inappropriate language\" for 2 days"})
 @Since("1.4, 2.1.1 (ban reason), 2.5 (timespan), 2.9.0 (kick)")
 public class EffBan extends Effect {
-	
+
 	static {
 		Skript.registerEffect(EffBan.class,
 			"ban [kick:and kick] %strings/offlineplayers% [(by reason of|because [of]|on account of|due to) %-string%] [for %-timespan%]",
@@ -64,18 +46,18 @@ public class EffBan extends Effect {
 			"IP(-| )ban [kick:and kick] %players% [(by reason of|because [of]|on account of|due to) %-string%] [for %-timespan%]",
 			"(IP(-| )unban|un[-]IP[-]ban) %players%");
 	}
-	
+
 	@SuppressWarnings("null")
 	private Expression<?> players;
 	@Nullable
 	private Expression<String> reason;
 	@Nullable
 	private Expression<Timespan> expires;
-	
+
 	private boolean ban;
 	private boolean ipBan;
 	private boolean kick;
-	
+
 	@SuppressWarnings({"null", "unchecked"})
 	@Override
 	public boolean init(final Expression<?>[] exprs, final int matchedPattern, final Kleenean isDelayed, final ParseResult parseResult) {
@@ -87,13 +69,13 @@ public boolean init(final Expression<?>[] exprs, final int matchedPattern, final
 		kick = parseResult.hasTag("kick");
 		return true;
 	}
-	
+
 	@SuppressWarnings("null")
 	@Override
 	protected void execute(final Event e) {
 		final String reason = this.reason != null ? this.reason.getSingle(e) : null; // don't check for null, just ignore an invalid reason
 		Timespan ts = this.expires != null ? this.expires.getSingle(e) : null;
-		final Date expires = ts != null ? new Date(System.currentTimeMillis() + ts.getMilliSeconds()) : null;
+		final Date expires = ts != null ? new Date(System.currentTimeMillis() + ts.getAs(Timespan.TimePeriod.MILLISECOND)) : null;
 		final String source = "Skript ban effect";
 		for (final Object o : players.getArray(e)) {
 			if (o instanceof Player) {
@@ -137,15 +119,23 @@ protected void execute(final Event e) {
 			}
 		}
 	}
-	
+
 	@Override
-	public String toString(final @Nullable Event event, final boolean debug) {
-		return (ipBan ? "IP-" : "") +
-			(this.ban ? "ban " : "unban ") +
-			(kick ? "and kick " : "") +
-			this.players.toString(event, debug) +
-			(this.reason != null ? " on account of " + this.reason.toString(event, debug) : "") +
-			(expires != null ? " for " + expires.toString(event, debug) : "");
+	public String toString(@Nullable Event event, boolean debug) {
+		SyntaxStringBuilder builder = new SyntaxStringBuilder(event, debug);
+
+		if (ipBan)
+			builder.append("IP");
+		builder.append(ban ? "ban" : "unban");
+		if (kick)
+			builder.append("and kick");
+		builder.append(players);
+		if (reason != null)
+			builder.append("on account of", reason);
+		if (expires != null)
+			builder.append("for", expires);
+
+		return builder.toString();
 	}
-	
+
 }
diff --git a/src/main/java/ch/njol/skript/effects/EffBlockUpdate.java b/src/main/java/ch/njol/skript/effects/EffBlockUpdate.java
new file mode 100644
index 00000000000..90b24a2fcb8
--- /dev/null
+++ b/src/main/java/ch/njol/skript/effects/EffBlockUpdate.java
@@ -0,0 +1,67 @@
+package ch.njol.skript.effects;
+
+import ch.njol.skript.Skript;
+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.Effect;
+import ch.njol.skript.lang.Expression;
+import ch.njol.skript.lang.SkriptParser.ParseResult;
+import ch.njol.util.Kleenean;
+import org.bukkit.block.Block;
+import org.bukkit.block.data.BlockData;
+import org.bukkit.event.Event;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+@Name("Update Block")
+@Description({
+	"Updates the blocks by setting them to a selected block",
+	"Using 'without physics' will not send updates to the surrounding blocks of the blocks being set.",
+	"Example: Updating a block next to a sand block in the air 'without physics' will not cause the sand block to fall."
+})
+@Examples({
+	"update {_blocks::*} as gravel",
+	"update {_blocks::*} to be sand without physics updates",
+	"update {_blocks::*} as stone without neighbouring updates"
+})
+@Since("2.10")
+// Originally sourced from SkBee by ShaneBee (https://github.com/ShaneBeee/SkBee/blob/master/src/main/java/com/shanebeestudios/skbee/elements/other/effects/EffBlockstateUpdate.java)
+public class EffBlockUpdate extends Effect {
+
+	static {
+		Skript.registerEffect(EffBlockUpdate.class,
+			"update %blocks% (as|to be) %blockdata% [physics:without [neighbo[u]r[ing]|adjacent] [physic[s]] update[s]]");
+	}
+
+	private boolean physics;
+	private Expression<Block> blocks;
+	private Expression<BlockData> blockData;
+
+	@Override
+	@SuppressWarnings("unchecked")
+	public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelayed, ParseResult parseResult) {
+		this.physics = !parseResult.hasTag("physics");
+		this.blocks = (Expression<Block>) exprs[0];
+		this.blockData = (Expression<BlockData>) exprs[1];
+		return true;
+	}
+
+	@Override
+	protected void execute(Event event) {
+		BlockData data = this.blockData.getSingle(event);
+		if (data == null)
+			return;
+		for (Block block : this.blocks.getArray(event)) {
+			block.setBlockData(data, this.physics);
+		}
+	}
+
+	@Override
+	public @NotNull String toString(@Nullable Event event, boolean debug) {
+		return "update " + this.blocks.toString(event, debug) + " as "
+			+ this.blockData.toString(event, debug) + (this.physics ? "without neighbour updates" : "");
+	}
+
+}
diff --git a/src/main/java/ch/njol/skript/effects/EffBreakNaturally.java b/src/main/java/ch/njol/skript/effects/EffBreakNaturally.java
index 384d3d64a6e..2b1cce956dc 100644
--- a/src/main/java/ch/njol/skript/effects/EffBreakNaturally.java
+++ b/src/main/java/ch/njol/skript/effects/EffBreakNaturally.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.effects;
 
 import org.bukkit.block.Block;
diff --git a/src/main/java/ch/njol/skript/effects/EffBroadcast.java b/src/main/java/ch/njol/skript/effects/EffBroadcast.java
index 373565bfe6d..7b41e1f41fd 100644
--- a/src/main/java/ch/njol/skript/effects/EffBroadcast.java
+++ b/src/main/java/ch/njol/skript/effects/EffBroadcast.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.effects;
 
 import java.util.ArrayList;
diff --git a/src/main/java/ch/njol/skript/effects/EffCancelCooldown.java b/src/main/java/ch/njol/skript/effects/EffCancelCooldown.java
index 43330d42acf..a8706029d00 100644
--- a/src/main/java/ch/njol/skript/effects/EffCancelCooldown.java
+++ b/src/main/java/ch/njol/skript/effects/EffCancelCooldown.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.effects;
 
 import org.bukkit.event.Event;
diff --git a/src/main/java/ch/njol/skript/effects/EffCancelDrops.java b/src/main/java/ch/njol/skript/effects/EffCancelDrops.java
index 65e49689146..685b2d4e046 100644
--- a/src/main/java/ch/njol/skript/effects/EffCancelDrops.java
+++ b/src/main/java/ch/njol/skript/effects/EffCancelDrops.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.effects;
 
 import org.bukkit.event.Event;
diff --git a/src/main/java/ch/njol/skript/effects/EffCancelItemUse.java b/src/main/java/ch/njol/skript/effects/EffCancelItemUse.java
index e89967e3662..dc3013686fc 100644
--- a/src/main/java/ch/njol/skript/effects/EffCancelItemUse.java
+++ b/src/main/java/ch/njol/skript/effects/EffCancelItemUse.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.effects;
 
 import ch.njol.skript.Skript;
diff --git a/src/main/java/ch/njol/skript/effects/EffChange.java b/src/main/java/ch/njol/skript/effects/EffChange.java
index 238b494d656..0a755e24f57 100644
--- a/src/main/java/ch/njol/skript/effects/EffChange.java
+++ b/src/main/java/ch/njol/skript/effects/EffChange.java
@@ -1,32 +1,10 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.effects;
 
 import java.util.Arrays;
 import java.util.logging.Level;
 
 import ch.njol.skript.expressions.ExprParse;
-import ch.njol.skript.lang.Effect;
-import ch.njol.skript.lang.Expression;
-import ch.njol.skript.lang.ExpressionList;
-import ch.njol.skript.lang.SkriptParser;
-import ch.njol.skript.lang.Variable;
+import ch.njol.skript.lang.*;
 import org.skriptlang.skript.lang.script.ScriptWarning;
 import org.bukkit.event.Event;
 import org.jetbrains.annotations.Nullable;
@@ -82,40 +60,40 @@ public class EffChange extends Effect {
 			{"(add|give) %objects% to %~objects%", ChangeMode.ADD},
 			{"increase %~objects% by %objects%", ChangeMode.ADD},
 			{"give %~objects% %objects%", ChangeMode.ADD},
-			
+
 			{"set %~objects% to %objects%", ChangeMode.SET},
-			
+
 			{"remove (all|every) %objects% from %~objects%", ChangeMode.REMOVE_ALL},
-			
+
 			{"(remove|subtract) %objects% from %~objects%", ChangeMode.REMOVE},
 			{"(reduce|decrease) %~objects% by %objects%", ChangeMode.REMOVE},
-			
+
 			{"(delete|clear) %~objects%", ChangeMode.DELETE},
-			
+
 			{"reset %~objects%", ChangeMode.RESET}
 	});
-	
+
 	static {
 		Skript.registerEffect(EffChange.class, patterns.getPatterns());
 	}
-	
+
 	@SuppressWarnings("null")
 	private Expression<?> changed;
 	@Nullable
 	private Expression<?> changer = null;
-	
+
 	@SuppressWarnings("null")
 	private ChangeMode mode;
-	
+
 	private boolean single;
-	
+
 //	private Changer<?, ?> c = null;
-	
+
 	@SuppressWarnings({"unchecked", "null"})
 	@Override
 	public boolean init(final Expression<?>[] exprs, final int matchedPattern, final Kleenean isDelayed, final ParseResult parser) {
 		mode = patterns.getInfo(matchedPattern);
-		
+
 		switch (mode) {
 			case ADD:
 				if (matchedPattern == 0) {
@@ -149,7 +127,7 @@ public boolean init(final Expression<?>[] exprs, final int matchedPattern, final
 			case RESET:
 				changed = exprs[0];
 		}
-		
+
 		CountingLogHandler h = new CountingLogHandler(Level.SEVERE).start();
 		Class<?>[] rs;
 		String what;
@@ -192,12 +170,12 @@ public boolean init(final Expression<?>[] exprs, final int matchedPattern, final
 			}
 			return false;
 		}
-		
+
 		final Class<?>[] rs2 = new Class<?>[rs.length];
 		for (int i = 0; i < rs.length; i++)
 			rs2[i] = rs[i].isArray() ? rs[i].getComponentType() : rs[i];
 		final boolean allSingle = Arrays.equals(rs, rs2);
-		
+
 		Expression<?> ch = changer;
 		if (ch != null) {
 			Expression<?> v = null;
@@ -235,7 +213,7 @@ else if (mode == ChangeMode.SET)
 			} finally {
 				log.stop();
 			}
-			
+
 			Class<?> x = Utils.getSuperType(rs2);
 			single = allSingle;
 			for (int i = 0; i < rs.length; i++) {
@@ -247,7 +225,7 @@ else if (mode == ChangeMode.SET)
 			}
 			assert x != null;
 			changer = ch = v;
-			
+
 			if (!ch.canBeSingle() && single) {
 				if (mode == ChangeMode.SET)
 					Skript.error(changed + " can only be set to one " + Classes.getSuperClassInfo(x).getName() + ", not more", ErrorQuality.SEMANTIC_ERROR);
@@ -278,20 +256,27 @@ else if (mode == ChangeMode.SET)
 		}
 		return true;
 	}
-	
+
 	@Override
-	protected void execute(Event e) {
-		Object[] delta = changer == null ? null : changer.getArray(e);
+	protected void execute(Event event) {
+		Object[] delta = changer == null ? null : changer.getArray(event);
 		delta = changer == null ? delta : changer.beforeChange(changed, delta);
 
 		if ((delta == null || delta.length == 0) && (mode != ChangeMode.DELETE && mode != ChangeMode.RESET)) {
 			if (mode == ChangeMode.SET && changed.acceptChange(ChangeMode.DELETE) != null)
-				changed.change(e, null, ChangeMode.DELETE);
+				changed.change(event, null, ChangeMode.DELETE);
 			return;
 		}
-		changed.change(e, delta, mode);
+		if (mode.supportsKeyedChange() && changer != null && delta != null
+			&& changer instanceof KeyProviderExpression<?> provider
+			&& changed instanceof KeyReceiverExpression<?> receiver
+			&& provider.areKeysRecommended()) {
+			receiver.change(event, delta, mode, provider.getArrayKeys(event));
+		} else {
+			changed.change(event, delta, mode);
+		}
 	}
-	
+
 	@Override
 	public String toString(final @Nullable Event e, final boolean debug) {
 		final Expression<?> changer = this.changer;
@@ -316,5 +301,5 @@ public String toString(final @Nullable Event e, final boolean debug) {
 		assert false;
 		return "";
 	}
-	
+
 }
diff --git a/src/main/java/ch/njol/skript/effects/EffCharge.java b/src/main/java/ch/njol/skript/effects/EffCharge.java
new file mode 100644
index 00000000000..45563cf9d8d
--- /dev/null
+++ b/src/main/java/ch/njol/skript/effects/EffCharge.java
@@ -0,0 +1,61 @@
+package ch.njol.skript.effects;
+
+import ch.njol.skript.Skript;
+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.Effect;
+import ch.njol.skript.lang.Expression;
+import ch.njol.skript.lang.SkriptParser.ParseResult;
+import ch.njol.util.Kleenean;
+import org.bukkit.entity.Creeper;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.WitherSkull;
+import org.bukkit.event.Event;
+import org.jetbrains.annotations.Nullable;
+
+@Name("Charge Entity")
+@Description("Charges or uncharges a creeper or wither skull. A creeper is charged when it has been struck by lightning.")
+@Examples({
+	"on spawn of creeper:",
+		"\tcharge the event-entity"
+})
+@Since("2.5, 2.10 (wither skulls)")
+public class EffCharge extends Effect {
+
+	static {
+		Skript.registerEffect(EffCharge.class,
+				"make %entities% [un:(un|not |non[-| ])](charged|powered)",
+				"[:un](charge|power) %entities%");
+	}
+
+	@SuppressWarnings("NotNullFieldNotInitialized")
+	private Expression<Entity> entities;
+	private boolean charge;
+
+	@SuppressWarnings({"unchecked", "null"})
+	@Override
+	public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelayed, ParseResult parseResult) {
+		entities = (Expression<Entity>) exprs[0];
+		charge = !parseResult.hasTag("un");
+		return true;
+	}
+
+	@Override
+	protected void execute(Event event) {
+		for (Entity entity : entities.getArray(event)) {
+			if (entity instanceof Creeper creeper) {
+				creeper.setPowered(charge);
+			} else if (entity instanceof WitherSkull witherSkull) {
+				witherSkull.setCharged(charge);
+            }
+		}
+	}
+
+	@Override
+	public String toString(@Nullable Event event, boolean debug) {
+		return "make " + entities.toString(event, debug) + (charge ? " charged" : " not charged");
+	}
+
+}
diff --git a/src/main/java/ch/njol/skript/effects/EffChargeCreeper.java b/src/main/java/ch/njol/skript/effects/EffChargeCreeper.java
deleted file mode 100644
index 5ee162851a6..00000000000
--- a/src/main/java/ch/njol/skript/effects/EffChargeCreeper.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
-package ch.njol.skript.effects;
-
-import ch.njol.skript.Skript;
-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.Effect;
-import ch.njol.skript.lang.Expression;
-import ch.njol.skript.lang.SkriptParser.ParseResult;
-import ch.njol.util.Kleenean;
-
-import org.bukkit.entity.Creeper;
-import org.bukkit.entity.LivingEntity;
-import org.bukkit.event.Event;
-import org.jetbrains.annotations.Nullable;
-
-@Name("Charge Creeper")
-@Description("Charges or uncharges a creeper. A creeper is charged when it has been struck by lightning.")
-@Examples({"on spawn of creeper:", 
-			"\tcharge the event-entity"})
-@Since("2.5")
-public class EffChargeCreeper extends Effect {
-
-	static {
-		Skript.registerEffect(EffChargeCreeper.class,
-				"make %livingentities% [a[n]] (charged|powered|1¦((un|non[-])charged|(un|non[-])powered)) [creeper[s]]",
-				"(charge|power|1¦(uncharge|unpower)) %livingentities%");
-	}
-
-	@SuppressWarnings("null")
-	private Expression<LivingEntity> entities;
-
-	private boolean charge;
-
-	@SuppressWarnings({"unchecked", "null"})
-	@Override
-	public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelayed, ParseResult parseResult) {
-		entities = (Expression<LivingEntity>) exprs[0];
-		charge = parseResult.mark != 1;
-		return true;
-	}
-
-	@Override
-	protected void execute(Event e) {
-		for (LivingEntity le : entities.getArray(e)) {
-			if (le instanceof Creeper)
-				((Creeper) le).setPowered(charge);
-		}
-	}
-
-	@Override
-	public String toString(@Nullable Event e, boolean debug) {
-		return "make " + entities.toString(e, debug) + (charge == true ? " charged" : " not charged");
-	}
-}
diff --git a/src/main/java/ch/njol/skript/effects/EffColorItems.java b/src/main/java/ch/njol/skript/effects/EffColorItems.java
index aece411cb59..6f2fc81dce1 100644
--- a/src/main/java/ch/njol/skript/effects/EffColorItems.java
+++ b/src/main/java/ch/njol/skript/effects/EffColorItems.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.effects;
 
 import org.bukkit.event.Event;
@@ -94,7 +76,7 @@ protected Color[] get(Event e) {
 					if (r == null || g == null || b == null)
 						return null;
 					
-					return CollectionUtils.array(new ColorRGB(r.intValue(), g.intValue(), b.intValue()));
+					return CollectionUtils.array(ColorRGB.fromRGB(r.intValue(), g.intValue(), b.intValue()));
 				}
 				
 				@Override
diff --git a/src/main/java/ch/njol/skript/effects/EffCommand.java b/src/main/java/ch/njol/skript/effects/EffCommand.java
index 4b3c7a36d43..22f16cbe01a 100644
--- a/src/main/java/ch/njol/skript/effects/EffCommand.java
+++ b/src/main/java/ch/njol/skript/effects/EffCommand.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.effects;
 
 import org.bukkit.Bukkit;
diff --git a/src/main/java/ch/njol/skript/effects/EffCommandBlockConditional.java b/src/main/java/ch/njol/skript/effects/EffCommandBlockConditional.java
new file mode 100644
index 00000000000..e4a7101d34a
--- /dev/null
+++ b/src/main/java/ch/njol/skript/effects/EffCommandBlockConditional.java
@@ -0,0 +1,58 @@
+package ch.njol.skript.effects;
+
+import ch.njol.skript.Skript;
+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.Effect;
+import ch.njol.skript.lang.Expression;
+import ch.njol.skript.lang.SkriptParser.ParseResult;
+import ch.njol.util.Kleenean;
+import org.bukkit.block.Block;
+import org.bukkit.block.data.type.CommandBlock;
+import org.bukkit.event.Event;
+import org.jetbrains.annotations.Nullable;
+
+@Name("Conditional / Unconditional")
+@Description(
+	"Sets whether the provided command blocks are conditional or not."
+)
+@Examples({
+	"make command block {_block} conditional",
+	"make command block {_block} unconditional if {_block} is conditional"
+})
+@Since("2.10")
+public class EffCommandBlockConditional extends Effect {
+
+	static {
+		Skript.registerEffect(EffCommandBlockConditional.class, "make command block[s] %blocks% [not:(un|not )]conditional");
+	}
+
+	private Expression<Block> blocks;
+	private boolean conditional;
+
+	@Override
+	@SuppressWarnings("unchecked")
+	public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelayed, ParseResult parseResult) {
+		blocks = (Expression<Block>) exprs[0];
+		conditional = !parseResult.hasTag("not");
+		return true;
+	}
+
+	@Override
+	protected void execute(Event event) {
+		for (Block block : blocks.getArray(event)) {
+			if (block.getBlockData() instanceof CommandBlock cmdBlock) {
+				cmdBlock.setConditional(conditional);
+				block.setBlockData(cmdBlock);
+			}
+		}
+	}
+
+	@Override
+	public String toString(@Nullable Event event, boolean debug) {
+		return "make command block " + blocks.toString(event, debug) + (conditional ? " " : " un") + "conditional";
+	}
+
+}
diff --git a/src/main/java/ch/njol/skript/effects/EffConnect.java b/src/main/java/ch/njol/skript/effects/EffConnect.java
index aac68b2a1d5..53b0b20ffcc 100644
--- a/src/main/java/ch/njol/skript/effects/EffConnect.java
+++ b/src/main/java/ch/njol/skript/effects/EffConnect.java
@@ -1,26 +1,7 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.effects;
 
 import org.bukkit.entity.Player;
 import org.bukkit.event.Event;
-import org.jetbrains.annotations.Nullable;
 
 import ch.njol.skript.Skript;
 import ch.njol.skript.doc.Description;
@@ -29,65 +10,109 @@
 import ch.njol.skript.doc.Since;
 import ch.njol.skript.lang.Effect;
 import ch.njol.skript.lang.Expression;
-import ch.njol.skript.lang.SkriptParser;
+import ch.njol.skript.lang.SkriptParser.ParseResult;
 import ch.njol.skript.util.Utils;
 import ch.njol.util.Kleenean;
+import org.jetbrains.annotations.Nullable;
 
 @Name("Connect")
-@Description("Connects a player to another bungeecord server")
-@Examples("connect all players to \"hub\"")
-@Since("2.3")
+@Description({
+	"Connect a player to a server running on your proxy, or any server supporting transfers. Read below for more information.",
+	"If the server is running Minecraft 1.20.5 or above, you may specify an IP and Port to transfer a player over to that server.",
+	"When transferring players using an IP, the transfer will not complete if the `accepts-transfers` option isn't enabled in `server.properties` for the server specified.",
+	"If the port is not provided, it will default to `25565`."
+})
+@Examples({
+	"connect all players to proxy server \"hub\"",
+	"transfer player to server \"my.server.com\"",
+	"transfer player to server \"localhost\" on port 25566"
+})
+@Since("2.3, 2.10 (transfer)")
 public class EffConnect extends Effect {
 
 	public static final String BUNGEE_CHANNEL = "BungeeCord";
 	public static final String GET_SERVERS_CHANNEL = "GetServers";
 	public static final String CONNECT_CHANNEL = "Connect";
+	private static final boolean TRANSFER_METHOD_EXISTS = Skript.methodExists(Player.class, "transfer", String.class, int.class);
 
 	static {
 		Skript.registerEffect(EffConnect.class,
-				"connect %players% to [server] %string%",
-				"send %players% to server %string%"
+				"(send|connect) %players% to [proxy|bungeecord] [server] %string%",
+				"transfer %players% to server %string% [on port %-number%]"
 		);
 	}
 
-	@SuppressWarnings("null")
 	private Expression<Player> players;
-
-	@SuppressWarnings("null")
 	private Expression<String> server;
+	private Expression<Number> port;
+	private boolean transfer;
+
+	@Override
+	public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelayed, ParseResult parseResult) {
+		players = (Expression<Player>) exprs[0];
+		server = (Expression<String>) exprs[1];
+		transfer = matchedPattern == 1;
+
+		if (transfer) {
+			port = (Expression<Number>) exprs[2];
+			if (!TRANSFER_METHOD_EXISTS) {
+				Skript.error("Transferring players via IP is not available on this version.");
+				return false;
+			}
+		}
+		return true;
+	}
 
 	@Override
-	protected void execute(Event e) {
-		String server = this.server.getSingle(e);
-		Player[] players = this.players.stream(e)
+	protected void execute(Event event) {
+		String server = this.server.getSingle(event);
+		Player[] players = this.players.stream(event)
 			.filter(Player::isOnline)
 			.toArray(Player[]::new);
+
 		if (server == null || players.length == 0)
 			return;
 
-		// the message channel is case sensitive so let's fix that
-		Utils.sendPluginMessage(players[0], BUNGEE_CHANNEL, r -> GET_SERVERS_CHANNEL.equals(r.readUTF()), GET_SERVERS_CHANNEL)
-			.thenAccept(response -> {
-				// for loop isn't as pretty a stream, but will be faster with tons of servers
-				for (String validServer : response.readUTF().split(", ")) {
-					if (validServer.equalsIgnoreCase(server)) {
-						for (Player player : players)
-							Utils.sendPluginMessage(player, BUNGEE_CHANNEL, CONNECT_CHANNEL, validServer);
-						break;
-					}
+		if (transfer) {
+			if (this.port != null) {
+				Number portNum = this.port.getSingle(event);
+				if (portNum == null) {
+					return;
+				}
+				int port = portNum.intValue();
+				for (Player player : players) {
+					player.transfer(server, port);
 				}
-			});
+			} else {
+				int defaultPort = 25565;
+				for (Player player : players) {
+					player.transfer(server, defaultPort);
+				}
+			}
+		} else {
+			// the message channel is case-sensitive, so let's fix that
+			Utils.sendPluginMessage(players[0], BUNGEE_CHANNEL, r -> GET_SERVERS_CHANNEL.equals(r.readUTF()), GET_SERVERS_CHANNEL)
+				.thenAccept(response -> {
+					// for loop isn't as pretty as a stream, but will be faster with tons of servers
+					for (String validServer : response.readUTF().split(", ")) {
+						if (validServer.equalsIgnoreCase(server)) {
+							for (Player player : players)
+								Utils.sendPluginMessage(player, BUNGEE_CHANNEL, CONNECT_CHANNEL, validServer);
+							break;
+						}
+					}
+				});
+		}
 	}
 
 	@Override
-	public String toString(@Nullable Event e, boolean debug) {
-		return "connect " + players.toString(e, debug) + " to " + server.toString(e, debug);
+	public String toString(@Nullable Event event, boolean debug) {
+		if (transfer) {
+			String portString = port != null ? " on port " + port.toString(event, debug) : "";
+			return "transfer " + players.toString(event, debug) + " to server " + server.toString(event, debug) + portString;
+		} else {
+			return "connect " + players.toString(event, debug) + " to proxy server " + server.toString(event, debug);
+		}
 	}
 
-	@Override
-	public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelayed, SkriptParser.ParseResult parseResult) {
-		players = (Expression<Player>) exprs[0];
-		server = (Expression<String>) exprs[1];
-		return true;
-	}
 }
diff --git a/src/main/java/ch/njol/skript/effects/EffContinue.java b/src/main/java/ch/njol/skript/effects/EffContinue.java
index ec10001435a..3c3fb33a407 100644
--- a/src/main/java/ch/njol/skript/effects/EffContinue.java
+++ b/src/main/java/ch/njol/skript/effects/EffContinue.java
@@ -1,38 +1,19 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.effects;
 
 import ch.njol.skript.Skript;
+import ch.njol.skript.classes.data.JavaClasses;
 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.Effect;
-import ch.njol.skript.lang.Expression;
-import ch.njol.skript.lang.Literal;
-import ch.njol.skript.lang.LoopSection;
+import ch.njol.skript.lang.*;
 import ch.njol.skript.lang.SkriptParser.ParseResult;
-import ch.njol.skript.lang.TriggerItem;
+import ch.njol.skript.lang.parser.ParserInstance;
 import ch.njol.util.Kleenean;
 import ch.njol.util.StringUtils;
 import org.bukkit.event.Event;
 import org.jetbrains.annotations.Nullable;
+import org.jetbrains.annotations.UnknownNullability;
 
 import java.util.List;
 
@@ -61,39 +42,45 @@ public class EffContinue extends Effect {
 	static {
 		Skript.registerEffect(EffContinue.class,
 			"continue [this loop|[the] [current] loop]",
-			"continue [the] %*integer%(st|nd|rd|th) loop"
+			"continue [the] <" + JavaClasses.INTEGER_NUMBER_PATTERN + ">(st|nd|rd|th) loop"
 		);
 	}
 
-	@SuppressWarnings("NotNullFieldNotInitialized")
-	private LoopSection loop;
-	@SuppressWarnings("NotNullFieldNotInitialized")
-	private List<LoopSection> innerLoops;
+	// Used for toString
+	private int level;
 
-	@Override
-	@SuppressWarnings("unchecked")
-	public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelayed, ParseResult parseResult) {
-		List<LoopSection> currentLoops = getParser().getCurrentSections(LoopSection.class);
+	private @UnknownNullability LoopSection loop;
+	private @UnknownNullability List<SectionExitHandler> sectionsToExit;
+	private int breakLevels;
 
-		int size = currentLoops.size();
-		if (size == 0) {
+	@Override
+    public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelayed, ParseResult parseResult) {
+		ParserInstance parser = getParser();
+		int loops = parser.getCurrentSections(LoopSection.class).size();
+		if (loops == 0) {
 			Skript.error("The 'continue' effect may only be used in loops");
 			return false;
 		}
 
-		int level = matchedPattern == 0 ? size : ((Literal<Integer>) exprs[0]).getSingle();
-		if (level < 1) {
-			Skript.error("Can't continue the " + StringUtils.fancyOrderNumber(level) + " loop");
+		level = matchedPattern == 0 ? loops : Integer.parseInt(parseResult.regexes.get(0).group());
+		if (level < 1)
 			return false;
-		}
-		if (level > size) {
+
+		// ParserInstance#getSections counts from the innermost section, so we need to invert the level 
+		int levels = loops - level + 1;
+		if (levels <= 0) {
 			Skript.error("Can't continue the " + StringUtils.fancyOrderNumber(level) + " loop as there " +
-				(size == 1 ? "is only 1 loop" : "are only " + size + " loops") + " present");
+				(loops == 1 ? "is only 1 loop" : "are only " + loops + " loops") + " present");
 			return false;
 		}
 
-		loop = currentLoops.get(level - 1);
-		innerLoops = currentLoops.subList(level, size);
+        List<TriggerSection> innerSections = parser.getSections(levels, LoopSection.class);
+		breakLevels = innerSections.size();
+		loop = (LoopSection) innerSections.remove(0);
+		sectionsToExit = innerSections.stream()
+			.filter(SectionExitHandler.class::isInstance)
+			.map(SectionExitHandler.class::cast)
+			.toList();
 		return true;
 	}
 
@@ -103,16 +90,21 @@ protected void execute(Event event) {
 	}
 
 	@Override
-	@Nullable
-	protected TriggerItem walk(Event event) {
-		for (LoopSection loop : innerLoops)
-			loop.exit(event);
+	protected @Nullable TriggerItem walk(Event event) {
+		debug(event, false);
+		for (SectionExitHandler section : sectionsToExit)
+			section.exit(event);
 		return loop;
 	}
 
+	@Override
+	public ExecutionIntent executionIntent() {
+		return ExecutionIntent.stopSections(breakLevels);
+	}
+
 	@Override
 	public String toString(@Nullable Event event, boolean debug) {
-		return "continue";
+		return "continue" + (level == -1 ? "" : " the " + StringUtils.fancyOrderNumber(level) + " loop");
 	}
 
 }
diff --git a/src/main/java/ch/njol/skript/effects/EffCopy.java b/src/main/java/ch/njol/skript/effects/EffCopy.java
index c333c2d9e26..c792cf8925f 100644
--- a/src/main/java/ch/njol/skript/effects/EffCopy.java
+++ b/src/main/java/ch/njol/skript/effects/EffCopy.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.effects;
 
 import ch.njol.skript.Skript;
diff --git a/src/main/java/ch/njol/skript/effects/EffCustomName.java b/src/main/java/ch/njol/skript/effects/EffCustomName.java
new file mode 100644
index 00000000000..b83b2f9886d
--- /dev/null
+++ b/src/main/java/ch/njol/skript/effects/EffCustomName.java
@@ -0,0 +1,53 @@
+package ch.njol.skript.effects;
+
+import ch.njol.skript.Skript;
+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.Effect;
+import ch.njol.skript.lang.Expression;
+import ch.njol.skript.lang.SkriptParser.ParseResult;
+import ch.njol.util.Kleenean;
+import org.bukkit.entity.Entity;
+import org.bukkit.event.Event;
+import org.jetbrains.annotations.Nullable;
+
+@Name("Toggle Custom Name Visibility")
+@Description("Toggles the custom name visibility of an entity.")
+@Examples({
+	"show the custom name of event-entity",
+	"hide target's display name"
+})
+@Since("2.10")
+public class EffCustomName extends Effect {
+
+	static {
+		Skript.registerEffect(EffCustomName.class,
+			"(:show|hide) [the] (custom|display)[ ]name of %entities%",
+			"(:show|hide) %entities%'[s] (custom|display)[ ]name");
+	}
+
+	private boolean showCustomName;
+	private Expression<Entity> entities;
+
+	@Override
+	public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelayed, ParseResult parseResult) {
+		showCustomName = parseResult.hasTag("show");
+		entities = (Expression<Entity>) exprs[0];
+		return true;
+	}
+
+	@Override
+	protected void execute(Event event) {
+		for (Entity entity : entities.getArray(event)) {
+			entity.setCustomNameVisible(showCustomName);
+		}
+	}
+
+	@Override
+	public String toString(@Nullable Event event, boolean debug) {
+		return showCustomName ? "show" : "hide" + " the custom name of " + entities.toString(event, debug);
+	}
+
+}
diff --git a/src/main/java/ch/njol/skript/effects/EffDetonate.java b/src/main/java/ch/njol/skript/effects/EffDetonate.java
new file mode 100644
index 00000000000..df374e4b598
--- /dev/null
+++ b/src/main/java/ch/njol/skript/effects/EffDetonate.java
@@ -0,0 +1,63 @@
+package ch.njol.skript.effects;
+
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.WindCharge;
+import org.bukkit.entity.minecart.ExplosiveMinecart;
+import org.bukkit.entity.Firework;
+import org.bukkit.entity.Creeper;
+import org.bukkit.entity.TNTPrimed;
+import org.bukkit.event.Event;
+import org.jetbrains.annotations.Nullable;
+import ch.njol.skript.Skript;
+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.Effect;
+import ch.njol.skript.lang.Expression;
+import ch.njol.skript.lang.SkriptParser.ParseResult;
+import ch.njol.util.Kleenean;
+
+@Name("Detonate Entities")
+@Description("Immediately detonates an entity. Accepted entities are fireworks, TNT minecarts, primed TNT, wind charges and creepers.")
+@Examples("detonate last launched firework")
+@Since("2.10")
+public class EffDetonate extends Effect {
+
+	private static final boolean HAS_WINDCHARGE = Skript.classExists("org.bukkit.entity.WindCharge");
+
+	static {
+		Skript.registerEffect(EffDetonate.class, "detonate %entities%");
+	}
+
+	private Expression<Entity> entities;
+
+	@Override
+	@SuppressWarnings("unchecked")
+	public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelayed, ParseResult parseResult) {
+		entities = (Expression<Entity>) exprs[0];
+ 		return true;
+	}
+
+	@Override
+	protected void execute(Event event) {
+		for (Entity entity : entities.getArray(event)) {
+			if (entity instanceof Firework firework) {
+				firework.detonate();
+			} else if (HAS_WINDCHARGE && entity instanceof WindCharge windCharge) {
+				windCharge.explode();
+			} else if (entity instanceof ExplosiveMinecart explosiveMinecart) {
+				explosiveMinecart.explode();
+			} else if (entity instanceof Creeper creeper) {
+				creeper.explode();
+			} else if (entity instanceof TNTPrimed tntPrimed) {
+				tntPrimed.setFuseTicks(0);
+			}
+		}
+	}
+
+	public String toString(@Nullable Event event, boolean debug) {
+		return "detonate " + entities.toString(event, debug);
+	}
+
+}
diff --git a/src/main/java/ch/njol/skript/effects/EffDoIf.java b/src/main/java/ch/njol/skript/effects/EffDoIf.java
index 4cc6de996ac..0b0cc219177 100644
--- a/src/main/java/ch/njol/skript/effects/EffDoIf.java
+++ b/src/main/java/ch/njol/skript/effects/EffDoIf.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.effects;
 
 import org.bukkit.event.Event;
diff --git a/src/main/java/ch/njol/skript/effects/EffDrop.java b/src/main/java/ch/njol/skript/effects/EffDrop.java
index 0035731a7a1..29fb211b9ad 100644
--- a/src/main/java/ch/njol/skript/effects/EffDrop.java
+++ b/src/main/java/ch/njol/skript/effects/EffDrop.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.effects;
 
 import ch.njol.skript.Skript;
diff --git a/src/main/java/ch/njol/skript/effects/EffDropLeash.java b/src/main/java/ch/njol/skript/effects/EffDropLeash.java
new file mode 100644
index 00000000000..a57a7dafc22
--- /dev/null
+++ b/src/main/java/ch/njol/skript/effects/EffDropLeash.java
@@ -0,0 +1,59 @@
+package ch.njol.skript.effects;
+
+import org.bukkit.event.Event;
+import org.bukkit.event.entity.EntityUnleashEvent;
+import org.jetbrains.annotations.Nullable;
+
+import ch.njol.skript.Skript;
+import ch.njol.skript.doc.*;
+import ch.njol.skript.lang.Effect;
+import ch.njol.skript.lang.Expression;
+import ch.njol.skript.lang.SkriptParser;
+import ch.njol.util.Kleenean;
+
+@Name("Allow / Prevent Leash Drop")
+@Description("Allows or prevents the leash from being dropped in an unleash event.")
+@Examples({
+	"on unleash:",
+		"\tif player is not set:",
+			"\t\tprevent the leash from dropping",
+		"\telse if player is op:",
+			"\t\tallow the leash to drop"
+})
+@Keywords("lead")
+@Events("Unleash")
+@Since("2.10")
+public class EffDropLeash extends Effect {
+
+	static {
+			Skript.registerEffect(EffDropLeash.class,
+					"(force|allow) [the] (lead|leash) [item] to drop",
+					"(block|disallow|prevent) [the] (lead|leash) [item] from dropping"
+		);
+	}
+
+	private boolean allowLeashDrop;
+
+	@Override
+	public boolean init(Expression<?>[] expressions, int matchedPattern, Kleenean isDelayed, SkriptParser.ParseResult parseResult) {
+		if (!getParser().isCurrentEvent(EntityUnleashEvent.class)) {
+			Skript.error("The 'drop leash' effect can only be used in an 'unleash' event");
+			return false;
+		}
+		allowLeashDrop = matchedPattern == 0;
+		return true;
+	}
+
+	@Override
+	protected void execute(Event event) {
+		if (!(event instanceof EntityUnleashEvent unleashEvent))
+			return;
+		unleashEvent.setDropLeash(allowLeashDrop);
+	}
+
+	@Override
+	public String toString(@Nullable Event event, boolean debug) {
+		return allowLeashDrop ? "allow the leash to drop" : "prevent the leash from dropping";
+	}
+
+}
diff --git a/src/main/java/ch/njol/skript/effects/EffElytraBoostConsume.java b/src/main/java/ch/njol/skript/effects/EffElytraBoostConsume.java
new file mode 100644
index 00000000000..39b697e4646
--- /dev/null
+++ b/src/main/java/ch/njol/skript/effects/EffElytraBoostConsume.java
@@ -0,0 +1,58 @@
+package ch.njol.skript.effects;
+
+import ch.njol.skript.Skript;
+import ch.njol.skript.doc.*;
+import ch.njol.skript.lang.Effect;
+import ch.njol.skript.lang.Expression;
+import ch.njol.skript.lang.SkriptParser.ParseResult;
+import ch.njol.util.Kleenean;
+import com.destroystokyo.paper.event.player.PlayerElytraBoostEvent;
+import org.bukkit.event.Event;
+import org.jetbrains.annotations.Nullable;
+
+@Name("Consume Boosting Firework")
+@Description("Prevent the firework used in an 'elytra boost' event to be consumed.")
+@Examples({
+	"on elytra boost:",
+		"\tif the used firework will be consumed:",
+			"\t\tprevent the used firework from being consume"
+})
+@RequiredPlugins("Paper")
+@Since("2.10")
+public class EffElytraBoostConsume extends Effect {
+
+	static {
+		if (Skript.classExists("com.destroystokyo.paper.event.player.PlayerElytraBoostEvent")) {
+			Skript.registerEffect(EffElytraBoostConsume.class,
+				"(prevent|disallow) [the] (boosting|used) firework from being consumed",
+				"allow [the] (boosting|used) firework to be consumed");
+		}
+	}
+
+	private boolean consume;
+
+	@Override
+	public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelayed, ParseResult parseResult) {
+		if (!getParser().isCurrentEvent(PlayerElytraBoostEvent.class)) {
+			Skript.error("This effect can only be used in an 'elytra boost' event.");
+			return false;
+		}
+		consume = matchedPattern == 1;
+		return true;
+	}
+
+	@Override
+	protected void execute(Event event) {
+		if (!(event instanceof PlayerElytraBoostEvent boostEvent))
+			return;
+		boostEvent.setShouldConsume(consume);
+	}
+
+	@Override
+	public String toString(@Nullable Event event, boolean debug) {
+		if (consume)
+			return "allow the boosting firework to be consumed";
+		return "prevent the boosting firework from being consumed";
+	}
+
+}
diff --git a/src/main/java/ch/njol/skript/effects/EffEnchant.java b/src/main/java/ch/njol/skript/effects/EffEnchant.java
index 0e83dfcfefb..8f41e27c5d0 100644
--- a/src/main/java/ch/njol/skript/effects/EffEnchant.java
+++ b/src/main/java/ch/njol/skript/effects/EffEnchant.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.effects;
 
 import ch.njol.skript.Skript;
diff --git a/src/main/java/ch/njol/skript/effects/EffEnforceWhitelist.java b/src/main/java/ch/njol/skript/effects/EffEnforceWhitelist.java
index e8bbf9a780c..7b5b2cca22d 100644
--- a/src/main/java/ch/njol/skript/effects/EffEnforceWhitelist.java
+++ b/src/main/java/ch/njol/skript/effects/EffEnforceWhitelist.java
@@ -1,22 +1,3 @@
-/**
- * This file is part of Skript.
- *
- * Skript is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Skript is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.effects;
 
 import org.bukkit.Bukkit;
diff --git a/src/main/java/ch/njol/skript/effects/EffEntityVisibility.java b/src/main/java/ch/njol/skript/effects/EffEntityVisibility.java
new file mode 100644
index 00000000000..7352204d24c
--- /dev/null
+++ b/src/main/java/ch/njol/skript/effects/EffEntityVisibility.java
@@ -0,0 +1,95 @@
+package ch.njol.skript.effects;
+
+import ch.njol.skript.Skript;
+import ch.njol.skript.doc.*;
+import ch.njol.skript.expressions.ExprHiddenPlayers;
+import ch.njol.skript.lang.Effect;
+import ch.njol.skript.lang.Expression;
+import ch.njol.skript.lang.SkriptParser.ParseResult;
+import ch.njol.util.Kleenean;
+import org.bukkit.Bukkit;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.Player;
+import org.bukkit.event.Event;
+import org.jetbrains.annotations.Nullable;
+import org.jetbrains.annotations.UnknownNullability;
+
+@Name("Entity Visibility")
+@Description({
+	"Change visibility of the given entities for the given players.",
+	"If no players are given, will hide the entities from all online players.",
+	"",
+	"When reveal is used in combination of the <a href='expressions.html#ExprHiddenPlayers'>hidden players</a> " +
+	"expression and the viewers are not specified, " +
+	"this will default it to the given player in the hidden players expression.",
+	"",
+	"Note: all previously hidden entities (including players) will be visible when a player leaves and rejoins.",
+})
+@Examples({
+	"on spawn:",
+		"\tif event-entity is a chicken:",
+			"\t\thide event-entity",
+	"",
+	"reveal hidden players of players"
+})
+@Since("2.3, 2.10 (entities)")
+@RequiredPlugins("Minecraft 1.19+ (entities)")
+public class EffEntityVisibility extends Effect {
+
+	static {
+		Skript.registerEffect(EffEntityVisibility.class,
+				"hide %entities% [(from|for) %-players%]",
+				"reveal %entities% [(to|for|from) %-players%]");
+	}
+
+	private boolean reveal;
+
+	@UnknownNullability
+	private Expression<Entity> hidden;
+	@UnknownNullability
+	private Expression<Player> viewers;
+
+	@Override
+	@SuppressWarnings("unchecked")
+	public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelayed, ParseResult result) {
+		reveal = matchedPattern == 1;
+		hidden = (Expression<Entity>) exprs[0];
+
+		if (reveal && exprs[0] instanceof ExprHiddenPlayers && exprs.length == 1) {
+			viewers = ((ExprHiddenPlayers) exprs[0]).getViewers();
+		} else {
+			viewers = (Expression<Player>) exprs[1];
+		}
+
+		return true;
+	}
+
+    @Override
+    protected void execute(Event event) {
+		Player[] updated = viewers != null ? viewers.getArray(event) : Bukkit.getOnlinePlayers().toArray(new Player[0]);
+
+		Skript instance = Skript.getInstance();
+		if (reveal) {
+			for (Player player : updated) {
+				for (Entity entity : hidden.getArray(event)) {
+					player.showEntity(instance, entity);
+				}
+			}
+		} else {
+			for (Player player : updated) {
+				for (Entity entity : hidden.getArray(event)) {
+					player.hideEntity(instance, entity);
+				}
+			}
+		}
+    }
+
+	@Override
+	public String toString(@Nullable Event event, boolean debug) {
+		return (reveal ? "reveal " : "hide ") + "entities " +
+				hidden.toString(event, debug) +
+				(reveal ? " to " : " from ") +
+				viewers.toString(event, debug);
+	}
+
+}
diff --git a/src/main/java/ch/njol/skript/effects/EffEquip.java b/src/main/java/ch/njol/skript/effects/EffEquip.java
index 74ca1572497..04baeed397a 100644
--- a/src/main/java/ch/njol/skript/effects/EffEquip.java
+++ b/src/main/java/ch/njol/skript/effects/EffEquip.java
@@ -14,19 +14,29 @@
 import ch.njol.util.Kleenean;
 import org.bukkit.Material;
 import org.bukkit.Tag;
-import org.bukkit.entity.*;
+import org.bukkit.entity.AbstractHorse;
+import org.bukkit.entity.ChestedHorse;
+import org.bukkit.entity.Horse;
+import org.bukkit.entity.LivingEntity;
+import org.bukkit.entity.Llama;
+import org.bukkit.entity.Player;
+import org.bukkit.entity.Steerable;
+import org.bukkit.entity.Wolf;
 import org.bukkit.event.Event;
+import org.bukkit.inventory.AbstractHorseInventory;
 import org.bukkit.inventory.EntityEquipment;
-import org.bukkit.inventory.Inventory;
+import org.bukkit.inventory.EquipmentSlot;
+import org.bukkit.inventory.HorseInventory;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.LlamaInventory;
 import org.jetbrains.annotations.Nullable;
+import org.jetbrains.annotations.UnknownNullability;
 
 @Name("Equip")
-@Description(
-	"Equips or unequips an entity with some given armor. " +
-	"This will replace any armor that the entity is wearing."
-)
+@Description({
+	"Equips or unequips an entity with the given itemtypes (usually armor).",
+	"This effect will replace any armor that the entity is already wearing."
+})
 @Examples({
 	"equip player with diamond helmet",
 	"equip player with all diamond armor",
@@ -34,63 +44,22 @@
 	"unequip all armor from player",
 	"unequip player's armor"
 })
-@Since("1.0, 2.7 (multiple entities, unequip)")
+@Since("1.0, 2.7 (multiple entities, unequip), 2.10 (wolves)")
 public class EffEquip extends Effect {
 
-	private static final ItemType HORSE_ARMOR;
-
-	static {
-		if (Skript.isRunningMinecraft(1, 14)) {
-			HORSE_ARMOR = new ItemType(Material.IRON_HORSE_ARMOR, Material.GOLDEN_HORSE_ARMOR,
-					Material.DIAMOND_HORSE_ARMOR, Material.LEATHER_HORSE_ARMOR);
-		} else {
-			HORSE_ARMOR = new ItemType(Material.IRON_HORSE_ARMOR, Material.GOLDEN_HORSE_ARMOR,
-					Material.DIAMOND_HORSE_ARMOR);
-		}
-
-		Skript.registerEffect(EffEquip.class,
-				"equip [%livingentities%] with %itemtypes%",
-				"make %livingentities% wear %itemtypes%",
-				"unequip %itemtypes% [from %livingentities%]",
-				"unequip %livingentities%'[s] (armo[u]r|equipment)");
-	}
-
-	@SuppressWarnings("NotNullFieldNotInitialized")
-	private Expression<LivingEntity> entities;
-	@Nullable
-	private Expression<ItemType> itemTypes;
-
-	private boolean equip = true;
-
-	@Override
-	@SuppressWarnings("unchecked")
-	public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelayed, ParseResult parser) {
-		if (matchedPattern == 0 || matchedPattern == 1) {
-			entities = (Expression<LivingEntity>) exprs[0];
-			itemTypes = (Expression<ItemType>) exprs[1];
-		} else if (matchedPattern == 2) {
-			itemTypes = (Expression<ItemType>) exprs[0];
-			entities = (Expression<LivingEntity>) exprs[1];
-			equip = false;
-		} else if (matchedPattern == 3) {
-			entities = (Expression<LivingEntity>) exprs[0];
-			equip = false;
-		}
-		return true;
-	}
-
-	private static final boolean SUPPORTS_STEERABLE = Skript.classExists("org.bukkit.entity.Steerable");
-
 	private static ItemType CHESTPLATE;
 	private static ItemType LEGGINGS;
 	private static ItemType BOOTS;
-	private static ItemType CARPET;
+	private static ItemType CARPET = new ItemType(Tag.WOOL_CARPETS);
+	private static ItemType WOLF_ARMOR;
+	private static final ItemType HORSE_ARMOR = new ItemType(Material.LEATHER_HORSE_ARMOR, Material.IRON_HORSE_ARMOR, Material.GOLDEN_HORSE_ARMOR, Material.DIAMOND_HORSE_ARMOR);
 	private static final ItemType SADDLE = new ItemType(Material.SADDLE);
 	private static final ItemType CHEST = new ItemType(Material.CHEST);
 
 	static {
-		boolean usesWoolCarpetTag = Skript.fieldExists(Tag.class, "WOOL_CARPET");
-		CARPET = new ItemType(usesWoolCarpetTag ? Tag.WOOL_CARPETS : Tag.CARPETS);
+		boolean hasWolfArmor = Skript.fieldExists(Material.class, "WOLF_ARMOR");
+		WOLF_ARMOR = hasWolfArmor ? new ItemType(Material.WOLF_ARMOR) : new ItemType();
+
 		// added in 1.20.6
 		if (Skript.fieldExists(Tag.class, "ITEM_CHEST_ARMOR")) {
 			CHESTPLATE = new ItemType(Tag.ITEMS_CHEST_ARMOR);
@@ -103,6 +72,7 @@ public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelaye
 				Material.GOLDEN_CHESTPLATE,
 				Material.IRON_CHESTPLATE,
 				Material.DIAMOND_CHESTPLATE,
+        Material.NETHERITE_CHESTPLATE,
 				Material.ELYTRA
 			);
 
@@ -111,7 +81,8 @@ public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelaye
 				Material.CHAINMAIL_LEGGINGS,
 				Material.GOLDEN_LEGGINGS,
 				Material.IRON_LEGGINGS,
-				Material.DIAMOND_LEGGINGS
+				Material.DIAMOND_LEGGINGS,
+        Material.NETHERITE_LEGGINGS
 			);
 
 			BOOTS = new ItemType(
@@ -119,21 +90,44 @@ public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelaye
 				Material.CHAINMAIL_BOOTS,
 				Material.GOLDEN_BOOTS,
 				Material.IRON_BOOTS,
-				Material.DIAMOND_BOOTS
+				Material.DIAMOND_BOOTS,
+        Material.NETHERITE_BOOTS
 			);
-
-			// netherite
-			if (Skript.isRunningMinecraft(1,16)) {
-				CHESTPLATE.add(new ItemData(Material.NETHERITE_CHESTPLATE));
-				LEGGINGS.add(new ItemData(Material.NETHERITE_LEGGINGS));
-				BOOTS.add(new ItemData(Material.NETHERITE_BOOTS));
-			}
 		}
 	}
 
+	private static final ItemType[] ALL_EQUIPMENT = new ItemType[] {CHESTPLATE, LEGGINGS, BOOTS, HORSE_ARMOR, SADDLE, CHEST, CARPET, WOLF_ARMOR};
 
+	static {
+		Skript.registerEffect(EffEquip.class,
+				"equip [%livingentities%] with %itemtypes%",
+				"make %livingentities% wear %itemtypes%",
+				"unequip %itemtypes% [from %livingentities%]",
+				"unequip %livingentities%'[s] (armo[u]r|equipment)");
+	}
 
-	private static final ItemType[] ALL_EQUIPMENT = new ItemType[] {CHESTPLATE, LEGGINGS, BOOTS, HORSE_ARMOR, SADDLE, CHEST, CARPET};
+	@SuppressWarnings("NotNullFieldNotInitialized")
+	private Expression<LivingEntity> entities;
+	private @UnknownNullability Expression<ItemType> itemTypes;
+
+	private boolean equip = true;
+
+	@Override
+	@SuppressWarnings("unchecked")
+	public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelayed, ParseResult parser) {
+		if (matchedPattern == 0 || matchedPattern == 1) {
+			entities = (Expression<LivingEntity>) exprs[0];
+			itemTypes = (Expression<ItemType>) exprs[1];
+		} else if (matchedPattern == 2) {
+			itemTypes = (Expression<ItemType>) exprs[0];
+			entities = (Expression<LivingEntity>) exprs[1];
+			equip = false;
+		} else if (matchedPattern == 3) {
+			entities = (Expression<LivingEntity>) exprs[0];
+			equip = false;
+		}
+		return true;
+	}
 
 	@Override
 	protected void execute(Event event) {
@@ -146,44 +140,44 @@ protected void execute(Event event) {
 			unequipHelmet = true;
 		}
 		for (LivingEntity entity : entities.getArray(event)) {
-			if (SUPPORTS_STEERABLE && entity instanceof Steerable) {
+			if (entity instanceof Steerable steerable) {
 				for (ItemType itemType : itemTypes) {
 					if (SADDLE.isOfType(itemType.getMaterial())) {
-						((Steerable) entity).setSaddle(equip);
-					}
-				}
-			} else if (entity instanceof Pig) {
-				for (ItemType itemType : itemTypes) {
-					if (itemType.isOfType(Material.SADDLE)) {
-						((Pig) entity).setSaddle(equip);
-						break;
+						steerable.setSaddle(equip);
 					}
 				}
-			} else if (entity instanceof Llama) {
-				LlamaInventory inv = ((Llama) entity).getInventory();
+			} else if (entity instanceof Llama llama) {
+				LlamaInventory inv = llama.getInventory();
 				for (ItemType itemType : itemTypes) {
 					for (ItemStack item : itemType.getAll()) {
 						if (CARPET.isOfType(item)) {
 							inv.setDecor(equip ? item : null);
 						} else if (CHEST.isOfType(item)) {
-							((Llama) entity).setCarryingChest(equip);
+							llama.setCarryingChest(equip);
 						}
 					}
 				}
-			} else if (entity instanceof AbstractHorse) {
-				// Spigot's API is bad, just bad... Abstract horse doesn't have horse inventory!
-				Inventory inv = ((AbstractHorse) entity).getInventory();
+			} else if (entity instanceof AbstractHorse horse) {
+				AbstractHorseInventory inv = horse.getInventory();
 				for (ItemType itemType : itemTypes) {
 					for (ItemStack item : itemType.getAll()) {
 						if (SADDLE.isOfType(item)) {
-							inv.setItem(0, equip ? item : null); // Slot 0=saddle
-						} else if (HORSE_ARMOR.isOfType(item)) {
-							inv.setItem(1, equip ? item : null); // Slot 1=armor
-						} else if (CHEST.isOfType(item) && entity instanceof ChestedHorse) {
-							((ChestedHorse) entity).setCarryingChest(equip);
+							inv.setSaddle(equip ? item : null);
+						} else if (HORSE_ARMOR.isOfType(item) && entity instanceof Horse) {
+							((HorseInventory) inv).setArmor(equip ? item : null);
+						} else if (CHEST.isOfType(item) && entity instanceof ChestedHorse chestedHorse) { // a Donkey, Mule, Llama or TraderLlama. NOT a Horse
+							chestedHorse.setCarryingChest(equip);
 						}
 					}
 				}
+			} else if (entity instanceof Wolf wolf) {
+				EntityEquipment equipment = wolf.getEquipment();
+				for (ItemType itemType : itemTypes) {
+					for (ItemStack item : itemType.getAll()) {
+						if (WOLF_ARMOR.isOfType(item))
+							equipment.setItem(EquipmentSlot.BODY, equip ? item : null);
+					}
+				}
 			} else {
 				EntityEquipment equipment = entity.getEquipment();
 				if (equipment == null)
@@ -205,8 +199,8 @@ protected void execute(Event event) {
 						equipment.setHelmet(null);
 					}
 				}
-				if (entity instanceof Player)
-					PlayerUtils.updateInventory((Player) entity);
+				if (entity instanceof Player player)
+					PlayerUtils.updateInventory(player);
 			}
 		}
 	}
diff --git a/src/main/java/ch/njol/skript/effects/EffExceptionDebug.java b/src/main/java/ch/njol/skript/effects/EffExceptionDebug.java
index e819190b170..af2f6480ca7 100644
--- a/src/main/java/ch/njol/skript/effects/EffExceptionDebug.java
+++ b/src/main/java/ch/njol/skript/effects/EffExceptionDebug.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.effects;
 
 import org.bukkit.event.Event;
diff --git a/src/main/java/ch/njol/skript/effects/EffExit.java b/src/main/java/ch/njol/skript/effects/EffExit.java
index 3ed9948d33a..7d9a2ac61ec 100644
--- a/src/main/java/ch/njol/skript/effects/EffExit.java
+++ b/src/main/java/ch/njol/skript/effects/EffExit.java
@@ -1,41 +1,19 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.effects;
 
 import ch.njol.skript.Skript;
+import ch.njol.skript.classes.data.JavaClasses;
 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.Effect;
-import ch.njol.skript.lang.Expression;
-import ch.njol.skript.lang.SectionExitHandler;
-import ch.njol.skript.lang.LoopSection;
+import ch.njol.skript.lang.*;
 import ch.njol.skript.lang.SkriptParser.ParseResult;
-import ch.njol.skript.lang.TriggerItem;
-import ch.njol.skript.lang.TriggerSection;
 import ch.njol.skript.lang.parser.ParserInstance;
-import ch.njol.skript.log.ErrorQuality;
 import ch.njol.skript.sections.SecConditional;
 import ch.njol.util.Kleenean;
 import org.bukkit.event.Event;
 import org.jetbrains.annotations.Nullable;
+import org.jetbrains.annotations.UnknownNullability;
 
 import java.util.List;
 
@@ -51,95 +29,96 @@
 		"\tset loop-block to water"
 })
 @Since("<i>unknown</i> (before 2.1)")
-public class EffExit extends Effect { // TODO [code style] warn user about code after a stop effect
+public class EffExit extends Effect {
 
 	static {
 		Skript.registerEffect(EffExit.class,
-				"(exit|stop) [trigger]",
-				"(exit|stop) [(1|a|the|this)] (section|1:loop|2:conditional)",
-				"(exit|stop) <\\d+> (section|1:loop|2:conditional)s",
-				"(exit|stop) all (section|1:loop|2:conditional)s");
+			"(exit|stop) [trigger]",
+			"(exit|stop) [1|a|the|this] (section|1:loop|2:conditional)",
+			"(exit|stop) <" + JavaClasses.INTEGER_NUMBER_PATTERN + "> (section|1:loop|2:conditional)s",
+			"(exit|stop) all (section|1:loop|2:conditional)s");
 	}
-	
-	private int breakLevels;
-	
-	private static final int EVERYTHING = 0;
-	private static final int LOOPS = 1;
-	private static final int CONDITIONALS = 2;
+
+	@SuppressWarnings("unchecked")
+	private static final Class<? extends TriggerSection>[] types = new Class[]{TriggerSection.class, LoopSection.class, SecConditional.class};
 	private static final String[] names = {"sections", "loops", "conditionals"};
 	private int type;
-	
+
+	private int breakLevels;
+	private TriggerSection outerSection;
+	private @UnknownNullability List<SectionExitHandler> sectionsToExit;
+
 	@Override
-	public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelayed, ParseResult parser) {
+	public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelayed, ParseResult parseResult) {
+		List<TriggerSection> innerSections = null;
 		switch (matchedPattern) {
-			case 0:
-				breakLevels = getParser().getCurrentSections().size() + 1;
-				type = EVERYTHING;
-				break;
-			case 1:
-			case 2:
-				breakLevels = matchedPattern == 1 ? 1 : Integer.parseInt(parser.regexes.get(0).group());
-				type = parser.mark;
-				if (breakLevels > numLevels(type)) {
-					if (numLevels(type) == 0)
-						Skript.error("can't stop any " + names[type] + " as there are no " + names[type] + " present", ErrorQuality.SEMANTIC_ERROR);
-					else
-						Skript.error("can't stop " + breakLevels + " " + names[type] + " as there are only " + numLevels(type) + " " + names[type] + " present", ErrorQuality.SEMANTIC_ERROR);
+			case 0 -> {
+				innerSections = getParser().getCurrentSections();
+				breakLevels = innerSections.size() + 1;
+			}
+			case 1, 2 -> {
+				breakLevels = matchedPattern == 1 ? 1 : Integer.parseInt(parseResult.regexes.get(0).group());
+				if (breakLevels < 1)
+					return false;
+				type = parseResult.mark;
+				ParserInstance parser = getParser();
+				int levels = parser.getCurrentSections(types[type]).size();
+				if (breakLevels > levels) {
+					if (levels == 0) {
+						Skript.error("Can't stop any " + names[type] + " as there are no " + names[type] + " present");
+					} else {
+						Skript.error("Can't stop " + breakLevels + " " + names[type] + " as there are only " + levels + " " + names[type] + " present");
+					}
 					return false;
 				}
-				break;
-			case 3:
-				type = parser.mark;
-				breakLevels = numLevels(type);
-				if (breakLevels == 0) {
-					Skript.error("can't stop any " + names[type] + " as there are no " + names[type] + " present", ErrorQuality.SEMANTIC_ERROR);
+				innerSections = parser.getSections(breakLevels, types[type]);
+				outerSection = innerSections.get(0);
+			}
+			case 3 -> {
+				ParserInstance parser = getParser();
+				type = parseResult.mark;
+				List<? extends TriggerSection> sections = parser.getCurrentSections(types[type]);
+				if (sections.isEmpty()) {
+					Skript.error("Can't stop any " + names[type] + " as there are no " + names[type] + " present");
 					return false;
 				}
-				break;
+				outerSection = sections.get(0);
+				innerSections = parser.getSectionsUntil(outerSection);
+				innerSections.add(0, outerSection);
+				breakLevels = innerSections.size();
+			}
 		}
+        assert innerSections != null;
+		sectionsToExit = innerSections.stream()
+			.filter(SectionExitHandler.class::isInstance)
+			.map(SectionExitHandler.class::cast)
+			.toList();
 		return true;
 	}
-	
-	private static int numLevels(int type) {
-		List<TriggerSection> currentSections = ParserInstance.get().getCurrentSections();
-		if (type == EVERYTHING)
-			return currentSections.size();
-		int level = 0;
-		for (TriggerSection section : currentSections) {
-			if (type == CONDITIONALS ? section instanceof SecConditional : section instanceof LoopSection)
-				level++;
-		}
-		return level;
-	}
-	
+
 	@Override
-	@Nullable
-	protected TriggerItem walk(Event event) {
+	protected @Nullable TriggerItem walk(Event event) {
 		debug(event, false);
-		TriggerItem node = this;
-		for (int i = breakLevels; i > 0;) {
-			node = node.getParent();
-			if (node == null) {
-				assert false : this;
-				return null;
-			}
-			if (node instanceof SectionExitHandler)
-				((SectionExitHandler) node).exit(event);
-
-			if (type == EVERYTHING || type == CONDITIONALS && node instanceof SecConditional || type == LOOPS && (node instanceof LoopSection))
-				i--;
-		}
-		return node instanceof LoopSection ? ((LoopSection) node).getActualNext() : node.getNext();
+		for (SectionExitHandler section : sectionsToExit)
+			section.exit(event);
+		if (outerSection == null)
+			return null;
+		return outerSection instanceof LoopSection loopSection ? loopSection.getActualNext() : outerSection.getNext();
 	}
-	
+
 	@Override
 	protected void execute(Event event) {
 		assert false;
 	}
-	
+
+	@Override
+	public @Nullable ExecutionIntent executionIntent() {
+		return ExecutionIntent.stopSections(breakLevels);
+	}
+
 	@Override
 	public String toString(@Nullable Event event, boolean debug) {
 		return "stop " + breakLevels + " " + names[type];
 	}
-	
+
 }
diff --git a/src/main/java/ch/njol/skript/effects/EffExplodeCreeper.java b/src/main/java/ch/njol/skript/effects/EffExplodeCreeper.java
index 6ae10a2f4f3..c9937916d14 100644
--- a/src/main/java/ch/njol/skript/effects/EffExplodeCreeper.java
+++ b/src/main/java/ch/njol/skript/effects/EffExplodeCreeper.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.effects;
 
 import org.bukkit.entity.Creeper;
diff --git a/src/main/java/ch/njol/skript/effects/EffExplosion.java b/src/main/java/ch/njol/skript/effects/EffExplosion.java
index f2e301559a9..93c413aa47d 100644
--- a/src/main/java/ch/njol/skript/effects/EffExplosion.java
+++ b/src/main/java/ch/njol/skript/effects/EffExplosion.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.effects;
 
 import org.bukkit.Location;
diff --git a/src/main/java/ch/njol/skript/effects/EffFeed.java b/src/main/java/ch/njol/skript/effects/EffFeed.java
index 61b2506bda2..4ca51be1bbd 100644
--- a/src/main/java/ch/njol/skript/effects/EffFeed.java
+++ b/src/main/java/ch/njol/skript/effects/EffFeed.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.effects;
 
 import ch.njol.skript.Skript;
diff --git a/src/main/java/ch/njol/skript/effects/EffFireResistant.java b/src/main/java/ch/njol/skript/effects/EffFireResistant.java
index c5044e376fe..26560eb1699 100644
--- a/src/main/java/ch/njol/skript/effects/EffFireResistant.java
+++ b/src/main/java/ch/njol/skript/effects/EffFireResistant.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.effects;
 
 import ch.njol.skript.Skript;
diff --git a/src/main/java/ch/njol/skript/effects/EffFireworkLaunch.java b/src/main/java/ch/njol/skript/effects/EffFireworkLaunch.java
index 4a7ef269664..1f44850104a 100644
--- a/src/main/java/ch/njol/skript/effects/EffFireworkLaunch.java
+++ b/src/main/java/ch/njol/skript/effects/EffFireworkLaunch.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.effects;
 
 import org.bukkit.FireworkEffect;
diff --git a/src/main/java/ch/njol/skript/effects/EffForceAttack.java b/src/main/java/ch/njol/skript/effects/EffForceAttack.java
index fb885fb6ba5..dc8f19cc02a 100644
--- a/src/main/java/ch/njol/skript/effects/EffForceAttack.java
+++ b/src/main/java/ch/njol/skript/effects/EffForceAttack.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.effects;
 
 import org.bukkit.entity.Entity;
diff --git a/src/main/java/ch/njol/skript/effects/EffForceEnchantmentGlint.java b/src/main/java/ch/njol/skript/effects/EffForceEnchantmentGlint.java
new file mode 100644
index 00000000000..24f14e6ac7c
--- /dev/null
+++ b/src/main/java/ch/njol/skript/effects/EffForceEnchantmentGlint.java
@@ -0,0 +1,73 @@
+package ch.njol.skript.effects;
+
+import org.bukkit.event.Event;
+import org.bukkit.inventory.meta.ItemMeta;
+import org.jetbrains.annotations.Nullable;
+
+import ch.njol.skript.Skript;
+import ch.njol.skript.aliases.ItemType;
+import ch.njol.skript.doc.*;
+import ch.njol.skript.lang.Effect;
+import ch.njol.skript.lang.Expression;
+import ch.njol.skript.lang.SkriptParser.ParseResult;
+import ch.njol.util.Kleenean;
+
+@Name("Force Enchantment Glint")
+@Description("Forces the items to glint or not, or removes its existing enchantment glint enforcement.")
+@Examples({
+	"force {_items::*} to glint",
+	"force the player's tool to stop glinting"
+})
+@RequiredPlugins("Spigot 1.20.5+")
+@Since("2.10")
+public class EffForceEnchantmentGlint extends Effect {
+
+	static {
+		if (Skript.methodExists(ItemMeta.class, "setEnchantmentGlintOverride", Boolean.class))
+			Skript.registerEffect(EffForceEnchantmentGlint.class,
+					"(force|make) %itemtypes% [to] [start] glint[ing]",
+					"(force|make) %itemtypes% [to] (not|stop) glint[ing]",
+					"(clear|delete|reset) [the] enchantment glint override of %itemtypes%",
+					"(clear|delete|reset) %itemtypes%'s enchantment glint override");
+	}
+
+	private Expression<ItemType> itemTypes;
+	private int pattern;
+
+	@Override
+	@SuppressWarnings("unchecked")
+	public boolean init(Expression<?>[] expressions, int matchedPattern, Kleenean isDelayed, ParseResult parseResult) {
+		itemTypes = (Expression<ItemType>) expressions[0];
+		pattern = matchedPattern;
+		return true;
+	}
+
+	@Override
+	protected void execute(Event event) {
+		for (ItemType itemType : itemTypes.getArray(event)) {
+			ItemMeta meta = itemType.getItemMeta();
+			Boolean glint;
+			if (pattern == 0) {
+				// Pattern: forced to glint
+				glint = true;
+			} else if (pattern == 1) {
+				// Pattern: forced to not glint
+				glint = false;
+			} else {
+				// Pattern: Clear glint override
+				glint = null;
+			}
+			meta.setEnchantmentGlintOverride(glint);
+			itemType.setItemMeta(meta);
+		}
+	}
+
+	@Override
+	public String toString(@Nullable Event event, boolean debug) {
+		// Pattern: Clear glint override
+		if (pattern > 1)
+			return "clear the enchantment glint override of " + itemTypes.toString(event, debug);
+		return "force " + itemTypes.toString(event, debug) + " to " + (pattern == 0 ? "start" : "stop") + " glinting";
+	}
+
+}
diff --git a/src/main/java/ch/njol/skript/effects/EffGlowingText.java b/src/main/java/ch/njol/skript/effects/EffGlowingText.java
index d3b9fc85c90..8cd0b84da86 100644
--- a/src/main/java/ch/njol/skript/effects/EffGlowingText.java
+++ b/src/main/java/ch/njol/skript/effects/EffGlowingText.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.effects;
 
 import ch.njol.skript.Skript;
diff --git a/src/main/java/ch/njol/skript/effects/EffHandedness.java b/src/main/java/ch/njol/skript/effects/EffHandedness.java
index 9d0c870e773..b93e6302e61 100644
--- a/src/main/java/ch/njol/skript/effects/EffHandedness.java
+++ b/src/main/java/ch/njol/skript/effects/EffHandedness.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.effects;
 
 import ch.njol.skript.Skript;
diff --git a/src/main/java/ch/njol/skript/effects/EffHealth.java b/src/main/java/ch/njol/skript/effects/EffHealth.java
index 43d4a4e883e..28d21dd87b9 100644
--- a/src/main/java/ch/njol/skript/effects/EffHealth.java
+++ b/src/main/java/ch/njol/skript/effects/EffHealth.java
@@ -1,30 +1,14 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.effects;
 
 import ch.njol.skript.Skript;
 import ch.njol.skript.aliases.ItemType;
+import ch.njol.skript.bukkitutil.DamageUtils;
 import ch.njol.skript.bukkitutil.HealthUtils;
 import ch.njol.skript.bukkitutil.ItemUtils;
 import ch.njol.skript.doc.Description;
 import ch.njol.skript.doc.Examples;
 import ch.njol.skript.doc.Name;
+import ch.njol.skript.doc.RequiredPlugins;
 import ch.njol.skript.doc.Since;
 import ch.njol.skript.lang.Effect;
 import ch.njol.skript.lang.Expression;
@@ -34,42 +18,53 @@
 import ch.njol.util.Math2;
 import org.bukkit.entity.Damageable;
 import org.bukkit.event.Event;
+import org.bukkit.event.entity.EntityDamageEvent.DamageCause;
 import org.bukkit.inventory.ItemStack;
 import org.jetbrains.annotations.Nullable;
+import org.jetbrains.annotations.UnknownNullability;
 
 @Name("Damage/Heal/Repair")
-@Description("Damage/Heal/Repair an entity, or item.")
+@Description({
+	"Damage, heal, or repair an entity or item.",
+	"Servers running Spigot 1.20.4+ can optionally choose to specify a fake damage cause."
+})
 @Examples({
 	"damage player by 5 hearts",
+	"damage player by 3 hearts with fake cause fall",
 	"heal the player",
 	"repair tool of player"
 })
-@Since("1.0")
+@Since("1.0, 2.10 (damage cause)")
+@RequiredPlugins("Spigot 1.20.4+ (for damage cause)")
 public class EffHealth extends Effect {
+	private static final boolean SUPPORTS_DAMAGE_SOURCE = Skript.classExists("org.bukkit.damage.DamageSource");
 
 	static {
 		Skript.registerEffect(EffHealth.class,
-			"damage %livingentities/itemtypes/slots% by %number% [heart[s]] [with fake cause %-damagecause%]",
+			"damage %livingentities/itemtypes/slots% by %number% [heart[s]] [with [fake] [damage] cause %-damagecause%]",
 			"heal %livingentities% [by %-number% [heart[s]]]",
 			"repair %itemtypes/slots% [by %-number%]");
 	}
 
 	private Expression<?> damageables;
-	@Nullable
-	private Expression<Number> amount;
+	private @UnknownNullability Expression<Number> amount;
 	private boolean isHealing, isRepairing;
+	private @UnknownNullability Expression<DamageCause> exprCause = null;
 
-	@SuppressWarnings("unchecked")
 	@Override
+	@SuppressWarnings("unchecked")
 	public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelayed, ParseResult parseResult) {
-		if (matchedPattern == 0 && exprs[2] != null)
-			Skript.warning("The fake damage cause extension of this effect has no functionality, " +
-				"and will be removed in the future");
+		if (matchedPattern == 0 && exprs[2] != null && !SUPPORTS_DAMAGE_SOURCE) {
+			Skript.error("Using the fake cause extension in effect 'damage' requires Spigot 1.20.4+");
+			return false;
+		}
 
 		this.damageables = exprs[0];
 		this.isHealing = matchedPattern >= 1;
 		this.isRepairing = matchedPattern == 2;
 		this.amount = (Expression<Number>) exprs[1];
+		if (exprs.length > 2)
+			this.exprCause = (Expression<DamageCause>) exprs[2];
 		return true;
 	}
 
@@ -84,8 +79,7 @@ protected void execute(Event event) {
 		}
 
 		for (Object obj : this.damageables.getArray(event)) {
-			if (obj instanceof ItemType) {
-				ItemType itemType = (ItemType) obj;
+			if (obj instanceof ItemType itemType) {
 
 				if (this.amount == null) {
 					ItemUtils.setDamage(itemType, 0);
@@ -93,8 +87,7 @@ protected void execute(Event event) {
 					ItemUtils.setDamage(itemType, (int) Math2.fit(0, (ItemUtils.getDamage(itemType) + (isHealing ? -amount : amount)), ItemUtils.getMaxDamage(itemType)));
 				}
 
-			} else if (obj instanceof Slot) {
-				Slot slot = (Slot) obj;
+			} else if (obj instanceof Slot slot) {
 				ItemStack itemStack = slot.getItem();
 
 				if (itemStack == null)
@@ -109,14 +102,19 @@ protected void execute(Event event) {
 
 				slot.setItem(itemStack);
 
-			} else if (obj instanceof Damageable) {
-				Damageable damageable = (Damageable) obj;
-
+			} else if (obj instanceof Damageable damageable) {
 				if (this.amount == null) {
 					HealthUtils.heal(damageable, HealthUtils.getMaxHealth(damageable));
 				} else if (isHealing) {
 					HealthUtils.heal(damageable, amount);
 				} else {
+					if (SUPPORTS_DAMAGE_SOURCE) {
+						DamageCause cause = exprCause == null ? null : exprCause.getSingle(event);
+						if (cause != null) {
+							HealthUtils.damage(damageable, amount, DamageUtils.getDamageSourceFromCause(cause));
+							return;
+						}
+					}
 					HealthUtils.damage(damageable, amount);
 				}
 
@@ -126,15 +124,15 @@ protected void execute(Event event) {
 
 	@Override
 	public String toString(@Nullable Event event, boolean debug) {
-
 		String prefix = "damage ";
 		if (isRepairing) {
 			prefix = "repair ";
 		} else if (isHealing) {
 			prefix = "heal ";
 		}
-
-		return prefix + damageables.toString(event, debug) + (amount != null ? " by " + amount.toString(event, debug) : "");
+		return prefix + damageables.toString(event, debug)
+				   + (amount != null ? " by " + amount.toString(event, debug) : "")
+				   + (exprCause != null && event != null ? " with damage cause " + exprCause.getSingle(event) : "");
 	}
 
 }
diff --git a/src/main/java/ch/njol/skript/effects/EffHidePlayerFromServerList.java b/src/main/java/ch/njol/skript/effects/EffHidePlayerFromServerList.java
index b88031dead4..f2307e42517 100644
--- a/src/main/java/ch/njol/skript/effects/EffHidePlayerFromServerList.java
+++ b/src/main/java/ch/njol/skript/effects/EffHidePlayerFromServerList.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.effects;
 
 import java.util.Arrays;
@@ -74,11 +56,12 @@ public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelaye
 	}
 
 	@Override
+	@SuppressWarnings("removal")
 	protected void execute(Event e) {
 		if (!(e instanceof ServerListPingEvent))
 			return;
 
-		Iterator<Player> it = ((ServerListPingEvent) e).iterator();		
+		Iterator<Player> it = ((ServerListPingEvent) e).iterator();
 		Iterators.removeAll(it, Arrays.asList(players.getArray(e)));
 	}
 
@@ -87,4 +70,4 @@ public String toString(@Nullable Event e, boolean debug) {
 		return "hide " + players.toString(e, debug) + " from the server list";
 	}
 
-}
\ No newline at end of file
+}
diff --git a/src/main/java/ch/njol/skript/effects/EffIgnite.java b/src/main/java/ch/njol/skript/effects/EffIgnite.java
index 07fa720a37a..20392f897d3 100644
--- a/src/main/java/ch/njol/skript/effects/EffIgnite.java
+++ b/src/main/java/ch/njol/skript/effects/EffIgnite.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.effects;
 
 import org.bukkit.Bukkit;
@@ -78,7 +60,7 @@ protected void execute(Event event) {
 			Timespan timespan = this.duration.getSingle(event);
 			if (timespan == null)
 				return;
-			duration = (int) timespan.getTicks();
+			duration = (int) timespan.getAs(Timespan.TimePeriod.TICK);
 		}
 		for (Entity entity : entities.getArray(event)) {
 			if (event instanceof EntityDamageEvent && ((EntityDamageEvent) event).getEntity() == entity && !Delay.isDelayed(event)) {
@@ -99,7 +81,7 @@ public void run() {
 	@Override
 	public String toString(@Nullable Event event, boolean debug) {
 		if (ignite)
-			return "set " + entities.toString(event, debug) + " on fire for " + (duration != null ? duration.toString(event, debug) : Timespan.fromTicks(DEFAULT_DURATION).toString());
+			return "set " + entities.toString(event, debug) + " on fire for " + (duration != null ? duration.toString(event, debug) : new Timespan(Timespan.TimePeriod.TICK, DEFAULT_DURATION).toString());
 		else
 			return "extinguish " + entities.toString(event, debug);
 	}
diff --git a/src/main/java/ch/njol/skript/effects/EffIncendiary.java b/src/main/java/ch/njol/skript/effects/EffIncendiary.java
index 6cd3ae4eba9..181444137cf 100644
--- a/src/main/java/ch/njol/skript/effects/EffIncendiary.java
+++ b/src/main/java/ch/njol/skript/effects/EffIncendiary.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.effects;
 
 import org.bukkit.entity.Entity;
diff --git a/src/main/java/ch/njol/skript/effects/EffInvisible.java b/src/main/java/ch/njol/skript/effects/EffInvisible.java
index ca62a52ea8b..af8d1206ef3 100644
--- a/src/main/java/ch/njol/skript/effects/EffInvisible.java
+++ b/src/main/java/ch/njol/skript/effects/EffInvisible.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.effects;
 
 import ch.njol.skript.Skript;
diff --git a/src/main/java/ch/njol/skript/effects/EffInvulnerability.java b/src/main/java/ch/njol/skript/effects/EffInvulnerability.java
index 021121912ee..9585f88b97f 100644
--- a/src/main/java/ch/njol/skript/effects/EffInvulnerability.java
+++ b/src/main/java/ch/njol/skript/effects/EffInvulnerability.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.effects;
 
 import org.bukkit.entity.Entity;
diff --git a/src/main/java/ch/njol/skript/effects/EffKeepInventory.java b/src/main/java/ch/njol/skript/effects/EffKeepInventory.java
index 3031c0a045e..3ed179e28ba 100644
--- a/src/main/java/ch/njol/skript/effects/EffKeepInventory.java
+++ b/src/main/java/ch/njol/skript/effects/EffKeepInventory.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.effects;
 
 import org.bukkit.event.Event;
diff --git a/src/main/java/ch/njol/skript/effects/EffKick.java b/src/main/java/ch/njol/skript/effects/EffKick.java
index 86279643f08..ef89ad297ea 100644
--- a/src/main/java/ch/njol/skript/effects/EffKick.java
+++ b/src/main/java/ch/njol/skript/effects/EffKick.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.effects;
 
 import org.bukkit.entity.Player;
diff --git a/src/main/java/ch/njol/skript/effects/EffKill.java b/src/main/java/ch/njol/skript/effects/EffKill.java
index 214c847ac5c..882dc83c6e6 100644
--- a/src/main/java/ch/njol/skript/effects/EffKill.java
+++ b/src/main/java/ch/njol/skript/effects/EffKill.java
@@ -1,24 +1,7 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.effects;
 
 import ch.njol.skript.Skript;
+import ch.njol.skript.bukkitutil.DamageUtils;
 import ch.njol.skript.bukkitutil.HealthUtils;
 import ch.njol.skript.doc.Description;
 import ch.njol.skript.doc.Examples;
@@ -28,73 +11,67 @@
 import ch.njol.skript.lang.Expression;
 import ch.njol.skript.lang.SkriptParser.ParseResult;
 import ch.njol.util.Kleenean;
-import org.bukkit.GameMode;
 import org.bukkit.entity.Damageable;
 import org.bukkit.entity.EnderDragonPart;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
 import org.bukkit.event.Event;
+import org.bukkit.event.entity.EntityDamageEvent;
 import org.jetbrains.annotations.Nullable;
 
-/**
- * @author Peter Güttinger
- */
 @Name("Kill")
-@Description({"Kills an entity.",
-		"Note: This effect does not set the entity's health to 0 (which causes issues), but damages the entity by 100 times its maximum health."})
-@Examples({"kill the player",
-		"kill all creepers in the player's world",
-		"kill all endermen, witches and bats"})
-@Since("1.0")
+@Description("Kills an entity.")
+@Examples({
+	"kill the player",
+	"kill all creepers in the player's world",
+	"kill all endermen, witches and bats"
+})
+@Since("1.0, 2.10 (ignoring totem of undying)")
 public class EffKill extends Effect {
 
+	private static final boolean SUPPORTS_DAMAGE_SOURCE = Skript.classExists("org.bukkit.damage.DamageSource");
+
 	static {
 		Skript.registerEffect(EffKill.class, "kill %entities%");
 	}
-	
-	// Absolutely make sure it dies
-	public static final int DAMAGE_AMOUNT = Integer.MAX_VALUE;
-	
-	@SuppressWarnings("null")
+
 	private Expression<Entity> entities;
-	
-	@SuppressWarnings({"unchecked", "null"})
+
 	@Override
-	public boolean init(final Expression<?>[] exprs, final int matchedPattern, final Kleenean isDelayed, final ParseResult parser) {
-		entities = (Expression<Entity>) exprs[0];
+	public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelayed, ParseResult parser) {
+		//noinspection unchecked
+		this.entities = (Expression<Entity>) exprs[0];
 		return true;
 	}
 
 	@Override
-	protected void execute(final Event e) {
-		for (Entity entity : entities.getArray(e)) {
-
-			if (entity instanceof EnderDragonPart) {
-				entity = ((EnderDragonPart) entity).getParent();
-			}
-
-			if (entity instanceof Damageable) {
-				final boolean creative = entity instanceof Player && ((Player) entity).getGameMode() == GameMode.CREATIVE;
-				if (creative) // Set player to survival before applying damage
-					((Player) entity).setGameMode(GameMode.SURVIVAL);
+	protected void execute(Event event) {
+		for (Entity entity : entities.getArray(event)) {
 
-				HealthUtils.damage((Damageable) entity, HealthUtils.getMaxHealth((Damageable) entity) * 100); // just to make sure that it really dies >:)
+			if (entity instanceof EnderDragonPart part)
+				entity = part.getParent();
 
-				if (creative) // Set creative player back to creative
-					((Player) entity).setGameMode(GameMode.CREATIVE);
+			if (entity instanceof Damageable damageable) {
+				if (SUPPORTS_DAMAGE_SOURCE) {
+					EntityDamageEvent.DamageCause cause = EntityDamageEvent.DamageCause.KILL;
+					HealthUtils.damage(damageable, 100 + damageable.getHealth(), DamageUtils.getDamageSourceFromCause(cause));
+				} else {
+					HealthUtils.setHealth(damageable, 0);
+					HealthUtils.damage(damageable, 1);
+				}
 			}
 
 			// if everything done so far has failed to kill this thing
 			// We also don't want to remove a player as this would remove the player's data from the server.
 			if (entity.isValid() && !(entity instanceof Player))
 				entity.remove();
-			
+
 		}
 	}
-	
+
 	@Override
-	public String toString(final @Nullable Event e, final boolean debug) {
-		return "kill" + entities.toString(e, debug);
+	public String toString(@Nullable Event event, boolean debug) {
+		return "kill " + entities.toString(event, debug);
 	}
 
 }
diff --git a/src/main/java/ch/njol/skript/effects/EffKnockback.java b/src/main/java/ch/njol/skript/effects/EffKnockback.java
index 6d85db09198..de43ed17322 100644
--- a/src/main/java/ch/njol/skript/effects/EffKnockback.java
+++ b/src/main/java/ch/njol/skript/effects/EffKnockback.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.effects;
 
 import ch.njol.skript.Skript;
diff --git a/src/main/java/ch/njol/skript/effects/EffLeash.java b/src/main/java/ch/njol/skript/effects/EffLeash.java
index 305bf3959e7..4e1b0159b08 100644
--- a/src/main/java/ch/njol/skript/effects/EffLeash.java
+++ b/src/main/java/ch/njol/skript/effects/EffLeash.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.effects;
 
 import org.bukkit.entity.Entity;
diff --git a/src/main/java/ch/njol/skript/effects/EffLidState.java b/src/main/java/ch/njol/skript/effects/EffLidState.java
new file mode 100644
index 00000000000..3bd13014836
--- /dev/null
+++ b/src/main/java/ch/njol/skript/effects/EffLidState.java
@@ -0,0 +1,62 @@
+package ch.njol.skript.effects;
+
+import ch.njol.skript.Skript;
+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.Effect;
+import ch.njol.skript.lang.Expression;
+import ch.njol.skript.lang.SkriptParser.ParseResult;
+import ch.njol.util.Kleenean;
+import org.bukkit.block.Block;
+import org.bukkit.block.Lidded;
+import org.bukkit.event.Event;
+import org.jetbrains.annotations.Nullable;
+
+@Name("Open/Close Lid")
+@Description("Open or close the lid of the block(s).")
+@Examples({
+	"open the lid of {_chest}",
+	"close the lid of {_blocks::*}"
+})
+@Since("2.10")
+public class EffLidState extends Effect {
+
+	static {
+		Skript.registerEffect(EffLidState.class,
+			"(open|:close) [the] lid[s] (of|for) %blocks%",
+			"(open|:close) %blocks%'[s] lid[s]"
+		);
+	}
+
+	private boolean setOpen;
+	private Expression<Block> blocks;
+
+	@Override
+	@SuppressWarnings("unchecked")
+	public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelayed, ParseResult parseResult) {
+		setOpen = !parseResult.hasTag("close");
+		blocks = (Expression<Block>) exprs[0];
+		return true;
+	}
+
+	@Override
+	protected void execute(Event event) {
+		for (Block block : blocks.getArray(event)) {
+			if (block.getState() instanceof Lidded lidded) {
+				if (setOpen) {
+					lidded.open();
+				} else {
+					lidded.close();
+				}
+			}
+		}
+	}
+
+	@Override
+	public String toString(@Nullable Event event, boolean debug) {
+		return (setOpen ? "open" : "close") + " lid of " + blocks.toString(event, debug);
+	}
+
+}
diff --git a/src/main/java/ch/njol/skript/effects/EffLightning.java b/src/main/java/ch/njol/skript/effects/EffLightning.java
index 43b630445c4..a92d6681e5c 100644
--- a/src/main/java/ch/njol/skript/effects/EffLightning.java
+++ b/src/main/java/ch/njol/skript/effects/EffLightning.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.effects;
 
 import org.bukkit.Location;
diff --git a/src/main/java/ch/njol/skript/effects/EffLoadServerIcon.java b/src/main/java/ch/njol/skript/effects/EffLoadServerIcon.java
index 640fdf7c4d1..93242b6bb05 100644
--- a/src/main/java/ch/njol/skript/effects/EffLoadServerIcon.java
+++ b/src/main/java/ch/njol/skript/effects/EffLoadServerIcon.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.effects;
 
 import java.nio.file.Files;
diff --git a/src/main/java/ch/njol/skript/effects/EffLog.java b/src/main/java/ch/njol/skript/effects/EffLog.java
index e92d2ffa9f8..0d4f0eb2908 100644
--- a/src/main/java/ch/njol/skript/effects/EffLog.java
+++ b/src/main/java/ch/njol/skript/effects/EffLog.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.effects;
 
 import java.io.BufferedWriter;
@@ -62,20 +44,17 @@ public class EffLog extends Effect {
 	static {
 		Skript.registerEffect(EffLog.class, "log %strings% [(to|in) [file[s]] %-strings%] [with [the|a] severity [of] (1:warning|2:severe)]");
 	}
-	
+
 	private static final File logsFolder = new File(Skript.getInstance().getDataFolder(), "logs");
-	
+
 	final static HashMap<String, PrintWriter> writers = new HashMap<>();
 	static {
-		Skript.closeOnDisable(new Closeable() {
-			@Override
-			public void close() {
-				for (PrintWriter pw : writers.values())
-					pw.close();
-			}
+		Skript.closeOnDisable(() -> {
+			for (PrintWriter pw : writers.values())
+				pw.close();
 		});
 	}
-	
+
 	@SuppressWarnings("null")
 	private Expression<String> messages;
 	@Nullable
@@ -101,7 +80,7 @@ public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelaye
 		}
 		return true;
 	}
-	
+
 	@SuppressWarnings("resource")
 	@Override
 	protected void execute(Event event) {
diff --git a/src/main/java/ch/njol/skript/effects/EffLook.java b/src/main/java/ch/njol/skript/effects/EffLook.java
index 344992fd040..5b88d37a9a4 100644
--- a/src/main/java/ch/njol/skript/effects/EffLook.java
+++ b/src/main/java/ch/njol/skript/effects/EffLook.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.effects;
 
 import org.bukkit.entity.Entity;
diff --git a/src/main/java/ch/njol/skript/effects/EffMakeEggHatch.java b/src/main/java/ch/njol/skript/effects/EffMakeEggHatch.java
index 67591509ae6..44f10a91b99 100644
--- a/src/main/java/ch/njol/skript/effects/EffMakeEggHatch.java
+++ b/src/main/java/ch/njol/skript/effects/EffMakeEggHatch.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.effects;
 
 import ch.njol.skript.Skript;
diff --git a/src/main/java/ch/njol/skript/effects/EffMakeFly.java b/src/main/java/ch/njol/skript/effects/EffMakeFly.java
index cb4ace6c7cc..ba8812f1e45 100644
--- a/src/main/java/ch/njol/skript/effects/EffMakeFly.java
+++ b/src/main/java/ch/njol/skript/effects/EffMakeFly.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.effects;
 
 
diff --git a/src/main/java/ch/njol/skript/effects/EffMakeSay.java b/src/main/java/ch/njol/skript/effects/EffMakeSay.java
index 1306159703d..a509558901f 100644
--- a/src/main/java/ch/njol/skript/effects/EffMakeSay.java
+++ b/src/main/java/ch/njol/skript/effects/EffMakeSay.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.effects;
 
 import ch.njol.skript.Skript;
diff --git a/src/main/java/ch/njol/skript/effects/EffMessage.java b/src/main/java/ch/njol/skript/effects/EffMessage.java
index 3e5535c4082..476ecda14fc 100644
--- a/src/main/java/ch/njol/skript/effects/EffMessage.java
+++ b/src/main/java/ch/njol/skript/effects/EffMessage.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.effects;
 
 import java.util.List;
diff --git a/src/main/java/ch/njol/skript/effects/EffOp.java b/src/main/java/ch/njol/skript/effects/EffOp.java
index e3756945f5a..8b8ec5f9404 100644
--- a/src/main/java/ch/njol/skript/effects/EffOp.java
+++ b/src/main/java/ch/njol/skript/effects/EffOp.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.effects;
 
 import org.bukkit.OfflinePlayer;
diff --git a/src/main/java/ch/njol/skript/effects/EffOpenBook.java b/src/main/java/ch/njol/skript/effects/EffOpenBook.java
index bde007c1751..209dab7da48 100644
--- a/src/main/java/ch/njol/skript/effects/EffOpenBook.java
+++ b/src/main/java/ch/njol/skript/effects/EffOpenBook.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.effects;
 
 import org.bukkit.Material;
diff --git a/src/main/java/ch/njol/skript/effects/EffOpenInventory.java b/src/main/java/ch/njol/skript/effects/EffOpenInventory.java
index bfc185d828e..29a8f59bc11 100644
--- a/src/main/java/ch/njol/skript/effects/EffOpenInventory.java
+++ b/src/main/java/ch/njol/skript/effects/EffOpenInventory.java
@@ -1,25 +1,9 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.effects;
 
 import java.util.Locale;
 
+import ch.njol.skript.lang.Literal;
+import ch.njol.skript.registrations.Classes;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 import org.bukkit.event.Event;
@@ -94,6 +78,10 @@ public boolean init(final Expression<?>[] exprs, final int matchedPattern, final
 		if (openFlag == 1 && invi != null) {
 			Skript.warning("Using 'show' inventory instead of 'open' is not recommended as it will eventually show an unmodifiable view of the inventory in the future.");
 		}
+		if (exprs[0] instanceof Literal<?> lit && lit.getSingle() instanceof InventoryType inventoryType && !inventoryType.isCreatable()) {
+			Skript.error("Cannot create an inventory of type " + Classes.toString(inventoryType));
+			return false;
+		}
 		return true;
 	}
 	
@@ -106,8 +94,8 @@ protected void execute(final Event e) {
 			Object o = invi.getSingle(e);
 			if (o instanceof Inventory) {
 				i = (Inventory) o;
-			} else if (o instanceof InventoryType) {
-				i = Bukkit.createInventory(null, (InventoryType) o);
+			} else if (o instanceof InventoryType inventoryType && inventoryType.isCreatable()) {
+				i = Bukkit.createInventory(null, inventoryType);
 			} else {
 				return;
 			}
diff --git a/src/main/java/ch/njol/skript/effects/EffPathfind.java b/src/main/java/ch/njol/skript/effects/EffPathfind.java
index 5b336bde1f3..fed033debdf 100644
--- a/src/main/java/ch/njol/skript/effects/EffPathfind.java
+++ b/src/main/java/ch/njol/skript/effects/EffPathfind.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.effects;
 
 import org.bukkit.Location;
diff --git a/src/main/java/ch/njol/skript/effects/EffPlaySound.java b/src/main/java/ch/njol/skript/effects/EffPlaySound.java
index b0a79a39033..f0efd49446a 100644
--- a/src/main/java/ch/njol/skript/effects/EffPlaySound.java
+++ b/src/main/java/ch/njol/skript/effects/EffPlaySound.java
@@ -1,17 +1,13 @@
 package ch.njol.skript.effects;
 
 import ch.njol.skript.Skript;
+import ch.njol.skript.bukkitutil.SoundUtils;
 import ch.njol.skript.bukkitutil.sounds.SoundReceiver;
-import ch.njol.skript.doc.Description;
-import ch.njol.skript.doc.Examples;
-import ch.njol.skript.doc.Name;
-import ch.njol.skript.doc.RequiredPlugins;
-import ch.njol.skript.doc.Since;
+import ch.njol.skript.doc.*;
 import ch.njol.skript.lang.Effect;
 import ch.njol.skript.lang.Expression;
 import ch.njol.skript.lang.SkriptParser.ParseResult;
 import ch.njol.util.Kleenean;
-import org.bukkit.Keyed;
 import org.bukkit.Location;
 import org.bukkit.NamespacedKey;
 import org.bukkit.Sound;
@@ -23,10 +19,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Locale;
 import java.util.OptionalLong;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 
 @Name("Play Sound")
 @Description({
@@ -67,15 +60,11 @@ public class EffPlaySound extends Effect {
 	// 		World - Location/Entity - Sound/String
 	// 1.20 - spigot adds sound seeds
 
-	private static final boolean ADVENTURE_API = Skript.classExists("net.kyori.adventure.sound.Sound$Builder");
 	private static final boolean SPIGOT_SOUND_SEED = Skript.methodExists(Player.class, "playSound", Entity.class, Sound.class, SoundCategory.class, float.class, float.class, long.class);
-	private static final boolean HAS_SEED = ADVENTURE_API || SPIGOT_SOUND_SEED;
+	private static final boolean HAS_SEED = SoundReceiver.ADVENTURE_API || SPIGOT_SOUND_SEED;
 	private static final boolean ENTITY_EMITTER_SOUND = Skript.methodExists(Player.class, "playSound", Entity.class, Sound.class, SoundCategory.class, float.class, float.class);
 	private static final boolean ENTITY_EMITTER_STRING = Skript.methodExists(Player.class, "playSound", Entity.class, String.class, SoundCategory.class, float.class, float.class);
 	private static final boolean ENTITY_EMITTER = ENTITY_EMITTER_SOUND || ENTITY_EMITTER_STRING;
-	private static final boolean SOUND_IS_INTERFACE = Sound.class.isInterface();
-  
-	public static final Pattern KEY_PATTERN = Pattern.compile("([a-z0-9._-]+:)?([a-z0-9/._-]+)");
 
 	static {
 		String seedOption = HAS_SEED ? "[[with] seed %-number%] " : "";
@@ -90,26 +79,20 @@ public class EffPlaySound extends Effect {
 		);
 	}
 
-	@SuppressWarnings("NotNullFieldNotInitialized")
 	private Expression<String> sounds;
 
-	@Nullable
-	private Expression<SoundCategory> category;
 
-	@Nullable
-	private Expression<Player> players;
+	private @Nullable Expression<SoundCategory> category;
 
-	@Nullable
-	private Expression<Number> volume;
+	private @Nullable Expression<Player> players;
 
-	@Nullable
-	private Expression<Number> pitch;
+	private @Nullable Expression<Number> volume;
 
-	@Nullable
-	private Expression<Number> seed;
+	private @Nullable Expression<Number> pitch;
 
-	@Nullable
-	private Expression<?> emitters;
+	private @Nullable Expression<Number> seed;
+
+	private @Nullable Expression<?> emitters;
 
 	@Override
 	@SuppressWarnings("unchecked")
@@ -151,26 +134,7 @@ protected void execute(Event event) {
 		// validate strings
 		List<NamespacedKey> validSounds = new ArrayList<>();
 		for (String sound : sounds.getArray(event)) {
-			NamespacedKey key = getSoundKeyFromEnum(sound);
-			if (key == null) {
-				sound = sound.toLowerCase(Locale.ENGLISH);
-				Matcher keyMatcher = KEY_PATTERN.matcher(sound);
-				if (!keyMatcher.matches())
-					continue;
-				try {
-					String namespace = keyMatcher.group(1);
-					String keyValue = keyMatcher.group(2);
-					if (namespace == null) {
-						key = NamespacedKey.minecraft(keyValue);
-					} else {
-						namespace = namespace.substring(0, namespace.length() - 1);
-						key = new NamespacedKey(namespace, keyValue);
-					}
-				} catch (IllegalArgumentException argument) {
-					// The user input invalid characters
-				}
-			}
-
+			NamespacedKey key = SoundUtils.getKey(sound);
 			if (key == null)
 				continue;
 			validSounds.add(key);
@@ -204,12 +168,12 @@ protected void execute(Event event) {
 			}
 		} else if (emitters != null) {
 			for (Object emitter : emitters.getArray(event)) {
-				if (ENTITY_EMITTER && emitter instanceof Entity) {
-					SoundReceiver receiver = SoundReceiver.of(((Entity) emitter).getWorld());
+				if (ENTITY_EMITTER && emitter instanceof Entity entity) {
+					SoundReceiver receiver = SoundReceiver.of(entity.getWorld());
 					for (NamespacedKey sound : validSounds)
 						receiver.playSound(((Entity) emitter), sound, category, volume, pitch, seed);
-				} else if (emitter instanceof Location) {
-					SoundReceiver receiver = SoundReceiver.of(((Location) emitter).getWorld());
+				} else if (emitter instanceof Location location) {
+					SoundReceiver receiver = SoundReceiver.of(location.getWorld());
 					for (NamespacedKey sound : validSounds)
 						receiver.playSound(((Location) emitter), sound, category, volume, pitch, seed);
 				}
@@ -239,26 +203,4 @@ public String toString(@Nullable Event event, boolean debug) {
 		return builder.toString();
 	}
 
-	@SuppressWarnings({"deprecation", "unchecked", "rawtypes"})
-	private static @Nullable NamespacedKey getSoundKeyFromEnum(String soundString) {
-		soundString = soundString.toUpperCase(Locale.ENGLISH);
-		// Sound.class is an Interface (rather than an enum) as of MC 1.21.3
-		if (SOUND_IS_INTERFACE) {
-			try {
-				Sound sound = Sound.valueOf(soundString);
-				return sound.getKey();
-			} catch (IllegalArgumentException ignore) {
-			}
-		} else {
-			try {
-				Enum soundEnum = Enum.valueOf((Class) Sound.class, soundString);
-				if (soundEnum instanceof Keyed) {
-					return ((Keyed) soundEnum).getKey();
-				}
-			} catch (IllegalArgumentException ignore) {
-			}
-		}
-		return null;
-	}
-
 }
diff --git a/src/main/java/ch/njol/skript/effects/EffPlayerInfoVisibility.java b/src/main/java/ch/njol/skript/effects/EffPlayerInfoVisibility.java
index d4cf72ad4ba..b07182bad1a 100644
--- a/src/main/java/ch/njol/skript/effects/EffPlayerInfoVisibility.java
+++ b/src/main/java/ch/njol/skript/effects/EffPlayerInfoVisibility.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.effects;
 
 import org.bukkit.event.Event;
diff --git a/src/main/java/ch/njol/skript/effects/EffPlayerVisibility.java b/src/main/java/ch/njol/skript/effects/EffPlayerVisibility.java
deleted file mode 100644
index 24b38ce8aa3..00000000000
--- a/src/main/java/ch/njol/skript/effects/EffPlayerVisibility.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
-package ch.njol.skript.effects;
-
-import ch.njol.skript.Skript;
-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.Effect;
-import ch.njol.skript.lang.Expression;
-import ch.njol.skript.lang.SkriptParser;
-import ch.njol.skript.lang.util.SimpleLiteral;
-import ch.njol.skript.expressions.ExprHiddenPlayers;
-import ch.njol.util.Kleenean;
-import org.bukkit.Bukkit;
-import org.bukkit.plugin.Plugin;
-import org.bukkit.entity.Player;
-import org.bukkit.event.Event;
-import org.jetbrains.annotations.Nullable;
-
-@Name("Player Visibility")
-@Description({"Change visibility of a player for the given players.",
-		"When reveal is used in combination of the <a href='expressions.html#ExprHiddenPlayers'>hidden players</a> expression and the viewers are not specified, " +
-		"this will default it to the given player in the hidden players expression.",
-		"",
-		"Note: if a player was hidden and relogs, this player will be visible again."})
-@Examples({"on join:",
-		"	if {vanished::%player's uuid%} is true:",
-		"		hide the player from all players",
-		"",
-		"reveal hidden players of {_player}"})
-@Since("2.3")
-public class EffPlayerVisibility extends Effect {
-
-	private static final boolean USE_DEPRECATED_METHOD = !Skript.methodExists(Player.class, "hidePlayer", Plugin.class, Player.class);
-	
-	static {
-		Skript.registerEffect(EffPlayerVisibility.class,
-				"hide %players% [(from|for) %-players%]",
-				"reveal %players% [(to|for|from) %-players%]");
-	}
-
-	@SuppressWarnings("null")
-	private Expression<Player> players;
-	
-	@Nullable
-	private Expression<Player> targetPlayers;
-	
-	private boolean reveal;
-
-	@SuppressWarnings({"unchecked", "null"})
-	@Override
-	public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelayed, SkriptParser.ParseResult parseResult) {
-		reveal = matchedPattern == 1;
-		players = (Expression<Player>) exprs[0];
-		if (reveal && players instanceof ExprHiddenPlayers)
-			targetPlayers = exprs.length > 1 ? (Expression<Player>) exprs[1] : ((ExprHiddenPlayers) players).getPlayers();
-		else
-			targetPlayers = exprs.length > 1 ? (Expression<Player>) exprs[1] : null;
-		return true;
-	}
-
-    @Override
-    @SuppressWarnings("null")
-    protected void execute(Event e) {
-        Player[] targets = targetPlayers == null ? Bukkit.getOnlinePlayers().toArray(new Player[0]) : targetPlayers.getArray(e);
-        for (Player targetPlayer : targets) {
-            for (Player player : players.getArray(e)) {
-                if (reveal) {
-                    if (USE_DEPRECATED_METHOD)
-                        targetPlayer.showPlayer(player);
-                    else
-                        targetPlayer.showPlayer(Skript.getInstance(), player);
-                } else {
-                    if (USE_DEPRECATED_METHOD)
-                        targetPlayer.hidePlayer(player);
-                    else
-                        targetPlayer.hidePlayer(Skript.getInstance(), player);
-                }
-            }
-        }
-    }
-
-	@Override
-	public String toString(@Nullable Event e, boolean debug) {
-		return (reveal ? "show " : "hide ") + players.toString(e, debug) + (reveal ? " to " : " from ") + (targetPlayers != null ? targetPlayers.toString(e, debug) : "");
-	}
-
-}
\ No newline at end of file
diff --git a/src/main/java/ch/njol/skript/effects/EffPoison.java b/src/main/java/ch/njol/skript/effects/EffPoison.java
index 323bf18ff4e..af04ccd4f13 100644
--- a/src/main/java/ch/njol/skript/effects/EffPoison.java
+++ b/src/main/java/ch/njol/skript/effects/EffPoison.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.effects;
 
 import org.bukkit.entity.LivingEntity;
@@ -81,7 +63,7 @@ protected void execute(final Event e) {
 			if (!cure) {
 				Timespan dur;
 				int d = (int) (duration != null && (dur = duration.getSingle(e)) != null ? 
-						(dur.getTicks() >= Integer.MAX_VALUE ? Integer.MAX_VALUE : dur.getTicks()) : DEFAULT_DURATION);
+						(dur.getAs(Timespan.TimePeriod.TICK) >= Integer.MAX_VALUE ? Integer.MAX_VALUE : dur.getAs(Timespan.TimePeriod.TICK)) : DEFAULT_DURATION);
 				if (le.hasPotionEffect(PotionEffectType.POISON)) {
 					for (final PotionEffect pe : le.getActivePotionEffects()) {
 						if (pe.getType() != PotionEffectType.POISON)
diff --git a/src/main/java/ch/njol/skript/effects/EffPotion.java b/src/main/java/ch/njol/skript/effects/EffPotion.java
index b95cb61e74c..ed347492860 100644
--- a/src/main/java/ch/njol/skript/effects/EffPotion.java
+++ b/src/main/java/ch/njol/skript/effects/EffPotion.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.effects;
 
 import org.bukkit.entity.LivingEntity;
@@ -125,7 +107,7 @@ protected void execute(Event event) {
 				Timespan timespan = this.duration.getSingle(event);
 				if (timespan == null)
 					return;
-				duration = (int) Math.min(timespan.getTicks(), Integer.MAX_VALUE);
+				duration = (int) Math.min(timespan.getAs(Timespan.TimePeriod.TICK), Integer.MAX_VALUE);
 			}
 			for (LivingEntity entity : entities.getArray(event)) {
 				for (PotionEffectType potionEffectType : potionEffectTypes) {
diff --git a/src/main/java/ch/njol/skript/effects/EffPush.java b/src/main/java/ch/njol/skript/effects/EffPush.java
index 43fdaee2926..6dedfd3f7ca 100644
--- a/src/main/java/ch/njol/skript/effects/EffPush.java
+++ b/src/main/java/ch/njol/skript/effects/EffPush.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.effects;
 
 import org.bukkit.entity.Entity;
diff --git a/src/main/java/ch/njol/skript/effects/EffPvP.java b/src/main/java/ch/njol/skript/effects/EffPvP.java
index e59539323e9..c97cd92e142 100644
--- a/src/main/java/ch/njol/skript/effects/EffPvP.java
+++ b/src/main/java/ch/njol/skript/effects/EffPvP.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.effects;
 
 import org.bukkit.World;
diff --git a/src/main/java/ch/njol/skript/effects/EffReplace.java b/src/main/java/ch/njol/skript/effects/EffReplace.java
index 3274bc6dbf9..0141ad2fd8d 100644
--- a/src/main/java/ch/njol/skript/effects/EffReplace.java
+++ b/src/main/java/ch/njol/skript/effects/EffReplace.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.effects;
 
 import ch.njol.skript.Skript;
@@ -31,6 +13,7 @@
 import ch.njol.skript.lang.Expression;
 import ch.njol.skript.lang.ExpressionList;
 import ch.njol.skript.lang.SkriptParser.ParseResult;
+import ch.njol.skript.lang.SyntaxStringBuilder;
 import ch.njol.util.Kleenean;
 import ch.njol.util.StringUtils;
 import org.bukkit.event.Event;
@@ -39,62 +22,75 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Map;
 import java.util.function.Function;
 import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 @Name("Replace")
-@Description("Replaces all occurrences of a given text with another text. Please note that you can only change variables and a few expressions, e.g. a <a href='./expressions.html#ExprMessage'>message</a> or a line of a sign.")
-@Examples({"replace \"<item>\" in {textvar} with \"%item%\"",
-		"replace every \"&\" with \"§\" in line 1",
-		"# The following acts as a simple chat censor, but it will e.g. censor mass, hassle, assassin, etc. as well:",
-		"on chat:",
-		"	replace all \"kys\", \"idiot\" and \"noob\" with \"****\" in the message",
-		" ",
-		"replace all stone and dirt in player's inventory and player's top inventory with diamond"})
-@Since("2.0, 2.2-dev24 (replace in multiple strings and replace items in inventory), 2.5 (replace first, case sensitivity)")
+@Description(
+	"Replaces all occurrences of a given text or regex with another text. Please note that you can only change " +
+		"variables and a few expressions, e.g. a <a href='/expressions.html#ExprMessage'>message</a> or a line of a sign."
+)
+@Examples({
+	"replace \"<item>\" in {_msg} with \"[%name of player's tool%]\"",
+	"replace every \"&\" with \"§\" in line 1 of targeted block",
+	"",
+	"# Very simple chat censor",
+	"on chat:",
+		"\treplace all \"idiot\" and \"noob\" with \"****\" in the message",
+		"\tregex replace \"\\b(idiot|noob)\\b\" with \"****\" in the message # Regex version using word boundaries for better results",
+	"",
+	"replace all stone and dirt in player's inventory and player's top inventory with diamond"
+})
+@Since("2.0, 2.2-dev24 (multiple strings, items in inventory), 2.5 (replace first, case sensitivity), 2.10 (regex)")
 public class EffReplace extends Effect {
 
 	static {
 		Skript.registerEffect(EffReplace.class,
-				"replace (all|every|) %strings% in %strings% with %string% [(1¦with case sensitivity)]",
-				"replace (all|every|) %strings% with %string% in %strings% [(1¦with case sensitivity)]",
-				"replace first %strings% in %strings% with %string% [(1¦with case sensitivity)]",
-				"replace first %strings% with %string% in %string% [(1¦with case sensitivity)]",
-				"replace (all|every|) %itemtypes% in %inventories% with %itemtype%",
-				"replace (all|every|) %itemtypes% with %itemtype% in %inventories%");
+			"replace [(all|every)|first:[the] first] %strings% in %strings% with %string% [case:with case sensitivity]",
+			"replace [(all|every)|first:[the] first] %strings% with %string% in %strings% [case:with case sensitivity]",
+			"(replace [with|using] regex|regex replace) %strings% in %strings% with %string%",
+			"(replace [with|using] regex|regex replace) %strings% with %string% in %strings%",
+			"replace [all|every] %itemtypes% in %inventories% with %itemtype%",
+			"replace [all|every] %itemtypes% with %itemtype% in %inventories%");
 	}
-	
-	@SuppressWarnings("null")
+
 	private Expression<?> haystack, needles, replacement;
-	private boolean replaceString = true;
-	private boolean replaceFirst = false;
+	private boolean replaceString;
+	private boolean replaceRegex;
+	private boolean replaceFirst;
 	private boolean caseSensitive = false;
 
-	@SuppressWarnings({"null"})
 	@Override
-	public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelayed, ParseResult parseResult) {
-		haystack =  exprs[1 + matchedPattern % 2];
+	public boolean init(Expression<?>[] expressions, int matchedPattern,
+						Kleenean isDelayed, ParseResult parseResult) {
+		haystack = expressions[1 + matchedPattern % 2];
 		replaceString = matchedPattern < 4;
-		replaceFirst = matchedPattern > 1 && matchedPattern < 4;
+		replaceFirst = parseResult.hasTag("first");
+		replaceRegex = matchedPattern == 2 || matchedPattern == 3;
+
 		if (replaceString && !ChangerUtils.acceptsChange(haystack, ChangeMode.SET, String.class)) {
-			Skript.error(haystack + " cannot be changed and can thus not have parts replaced.");
+			Skript.error(haystack + " cannot be changed and can thus not have parts replaced");
 			return false;
 		}
-		if (SkriptConfig.caseSensitive.value() || parseResult.mark == 1) {
+
+		if (SkriptConfig.caseSensitive.value() || parseResult.hasTag("case")) {
 			caseSensitive = true;
 		}
-		needles = exprs[0];
-		replacement = exprs[2 - matchedPattern % 2];
+
+		needles = expressions[0];
+		replacement = expressions[2 - matchedPattern % 2];
 		return true;
 	}
-	
-	@SuppressWarnings("null")
+
 	@Override
 	protected void execute(Event event) {
 		Object[] needles = this.needles.getAll(event);
-		if (haystack instanceof ExpressionList) {
-			for (Expression<?> haystackExpr : ((ExpressionList<?>) haystack).getExpressions()) {
+		if (haystack instanceof ExpressionList<?> list) {
+			for (Expression<?> haystackExpr : list.getExpressions()) {
 				replace(event, needles, haystackExpr);
 			}
 		} else {
@@ -105,16 +101,18 @@ protected void execute(Event event) {
 	private void replace(Event event, Object[] needles, Expression<?> haystackExpr) {
 		Object[] haystack = haystackExpr.getAll(event);
 		Object replacement = this.replacement.getSingle(event);
+
 		if (replacement == null || haystack == null || haystack.length == 0 || needles == null || needles.length == 0)
 			return;
+
 		if (replaceString) {
 			Function<String, String> replaceFunction = getReplaceFunction(needles, (String) replacement);
 			//noinspection unchecked
 			((Expression<String>) haystackExpr).changeInPlace(event, replaceFunction);
 		} else {
-			for (Inventory inv : (Inventory[]) haystack)
-				for (ItemType needle : (ItemType[]) needles)
-					for (Map.Entry<Integer, ? extends ItemStack> entry : inv.all(needle.getMaterial()).entrySet()) {
+			for (Inventory inventory : (Inventory[]) haystack) {
+				for (ItemType needle : (ItemType[]) needles) {
+					for (Map.Entry<Integer, ? extends ItemStack> entry : inventory.all(needle.getMaterial()).entrySet()) {
 						int slot = entry.getKey();
 						ItemStack itemStack = entry.getValue();
 
@@ -122,16 +120,37 @@ private void replace(Event event, Object[] needles, Expression<?> haystackExpr)
 							ItemStack newItemStack = ((ItemType) replacement).getRandom();
 							if (newItemStack != null) {
 								newItemStack.setAmount(itemStack.getAmount());
-								inv.setItem(slot, newItemStack);
+								inventory.setItem(slot, newItemStack);
 							}
 						}
 					}
+				}
+			}
 		}
 	}
 
 	private @NotNull Function<String, String> getReplaceFunction(Object[] needles, String replacement) {
 		Function<String, String> replaceFunction;
-		if (replaceFirst) {
+
+		if (replaceRegex) {
+			List<Pattern> patterns = new ArrayList<>(needles.length);
+			for (Object needle : needles) {
+				try {
+					patterns.add(Pattern.compile((String) needle));
+				} catch (Exception ignored) { }
+			}
+			replaceFunction = haystackString -> {
+				for (Pattern pattern : patterns) {
+					Matcher matcher = pattern.matcher(haystackString);
+					if (replaceFirst) {
+						haystackString = matcher.replaceFirst(replacement);
+					} else {
+						haystackString = matcher.replaceAll(replacement);
+					}
+				}
+				return haystackString;
+			};
+		} else if (replaceFirst) {
 			replaceFunction = haystackString -> {
 				for (Object needle : needles) {
 					assert needle != null;
@@ -153,11 +172,18 @@ private void replace(Event event, Object[] needles, Expression<?> haystackExpr)
 
 	@Override
 	public String toString(@Nullable Event event, boolean debug) {
+		SyntaxStringBuilder builder = new SyntaxStringBuilder(event, debug);
+
+		builder.append("replace");
 		if (replaceFirst)
-			return "replace first " + needles.toString(event, debug) + " in " + haystack.toString(event, debug) +
-					" with " + replacement.toString(event, debug) + "(case sensitive: " + caseSensitive + ")";
-		return "replace " + needles.toString(event, debug) + " in " + haystack.toString(event, debug) +
-				" with " + replacement.toString(event, debug) + "(case sensitive: " + caseSensitive + ")";
+			builder.append("the first");
+		if (replaceRegex)
+			builder.append("regex");
+		builder.append(needles, "in", haystack, "with", replacement);
+		if (caseSensitive)
+			builder.append("with case sensitivity");
+
+		return builder.toString();
 	}
-	
+
 }
diff --git a/src/main/java/ch/njol/skript/effects/EffResetTitle.java b/src/main/java/ch/njol/skript/effects/EffResetTitle.java
index 72c1d900237..541038b42fb 100644
--- a/src/main/java/ch/njol/skript/effects/EffResetTitle.java
+++ b/src/main/java/ch/njol/skript/effects/EffResetTitle.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.effects;
 
 import org.bukkit.entity.Player;
diff --git a/src/main/java/ch/njol/skript/effects/EffRespawn.java b/src/main/java/ch/njol/skript/effects/EffRespawn.java
index a439bbd016c..b0460be02d1 100644
--- a/src/main/java/ch/njol/skript/effects/EffRespawn.java
+++ b/src/main/java/ch/njol/skript/effects/EffRespawn.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.effects;
 
 import org.bukkit.entity.Player;
diff --git a/src/main/java/ch/njol/skript/effects/EffReturn.java b/src/main/java/ch/njol/skript/effects/EffReturn.java
index 572cd80730c..ab4dafbe16b 100644
--- a/src/main/java/ch/njol/skript/effects/EffReturn.java
+++ b/src/main/java/ch/njol/skript/effects/EffReturn.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.effects;
 
 import ch.njol.skript.Skript;
@@ -23,14 +5,9 @@
 import ch.njol.skript.doc.Examples;
 import ch.njol.skript.doc.Name;
 import ch.njol.skript.doc.Since;
-import ch.njol.skript.lang.Effect;
-import ch.njol.skript.lang.Expression;
-import ch.njol.skript.lang.ReturnHandler;
+import ch.njol.skript.lang.*;
 import ch.njol.skript.lang.ReturnHandler.ReturnHandlerStack;
-import ch.njol.skript.lang.SectionExitHandler;
 import ch.njol.skript.lang.SkriptParser.ParseResult;
-import ch.njol.skript.lang.TriggerItem;
-import ch.njol.skript.lang.TriggerSection;
 import ch.njol.skript.lang.parser.ParserInstance;
 import ch.njol.skript.log.RetainingLogHandler;
 import ch.njol.skript.log.SkriptLogger;
@@ -38,9 +15,12 @@
 import ch.njol.util.Kleenean;
 import org.bukkit.event.Event;
 import org.jetbrains.annotations.Nullable;
+import org.jetbrains.annotations.UnknownNullability;
+
+import java.util.List;
 
 @Name("Return")
-@Description("Makes a trigger (e.g. a function) return a value")
+@Description("Makes a trigger or a section (e.g. a function) return a value")
 @Examples({
 	"function double(i: number) :: number:",
 		"\treturn 2 * {_i}",
@@ -56,15 +36,16 @@ public class EffReturn extends Effect {
 		ParserInstance.registerData(ReturnHandlerStack.class, ReturnHandlerStack::new);
 	}
 
-	@SuppressWarnings("NotNullFieldNotInitialized")
-	private ReturnHandler<?> handler;
-	@SuppressWarnings("NotNullFieldNotInitialized")
-	private Expression<?> value;
+	private @UnknownNullability ReturnHandler<?> handler;
+	private @UnknownNullability Expression<?> value;
+	private @UnknownNullability List<SectionExitHandler> sectionsToExit;
+	private int breakLevels;
 
 	@Override
 	@SuppressWarnings("unchecked")
 	public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelayed, ParseResult parseResult) {
-		handler = getParser().getData(ReturnHandlerStack.class).getCurrentHandler();
+		ParserInstance parser = getParser();
+		handler = parser.getData(ReturnHandlerStack.class).getCurrentHandler();
 		if (handler == null) {
 			Skript.error("The return statement cannot be used here");
 			return false;
@@ -102,28 +83,26 @@ public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelaye
 		}
 		value = convertedExpr;
 
+		List<TriggerSection> innerSections = parser.getSectionsUntil((TriggerSection) handler);
+		innerSections.add(0, (TriggerSection) handler);
+		breakLevels = innerSections.size();
+		sectionsToExit = innerSections.stream()
+			.filter(SectionExitHandler.class::isInstance)
+			.map(SectionExitHandler.class::cast)
+			.toList();
 		return true;
 	}
 
 	@Override
-	@Nullable
-	protected TriggerItem walk(Event event) {
+	protected @Nullable TriggerItem walk(Event event) {
 		debug(event, false);
 		//noinspection rawtypes,unchecked
 		((ReturnHandler) handler).returnValues(event, value);
 
-		TriggerSection parent = getParent();
-		while (parent != null && parent != handler) {
-			if (parent instanceof SectionExitHandler)
-				((SectionExitHandler) parent).exit(event);
-
-			parent = parent.getParent();
-		}
-
-		if (handler instanceof SectionExitHandler)
-			((SectionExitHandler) handler).exit(event);
+		for (SectionExitHandler section : sectionsToExit)
+			section.exit(event);
 
-		return null;
+		return ((TriggerSection) handler).getNext();
 	}
 
 	@Override
@@ -131,6 +110,11 @@ protected void execute(Event event) {
 		assert false;
 	}
 
+	@Override
+	public ExecutionIntent executionIntent() {
+		return ExecutionIntent.stopSections(breakLevels);
+	}
+
 	@Override
 	public String toString(@Nullable Event event, boolean debug) {
 		return "return " + value.toString(event, debug);
diff --git a/src/main/java/ch/njol/skript/effects/EffRing.java b/src/main/java/ch/njol/skript/effects/EffRing.java
index 3c2714ab489..ba441f9b22c 100644
--- a/src/main/java/ch/njol/skript/effects/EffRing.java
+++ b/src/main/java/ch/njol/skript/effects/EffRing.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.effects;
 
 import ch.njol.skript.Skript;
diff --git a/src/main/java/ch/njol/skript/effects/EffRun.java b/src/main/java/ch/njol/skript/effects/EffRun.java
new file mode 100644
index 00000000000..91e31119162
--- /dev/null
+++ b/src/main/java/ch/njol/skript/effects/EffRun.java
@@ -0,0 +1,90 @@
+package ch.njol.skript.effects;
+
+import ch.njol.skript.Skript;
+import ch.njol.skript.doc.*;
+import ch.njol.skript.lang.Effect;
+import ch.njol.skript.lang.Expression;
+import ch.njol.skript.lang.ExpressionList;
+import ch.njol.skript.lang.SkriptParser.ParseResult;
+import ch.njol.skript.lang.function.DynamicFunctionReference;
+import ch.njol.skript.registrations.Feature;
+import ch.njol.skript.util.LiteralUtils;
+import ch.njol.util.Kleenean;
+import org.bukkit.event.Event;
+import org.jetbrains.annotations.Nullable;
+import org.skriptlang.skript.util.Executable;
+
+@Name("Run (Experimental)")
+@Description("Executes a task (a function). Any returned result is discarded.")
+@Examples({
+		"set {_function} to the function named \"myFunction\"",
+		"run {_function}",
+		"run {_function} with arguments {_things::*}",
+})
+@Since("2.10")
+@Keywords({"run", "execute", "reflection", "function"})
+@SuppressWarnings({"rawtypes", "unchecked"})
+public class EffRun extends Effect {
+
+	static {
+		Skript.registerEffect(EffRun.class,
+				"run %executable% [arguments:with arg[ument]s %-objects%]",
+				"execute %executable% [arguments:with arg[ument]s %-objects%]");
+	}
+
+	// We don't bother with the generic type here because we have no way to verify it
+	// from the expression, and it makes casting more difficult to no benefit.
+	private Expression<Executable> executable;
+	private Expression<?> arguments;
+	private DynamicFunctionReference.Input input;
+	private boolean hasArguments;
+
+	@Override
+	public boolean init(Expression<?>[] expressions, int pattern, Kleenean isDelayed, ParseResult result) {
+		if (!this.getParser().hasExperiment(Feature.SCRIPT_REFLECTION))
+			return false;
+		this.executable = ((Expression<Executable>) expressions[0]);
+		this.hasArguments = result.hasTag("arguments");
+		if (hasArguments) {
+			this.arguments = LiteralUtils.defendExpression(expressions[1]);
+			Expression<?>[] arguments;
+			if (this.arguments instanceof ExpressionList<?>) {
+				arguments = ((ExpressionList<?>) this.arguments).getExpressions();
+			} else {
+				arguments = new Expression[]{this.arguments};
+			}
+			this.input = new DynamicFunctionReference.Input(arguments);
+			return LiteralUtils.canInitSafely(this.arguments);
+		} else {
+			this.input = new DynamicFunctionReference.Input();
+		}
+		return true;
+	}
+
+	@Override
+	protected void execute(Event event) {
+		Executable task = executable.getSingle(event);
+		if (task == null)
+			return;
+		Object[] arguments;
+		if (task instanceof DynamicFunctionReference<?> reference) {
+			Expression<?> validated = reference.validate(input);
+			if (validated == null)
+				return;
+			arguments = validated.getArray(event);
+		} else if (hasArguments) {
+			arguments = this.arguments.getArray(event);
+		} else {
+			arguments = new Object[0];
+		}
+		task.execute(event, arguments);
+	}
+
+	@Override
+	public String toString(@Nullable Event event, boolean debug) {
+		if (hasArguments)
+			return "run " + executable.toString(event, debug) + " with arguments " + arguments.toString(event, debug);
+		return "run " + executable.toString(event, debug);
+	}
+
+}
diff --git a/src/main/java/ch/njol/skript/effects/EffScriptFile.java b/src/main/java/ch/njol/skript/effects/EffScriptFile.java
index 548c94fde2f..d49d41d3112 100644
--- a/src/main/java/ch/njol/skript/effects/EffScriptFile.java
+++ b/src/main/java/ch/njol/skript/effects/EffScriptFile.java
@@ -1,116 +1,142 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.effects;
 
 import ch.njol.skript.ScriptLoader;
 import ch.njol.skript.Skript;
-import ch.njol.skript.SkriptCommand;
 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.Effect;
 import ch.njol.skript.lang.Expression;
+import ch.njol.skript.registrations.Feature;
+import org.jetbrains.annotations.Nullable;
+import org.jetbrains.annotations.UnknownNullability;
 import org.skriptlang.skript.lang.script.Script;
 import ch.njol.skript.lang.SkriptParser;
 import ch.njol.skript.util.FileUtils;
 import ch.njol.util.Kleenean;
 import ch.njol.util.OpenCloseable;
 import org.bukkit.event.Event;
-import org.jetbrains.annotations.Nullable;
 
 import java.io.File;
+import java.io.FileFilter;
 import java.io.IOException;
 import java.util.Set;
 
-@Name("Enable/Disable/Reload Script File")
-@Description("Enables, disables, or reloads a script file.")
+@Name("Enable/Disable/Unload/Reload Script")
+@Description("""
+	Enables, disables, unloads, or reloads a script.
+	
+	Disabling a script unloads it and prepends - to its name so it will not be loaded the next time the server restarts.
+	If the script reflection experiment is enabled: unloading a script terminates it and removes it from memory, but does not alter the file.""")
 @Examples({
 	"reload script \"test\"",
 	"enable script file \"testing\"",
-	"unload script file \"script.sk\""
+	"unload script file \"script.sk\"",
+	"set {_script} to the script \"MyScript.sk\"",
+	"reload {_script}"
 })
-@Since("2.4")
+@Since("2.4, 2.10 (unloading)")
 public class EffScriptFile extends Effect {
 
 	static {
 		Skript.registerEffect(EffScriptFile.class,
-			"(1:(enable|load)|2:reload|3:(disable|unload)) s(c|k)ript [file] %string%"
+			"(1:(enable|load)|2:reload|3:disable|4:unload) script [file|named] %string%",
+			"(1:(enable|load)|2:reload|3:disable|4:unload) skript file %string%",
+			"(1:(enable|load)|2:reload|3:disable|4:unload) %scripts%"
 		);
+		/*
+			The string-pattern must come first (since otherwise `script X` would match the expression)
+			and we cannot get a script object for a non-loaded script.
+		 */
 	}
-	
-	private static final int ENABLE = 1, RELOAD = 2, DISABLE = 3;
-	
+
+	private static final int ENABLE = 1, RELOAD = 2, DISABLE = 3, UNLOAD = 4;
+
 	private int mark;
 
-	@SuppressWarnings("NotNullFieldNotInitialized")
-	private Expression<String> fileName;
+	private @UnknownNullability Expression<String> scriptNameExpression;
+	private @UnknownNullability Expression<Script> scriptExpression;
+	private boolean scripts, hasReflection;
 
 	@Override
 	@SuppressWarnings("unchecked")
 	public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelayed, SkriptParser.ParseResult parseResult) {
-		mark = parseResult.mark;
-		fileName = (Expression<String>) exprs[0];
+		this.mark = parseResult.mark;
+		switch (matchedPattern) {
+			case 0, 1:
+				this.scriptNameExpression = (Expression<String>) exprs[0];
+				break;
+			case 2:
+				this.scriptExpression = (Expression<Script>) exprs[0];
+				this.scripts = true;
+		}
+		this.hasReflection = this.getParser().hasExperiment(Feature.SCRIPT_REFLECTION);
 		return true;
 	}
-	
+
 	@Override
-	protected void execute(Event e) {
-		String name = fileName.getSingle(e);
-		if (name == null)
-			return;
-		File scriptFile = SkriptCommand.getScriptFromName(name);
-		if (scriptFile == null)
-			return;
+	protected void execute(Event event) {
+		if (scripts) {
+			for (Script script : scriptExpression.getArray(event)) {
+				@Nullable File file = script.getConfig().getFile();
+				this.handle(file, script.getConfig().getFileName());
+			}
+		} else {
+			String name = scriptNameExpression.getSingle(event);
+			if (name == null)
+				return;
+			this.handle(ScriptLoader.getScriptFromName(name), name);
+		}
+	}
 
+	private void handle(@Nullable File scriptFile, @Nullable String name) {
+		if (scriptFile == null || !scriptFile.exists())
+			return;
+		if (name == null)
+			name = scriptFile.getName();
+		FileFilter filter = ScriptLoader.getDisabledScriptsFilter();
 		switch (mark) {
-			case ENABLE: {
-				if (ScriptLoader.getLoadedScriptsFilter().accept(scriptFile))
-					return;
-
-				try {
-					// TODO Central methods to be used between here and SkriptCommand should be created for enabling/disabling (renaming) files
-					scriptFile = FileUtils.move(
-						scriptFile,
-						new File(scriptFile.getParentFile(), scriptFile.getName().substring(ScriptLoader.DISABLED_SCRIPT_PREFIX_LENGTH)),
-						false
-					);
-				} catch (IOException ex) {
-					//noinspection ThrowableNotThrown
-					Skript.exception(ex, "Error while enabling script file: " + name);
+			case ENABLE:
+				if (ScriptLoader.getLoadedScripts().contains(ScriptLoader.getScript(scriptFile)))
 					return;
+				if (filter.accept(scriptFile)) {
+					try {
+						// TODO Central methods to be used between here and SkriptCommand should be created for
+						//  enabling/disabling (renaming) files
+						scriptFile = FileUtils.move(
+							scriptFile,
+							new File(scriptFile.getParentFile(), scriptFile.getName()
+								.substring(ScriptLoader.DISABLED_SCRIPT_PREFIX_LENGTH)),
+							false
+						);
+					} catch (IOException ex) {
+						//noinspection ThrowableNotThrown
+						Skript.exception(ex, "Error while enabling script file: " + name);
+						return;
+					}
 				}
 
 				ScriptLoader.loadScripts(scriptFile, OpenCloseable.EMPTY);
 				break;
-			}
-			case RELOAD: {
-				if (ScriptLoader.getDisabledScriptsFilter().accept(scriptFile))
+			case RELOAD:
+				if (filter.accept(scriptFile))
 					return;
-				
+
 				this.unloadScripts(scriptFile);
-				
+
 				ScriptLoader.loadScripts(scriptFile, OpenCloseable.EMPTY);
 				break;
-			}
-			case DISABLE: {
-				if (ScriptLoader.getDisabledScriptsFilter().accept(scriptFile))
+			case UNLOAD:
+				if (hasReflection) { // if we don't use the new features this falls through into DISABLE
+					if (!ScriptLoader.getLoadedScriptsFilter().accept(scriptFile))
+						return;
+
+					this.unloadScripts(scriptFile);
+					break;
+				}
+			case DISABLE:
+				if (filter.accept(scriptFile))
 					return;
 
 				this.unloadScripts(scriptFile);
@@ -127,29 +153,39 @@ protected void execute(Event e) {
 					return;
 				}
 				break;
-			}
 			default:
 				assert false;
 		}
 	}
-	
+
 	private void unloadScripts(File file) {
+		Set<Script> loaded = ScriptLoader.getLoadedScripts();
 		if (file.isDirectory()) {
 			Set<Script> scripts = ScriptLoader.getScripts(file);
 			if (scripts.isEmpty())
 				return;
+			scripts.retainAll(loaded); // skip any that are not loaded (avoid throwing error)
 			ScriptLoader.unloadScripts(scripts);
 		} else {
 			Script script = ScriptLoader.getScript(file);
+			if (!loaded.contains(script))
+				return; // don't need to unload if not loaded (avoid throwing error)
 			if (script != null)
 				ScriptLoader.unloadScript(script);
 		}
 	}
 
 	@Override
-	public String toString(@Nullable Event e, boolean debug) {
-		return (mark == ENABLE ? "enable" : mark == RELOAD ? "disable" : mark == DISABLE ? "unload" : "")
-			+ " script file " + fileName.toString(e, debug);
+	public String toString(@Nullable Event event, boolean debug) {
+		String start = switch (mark) {
+			case ENABLE -> "enable";
+			case DISABLE -> "disable";
+			case RELOAD -> "reload";
+			default -> "unload";
+		} + " ";
+		if (scripts)
+			return start + scriptExpression.toString(event, debug);
+		return start + "script file " + scriptNameExpression.toString(event, debug);
 	}
 
 }
diff --git a/src/main/java/ch/njol/skript/effects/EffSendBlockChange.java b/src/main/java/ch/njol/skript/effects/EffSendBlockChange.java
index 315c2c7279a..d9cdbb3a4cf 100644
--- a/src/main/java/ch/njol/skript/effects/EffSendBlockChange.java
+++ b/src/main/java/ch/njol/skript/effects/EffSendBlockChange.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.effects;
 
 import org.bukkit.Location;
diff --git a/src/main/java/ch/njol/skript/effects/EffSendResourcePack.java b/src/main/java/ch/njol/skript/effects/EffSendResourcePack.java
index f0eafef62dc..25da37b69db 100644
--- a/src/main/java/ch/njol/skript/effects/EffSendResourcePack.java
+++ b/src/main/java/ch/njol/skript/effects/EffSendResourcePack.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.effects;
 
 import org.bukkit.entity.Player;
diff --git a/src/main/java/ch/njol/skript/effects/EffSendTitle.java b/src/main/java/ch/njol/skript/effects/EffSendTitle.java
index 8807b9801ad..89b8e3c6bff 100644
--- a/src/main/java/ch/njol/skript/effects/EffSendTitle.java
+++ b/src/main/java/ch/njol/skript/effects/EffSendTitle.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.effects;
 
 import org.bukkit.entity.Player;
@@ -101,17 +83,17 @@ protected void execute(final Event e) {
 
 			if (this.fadeIn != null) {
 				Timespan t = this.fadeIn.getSingle(e);
-				fadeIn = t != null ? (int) t.getTicks() : -1;
+				fadeIn = t != null ? (int) t.getAs(Timespan.TimePeriod.TICK) : -1;
 			}
 
 			if (this.stay != null) {
 				Timespan t = this.stay.getSingle(e);
-				stay = t != null ? (int) t.getTicks() : -1;
+				stay = t != null ? (int) t.getAs(Timespan.TimePeriod.TICK) : -1;
 			}
 
 			if (this.fadeOut != null) {
 				Timespan t = this.fadeOut.getSingle(e);
-				fadeOut = t != null ? (int) t.getTicks() : -1;
+				fadeOut = t != null ? (int) t.getAs(Timespan.TimePeriod.TICK) : -1;
 			}
 			
 			for (Player p : recipients.getArray(e))
diff --git a/src/main/java/ch/njol/skript/effects/EffShear.java b/src/main/java/ch/njol/skript/effects/EffShear.java
index 5cc8f5004c9..0afb3b8aa60 100644
--- a/src/main/java/ch/njol/skript/effects/EffShear.java
+++ b/src/main/java/ch/njol/skript/effects/EffShear.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.effects;
 
 import ch.njol.skript.Skript;
diff --git a/src/main/java/ch/njol/skript/effects/EffShoot.java b/src/main/java/ch/njol/skript/effects/EffShoot.java
deleted file mode 100644
index 0c1cc223a56..00000000000
--- a/src/main/java/ch/njol/skript/effects/EffShoot.java
+++ /dev/null
@@ -1,138 +0,0 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
-package ch.njol.skript.effects;
-
-import org.bukkit.Location;
-import org.bukkit.entity.Entity;
-import org.bukkit.entity.Fireball;
-import org.bukkit.entity.LivingEntity;
-import org.bukkit.entity.Projectile;
-import org.bukkit.projectiles.ProjectileSource;
-import org.bukkit.event.Event;
-import org.bukkit.util.Vector;
-import org.jetbrains.annotations.Nullable;
-
-import ch.njol.skript.Skript;
-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.entity.EntityData;
-import ch.njol.skript.lang.Effect;
-import ch.njol.skript.lang.Expression;
-import ch.njol.skript.lang.SkriptParser.ParseResult;
-import ch.njol.skript.util.Direction;
-import ch.njol.util.Kleenean;
-
-/**
- * @author Peter Güttinger
- */
-@Name("Shoot")
-@Description("Shoots a projectile (or any other entity) from a given entity.")
-@Examples({"shoot an arrow",
-		"make the player shoot a creeper at speed 10",
-		"shoot a pig from the creeper"})
-@Since("1.4")
-public class EffShoot extends Effect {
-	static {
-		Skript.registerEffect(EffShoot.class,
-				"shoot %entitydatas% [from %livingentities/locations%] [(at|with) (speed|velocity) %-number%] [%-direction%]",
-				"(make|let) %livingentities/locations% shoot %entitydatas% [(at|with) (speed|velocity) %-number%] [%-direction%]");
-	}
-	
-	private final static Double DEFAULT_SPEED = 5.;
-	
-	@SuppressWarnings("null")
-	private Expression<EntityData<?>> types;
-	@SuppressWarnings("null")
-	private Expression<?> shooters;
-	@Nullable
-	private Expression<Number> velocity;
-	@Nullable
-	private Expression<Direction> direction;
-	
-	@Nullable
-	public static Entity lastSpawned = null;
-	
-	@SuppressWarnings({"unchecked", "null"})
-	@Override
-	public boolean init(final Expression<?>[] exprs, final int matchedPattern, final Kleenean isDelayed, final ParseResult parseResult) {
-		types = (Expression<EntityData<?>>) exprs[matchedPattern];
-		shooters = exprs[1 - matchedPattern];
-		velocity = (Expression<Number>) exprs[2];
-		direction = (Expression<Direction>) exprs[3];
-		return true;
-	}
-	
-	@SuppressWarnings("null")
-	@Override
-	protected void execute(final Event e) {
-		lastSpawned = null;
-		final Number v = velocity != null ? velocity.getSingle(e) : DEFAULT_SPEED;
-		if (v == null)
-			return;
-		final Direction dir = direction != null ? direction.getSingle(e) : Direction.IDENTITY;
-		if (dir == null)
-			return;
-		for (final Object shooter : shooters.getArray(e)) {
-			for (final EntityData<?> d : types.getArray(e)) {
-				if (shooter instanceof LivingEntity) {
-					final Vector vel = dir.getDirection(((LivingEntity) shooter).getLocation()).multiply(v.doubleValue());
-					final Class<? extends Entity> type = d.getType();
-					if (Fireball.class.isAssignableFrom(type)) {// fireballs explode in the shooter's face by default
-						final Fireball projectile = (Fireball) ((LivingEntity) shooter).getWorld().spawn(((LivingEntity) shooter).getEyeLocation().add(vel.clone().normalize().multiply(0.5)), type);
-						projectile.setShooter((ProjectileSource) shooter);
-						projectile.setVelocity(vel);
-						lastSpawned = projectile;
-					} else if (Projectile.class.isAssignableFrom(type)) {
-						@SuppressWarnings("unchecked")
-						final Projectile projectile = ((LivingEntity) shooter).launchProjectile((Class<? extends Projectile>) type);
-						set(projectile, d);
-						projectile.setVelocity(vel);
-						lastSpawned = projectile;
-					} else {
-						final Location loc = ((LivingEntity) shooter).getLocation();
-						loc.setY(loc.getY() + ((LivingEntity) shooter).getEyeHeight() / 2);
-						final Entity projectile = d.spawn(loc);
-						if (projectile != null)
-							projectile.setVelocity(vel);
-						lastSpawned = projectile;
-					}
-				} else {
-					final Vector vel = dir.getDirection((Location) shooter).multiply(v.doubleValue());
-					final Entity projectile = d.spawn((Location) shooter);
-					if (projectile != null)
-						projectile.setVelocity(vel);
-					lastSpawned = projectile;
-				}
-			}
-		}
-	}
-	
-	@SuppressWarnings("unchecked")
-	private static <E extends Entity> void set(final Entity e, final EntityData<E> d) {
-		d.set((E) e);
-	}
-	
-	@Override
-	public String toString(final @Nullable Event e, final boolean debug) {
-		return "shoot " + types.toString(e, debug) + " from " + shooters.toString(e, debug) + (velocity != null ? " at speed " + velocity.toString(e, debug) : "") + (direction != null ? " " + direction.toString(e, debug) : "");
-	}
-	
-}
diff --git a/src/main/java/ch/njol/skript/effects/EffSilence.java b/src/main/java/ch/njol/skript/effects/EffSilence.java
index 1540d94f06d..ffe8a72ed85 100644
--- a/src/main/java/ch/njol/skript/effects/EffSilence.java
+++ b/src/main/java/ch/njol/skript/effects/EffSilence.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.effects;
 
 import org.bukkit.entity.Entity;
diff --git a/src/main/java/ch/njol/skript/effects/EffSort.java b/src/main/java/ch/njol/skript/effects/EffSort.java
index 10a3f29a521..248c4013568 100644
--- a/src/main/java/ch/njol/skript/effects/EffSort.java
+++ b/src/main/java/ch/njol/skript/effects/EffSort.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.effects;
 
 import ch.njol.skript.Skript;
@@ -30,7 +12,6 @@
 import ch.njol.skript.lang.Effect;
 import ch.njol.skript.lang.Expression;
 import ch.njol.skript.lang.InputSource;
-import ch.njol.skript.lang.ParseContext;
 import ch.njol.skript.lang.SkriptParser;
 import ch.njol.skript.lang.SkriptParser.ParseResult;
 import ch.njol.skript.lang.Variable;
@@ -48,38 +29,39 @@
 import java.util.Set;
 
 @Name("Sort")
-@Description({
-	"Sorts a list variable using either the natural ordering of the contents or the results of the given expression.",
-	"Be warned, this will overwrite the indices of the list variable."
-})
+@Description("""
+	Sorts a list variable using either the natural ordering of the contents or the results of the given expression.
+	Be warned, this will overwrite the indices of the list variable.
+	
+	When using the full <code>sort %~objects% (by|based on) &lt;expression&gt;</code> pattern,
+	the input expression can be used to refer to the current item being sorted.
+	(See input expression for more information.)""")
 @Examples({
 	"set {_words::*} to \"pineapple\", \"banana\", \"yoghurt\", and \"apple\"",
 	"sort {_words::*} # alphabetical sort",
 	"sort {_words::*} by length of input # shortest to longest",
+	"sort {_words::*} in descending order by length of input # longest to shortest",
 	"sort {_words::*} based on {tastiness::%input%} # sort based on custom value"
 })
-@Since("2.9.0")
+@Since("2.9.0, 2.10 (sort order)")
 @Keywords("input")
 public class EffSort extends Effect implements InputSource {
 
 	static {
-		Skript.registerEffect(EffSort.class, "sort %~objects% [(by|based on) <.+>]");
+		Skript.registerEffect(EffSort.class, "sort %~objects% [in (:descending|ascending) order] [(by|based on) <.+>]");
 		if (!ParserInstance.isRegistered(InputData.class))
 			ParserInstance.registerData(InputData.class, InputData::new);
 	}
 
-	@Nullable
-	private Expression<?> mappingExpr;
-	@Nullable
-	private String unparsedExpression;
-	private Variable<?> unsortedObjects;
 
-	private Set<ExprInput<?>> dependentInputs = new HashSet<>();
+	private @Nullable Expression<?> mappingExpr;
+	private @UnknownNullability Variable<?> unsortedObjects;
+	private boolean descendingOrder;
+
+	private final Set<ExprInput<?>> dependentInputs = new HashSet<>();
 
-	@Nullable
-	private Object currentValue;
-	@UnknownNullability
-	private String currentIndex;
+	private @Nullable Object currentValue;
+	private @UnknownNullability String currentIndex;
 
 	@Override
 	public boolean init(Expression<?>[] expressions, int matchedPattern, Kleenean isDelayed, ParseResult parseResult) {
@@ -88,17 +70,14 @@ public boolean init(Expression<?>[] expressions, int matchedPattern, Kleenean is
 			return false;
 		}
 		unsortedObjects = (Variable<?>) expressions[0];
+		descendingOrder = parseResult.hasTag("descending");
 
+		//noinspection DuplicatedCode
 		if (!parseResult.regexes.isEmpty()) {
-			unparsedExpression = parseResult.regexes.get(0).group();
+			@Nullable String unparsedExpression = parseResult.regexes.get(0).group();
 			assert unparsedExpression != null;
-			InputData inputData = getParser().getData(InputData.class);
-			InputSource originalSource = inputData.getSource();
-			inputData.setSource(this);
-			mappingExpr = new SkriptParser(unparsedExpression, SkriptParser.PARSE_EXPRESSIONS, ParseContext.DEFAULT)
-				.parseExpression(Object.class);
-			inputData.setSource(originalSource);
-			return mappingExpr != null && mappingExpr.isSingle();
+			mappingExpr = parseExpression(unparsedExpression, getParser(), SkriptParser.PARSE_EXPRESSIONS);
+			return mappingExpr != null;
 		}
 		return true;
 	}
@@ -106,10 +85,11 @@ public boolean init(Expression<?>[] expressions, int matchedPattern, Kleenean is
 	@Override
 	protected void execute(Event event) {
 		Object[] sorted;
+		int sortingMultiplier = descendingOrder ? -1 : 1;
 		if (mappingExpr == null) {
 			try {
 				sorted = unsortedObjects.stream(event)
-					.sorted(ExprSortedList::compare)
+					.sorted((o1, o2) -> ExprSortedList.compare(o1, o2) * sortingMultiplier)
 					.toArray();
 			} catch (IllegalArgumentException | ClassCastException e) {
 				return;
@@ -127,7 +107,7 @@ protected void execute(Event event) {
 			}
 			try {
 				sorted = valueToMappedValue.entrySet().stream()
-					.sorted(Map.Entry.comparingByValue(ExprSortedList::compare))
+					.sorted(Map.Entry.comparingByValue((o1, o2) -> ExprSortedList.compare(o1, o2) * sortingMultiplier))
 					.map(Map.Entry::getKey)
 					.toArray();
 			} catch (IllegalArgumentException | ClassCastException e) {
@@ -160,7 +140,8 @@ public boolean hasIndices() {
 
 	@Override
 	public String toString(@Nullable Event event, boolean debug) {
-		return "sort" + unsortedObjects.toString(event, debug)
+		return "sort " + unsortedObjects.toString(event, debug)
+				+ " in " + (descendingOrder ? "descending" : "ascending") + " order"
 				+ (mappingExpr == null ? "" : " by " + mappingExpr.toString(event, debug));
 	}
 
diff --git a/src/main/java/ch/njol/skript/effects/EffStopServer.java b/src/main/java/ch/njol/skript/effects/EffStopServer.java
index 9e0ba98e24f..379891a59bf 100644
--- a/src/main/java/ch/njol/skript/effects/EffStopServer.java
+++ b/src/main/java/ch/njol/skript/effects/EffStopServer.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.effects;
 
 import org.bukkit.Bukkit;
diff --git a/src/main/java/ch/njol/skript/effects/EffStopSound.java b/src/main/java/ch/njol/skript/effects/EffStopSound.java
index ffc7d818e51..b6e3e69b7b7 100644
--- a/src/main/java/ch/njol/skript/effects/EffStopSound.java
+++ b/src/main/java/ch/njol/skript/effects/EffStopSound.java
@@ -1,29 +1,8 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.effects;
 
 import ch.njol.skript.Skript;
-import ch.njol.skript.doc.Description;
-import ch.njol.skript.doc.Examples;
-import ch.njol.skript.doc.Name;
-import ch.njol.skript.doc.RequiredPlugins;
-import ch.njol.skript.doc.Since;
+import ch.njol.skript.bukkitutil.SoundUtils;
+import ch.njol.skript.doc.*;
 import ch.njol.skript.lang.Effect;
 import ch.njol.skript.lang.Expression;
 import ch.njol.skript.lang.SkriptParser.ParseResult;
@@ -34,7 +13,6 @@
 import org.bukkit.event.Event;
 import org.jetbrains.annotations.Nullable;
 
-import java.util.Locale;
 import java.util.regex.Pattern;
 
 @Name("Stop Sound")
@@ -67,11 +45,9 @@ public class EffStopSound extends Effect {
 		);
 	}
 
-	@Nullable
-	private Expression<SoundCategory> category;
+	private @Nullable Expression<SoundCategory> category;
 
-	@Nullable
-	private Expression<String> sounds;
+	private @Nullable Expression<String> sounds;
 
 	private Expression<Player> players;
 	private boolean allSounds;
@@ -102,19 +78,15 @@ protected void execute(Event event) {
 					player.stopSound(category);
 			}
 		} else if (sounds != null) {
-			for (String sound : sounds.getArray(event)) {
-				try {
-					Sound soundEnum = Sound.valueOf(sound.toUpperCase(Locale.ENGLISH));
+			for (String soundString : sounds.getArray(event)) {
+				Sound sound = SoundUtils.getSound(soundString);
+				if (sound != null) {
 					for (Player player : targets)
-						player.stopSound(soundEnum, category);
-
-					continue;
-				} catch (IllegalArgumentException ignored) {}
-				sound = sound.toLowerCase(Locale.ENGLISH);
-				if (!KEY_PATTERN.matcher(sound).matches())
-					continue;
-				for (Player player : targets)
-					player.stopSound(sound, category);
+						player.stopSound(sound, category);
+				} else if (KEY_PATTERN.matcher(soundString).matches()) {
+					for (Player player : targets)
+						player.stopSound(soundString, category);
+				}
 			}
 		}
 	}
diff --git a/src/main/java/ch/njol/skript/effects/EffSuppressWarnings.java b/src/main/java/ch/njol/skript/effects/EffSuppressWarnings.java
index 2c56e83587d..6893f101d9d 100644
--- a/src/main/java/ch/njol/skript/effects/EffSuppressWarnings.java
+++ b/src/main/java/ch/njol/skript/effects/EffSuppressWarnings.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.effects;
 
 import ch.njol.skript.Skript;
@@ -29,6 +11,7 @@
 import ch.njol.util.Kleenean;
 import org.bukkit.event.Event;
 import org.jetbrains.annotations.Nullable;
+import org.jetbrains.annotations.UnknownNullability;
 import org.skriptlang.skript.lang.script.ScriptWarning;
 
 @Name("Locally Suppress Warning")
@@ -41,13 +24,17 @@
 public class EffSuppressWarnings extends Effect {
 
 	static {
-		Skript.registerEffect(EffSuppressWarnings.class,
-			"[local[ly]] suppress [the] (1:conflict|2:variable save|3:[missing] conjunction[s]|4:starting [with] expression[s]|5:deprecated syntax) warning[s]"
-		);
+		StringBuilder warnings = new StringBuilder();
+		ScriptWarning[] values = ScriptWarning.values();
+		for (int i = 0; i < values.length; i++) {
+			if (i != 0)
+				warnings.append('|');
+			warnings.append(values[i].ordinal()).append(':').append(values[i].getPattern());
+		}
+		Skript.registerEffect(EffSuppressWarnings.class, "[local[ly]] suppress [the] (" + warnings + ") warning[s]");
 	}
 
-	private static final int CONFLICT = 1, INSTANCE = 2, CONJUNCTION = 3, START_EXPR = 4, DEPRECATED = 5;
-	private int mark = 0;
+	private @UnknownNullability ScriptWarning warning;
 
 	@Override
 	public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelayed, SkriptParser.ParseResult parseResult) {
@@ -56,11 +43,11 @@ public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelaye
 			return false;
 		}
 
-		mark = parseResult.mark;
-		if (mark == 1) {
-			Skript.warning("Variable conflict warnings no longer need suppression, as they have been removed altogether");
+		warning = ScriptWarning.values()[parseResult.mark];
+		if (warning.isDeprecated()) {
+			Skript.warning(warning.getDeprecationMessage());
 		} else {
-			getParser().getCurrentScript().suppressWarning(ScriptWarning.values()[mark - 2]);
+			getParser().getCurrentScript().suppressWarning(warning);
 		}
 		return true;
 	}
@@ -70,27 +57,7 @@ protected void execute(Event event) { }
 
 	@Override
 	public String toString(@Nullable Event event, boolean debug) {
-		String word;
-		switch (mark) {
-			case CONFLICT:
-				word = "conflict";
-				break;
-			case INSTANCE:
-				word = "variable save";
-				break;
-			case CONJUNCTION:
-				word = "missing conjunction";
-				break;
-			case START_EXPR:
-				word = "starting expression";
-				break;
-			case DEPRECATED:
-				word = "deprecated syntax";
-				break;
-			default:
-				throw new IllegalStateException();
-		}
-		return "suppress " + word + " warnings";
+		return "suppress " + warning.getWarningName() + " warnings";
 	}
 
 }
diff --git a/src/main/java/ch/njol/skript/effects/EffSwingHand.java b/src/main/java/ch/njol/skript/effects/EffSwingHand.java
index 10c91a21b89..8246eb783c6 100644
--- a/src/main/java/ch/njol/skript/effects/EffSwingHand.java
+++ b/src/main/java/ch/njol/skript/effects/EffSwingHand.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.effects;
 
 import org.bukkit.entity.LivingEntity;
diff --git a/src/main/java/ch/njol/skript/effects/EffTame.java b/src/main/java/ch/njol/skript/effects/EffTame.java
new file mode 100644
index 00000000000..bcad5fa23af
--- /dev/null
+++ b/src/main/java/ch/njol/skript/effects/EffTame.java
@@ -0,0 +1,54 @@
+package ch.njol.skript.effects;
+
+import ch.njol.skript.Skript;
+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.Effect;
+import ch.njol.skript.lang.Expression;
+import ch.njol.skript.lang.SkriptParser.ParseResult;
+import ch.njol.util.Kleenean;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.Tameable;
+import org.bukkit.event.Event;
+import org.jetbrains.annotations.Nullable;
+
+@Name("Tame / Untame")
+@Description("Tame a tameable entity (horse, parrot, cat, etc.).")
+@Examples({
+    "tame {_horse}",
+    "untame {_horse}"
+})
+@Since("2.10")
+public class EffTame extends Effect {
+
+	static {
+		Skript.registerEffect(EffTame.class, "[:un](tame|domesticate) %entities%");
+	}
+
+	private boolean tame;
+	private Expression<Entity> entities;
+
+	@Override
+	@SuppressWarnings("unchecked")
+	public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelayed, ParseResult parseResult) {
+		tame = !parseResult.hasTag("un");
+		entities = (Expression<Entity>) exprs[0];
+		return true;
+	}
+
+	@Override
+	protected void execute(Event event) {
+		for (Entity entity : entities.getArray(event)) {
+			if (entity instanceof Tameable)
+				((Tameable) entity).setTamed(tame);
+		}
+	}
+
+	@Override
+	public String toString(@Nullable Event event, boolean debug) {
+		return (tame ? "tame " : "untame ") + entities.toString(event, debug);
+	}
+
+}
diff --git a/src/main/java/ch/njol/skript/effects/EffTeleport.java b/src/main/java/ch/njol/skript/effects/EffTeleport.java
index fc1ff8fd71a..1dc3fe781b4 100644
--- a/src/main/java/ch/njol/skript/effects/EffTeleport.java
+++ b/src/main/java/ch/njol/skript/effects/EffTeleport.java
@@ -1,161 +1,152 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.effects;
 
 import ch.njol.skript.Skript;
-import ch.njol.skript.sections.EffSecSpawn.SpawnEvent;
-import ch.njol.skript.bukkitutil.EntityUtils;
-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.Effect;
-import ch.njol.skript.lang.Expression;
+import ch.njol.skript.bukkitutil.SkriptTeleportFlag;
+import ch.njol.skript.doc.*;
+import ch.njol.skript.lang.*;
 import ch.njol.skript.lang.SkriptParser.ParseResult;
-import ch.njol.skript.lang.Trigger;
-import ch.njol.skript.lang.TriggerItem;
+import ch.njol.skript.sections.EffSecSpawn.SpawnEvent;
 import ch.njol.skript.timings.SkriptTimings;
 import ch.njol.skript.util.Direction;
 import ch.njol.skript.variables.Variables;
 import ch.njol.util.Kleenean;
 import io.papermc.lib.PaperLib;
 import io.papermc.lib.environments.PaperEnvironment;
+import io.papermc.paper.entity.TeleportFlag;
 import org.bukkit.Location;
 import org.bukkit.entity.Entity;
 import org.bukkit.event.Event;
 import org.bukkit.event.player.PlayerMoveEvent;
 import org.bukkit.event.player.PlayerRespawnEvent;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import java.util.Arrays;
+import java.util.Objects;
+import java.util.stream.Stream;
+
 @Name("Teleport")
 @Description({
 	"Teleport an entity to a specific location. ",
 	"This effect is delayed by default on Paper, meaning certain syntax such as the return effect for functions cannot be used after this effect.",
 	"The keyword 'force' indicates this effect will not be delayed, ",
-	"which may cause lag spikes or server crashes when using this effect to teleport entities to unloaded chunks."
+	"which may cause lag spikes or server crashes when using this effect to teleport entities to unloaded chunks.",
+	"Teleport flags are settings to retain during a teleport. Such as direction, passengers, x coordinate, etc."
 })
 @Examples({
-	"teleport the player to {homes::%player%}",
-	"teleport the attacker to the victim"
+	"teleport the player to {home::%uuid of player%}",
+	"teleport the attacker to the victim",
+	"",
+	"on dismount:",
+		"\tcancel event",
+		"\tteleport the player to {server::spawn} retaining vehicle and passengers"
 })
-@Since("1.0")
+@RequiredPlugins("Paper 1.19+ (teleport flags)")
+@Since("1.0, 2.10 (flags)")
 public class EffTeleport extends Effect {
 
+	private static final boolean TELEPORT_FLAGS_SUPPORTED = Skript.classExists("io.papermc.paper.entity.TeleportFlag");
 	private static final boolean CAN_RUN_ASYNC = PaperLib.getEnvironment() instanceof PaperEnvironment;
 
 	static {
-		Skript.registerEffect(EffTeleport.class, "[(1¦force)] teleport %entities% (to|%direction%) %location%");
+		String extra = "";
+		if (TELEPORT_FLAGS_SUPPORTED)
+			extra = " [[while] retaining %-teleportflags%]";
+		Skript.registerEffect(EffTeleport.class, "[:force] teleport %entities% (to|%direction%) %location%" + extra);
 	}
 
-	@SuppressWarnings("NotNullFieldNotInitialized")
+	private @Nullable Expression<SkriptTeleportFlag> teleportFlags;
 	private Expression<Entity> entities;
-	@SuppressWarnings("NotNullFieldNotInitialized")
 	private Expression<Location> location;
-
-	private boolean isAsync;
+	private boolean async;
 
 	@Override
 	@SuppressWarnings("unchecked")
 	public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelayed, ParseResult parseResult) {
 		entities = (Expression<Entity>) exprs[0];
 		location = Direction.combine((Expression<? extends Direction>) exprs[1], (Expression<? extends Location>) exprs[2]);
-		isAsync = CAN_RUN_ASYNC && parseResult.mark == 0;
+		async = CAN_RUN_ASYNC && !parseResult.hasTag("force");
+		if (TELEPORT_FLAGS_SUPPORTED)
+			teleportFlags = (Expression<SkriptTeleportFlag>) exprs[3];
 
 		if (getParser().isCurrentEvent(SpawnEvent.class)) {
-			Skript.error("You cannot be teleporting an entity that hasn't spawned yet. Ensure you're using the location expression from the spawn section pattern.");
+			Skript.error("You cannot teleport an entity that hasn't spawned yet. Ensure you're using the location expression from the spawn section pattern.");
 			return false;
 		}
 
-		if (isAsync)
+		if (async)
 			getParser().setHasDelayBefore(Kleenean.UNKNOWN); // UNKNOWN because it isn't async if the chunk is already loaded.
 		return true;
 	}
 
-	@Nullable
 	@Override
-	protected TriggerItem walk(Event e) {
-		debug(e, true);
-
+	protected @Nullable TriggerItem walk(Event event) {
+		debug(event, true);
 		TriggerItem next = getNext();
 
-		boolean delayed = Delay.isDelayed(e);
-		
-		Location loc = location.getSingle(e);
-		if (loc == null)
+		boolean delayed = Delay.isDelayed(event);
+		Location location = this.location.getSingle(event);
+		if (location == null)
 			return next;
-		boolean unknownWorld = !loc.isWorldLoaded();
+		boolean unknownWorld = !location.isWorldLoaded();
 
-		Entity[] entityArray = entities.getArray(e); // We have to fetch this before possible async execution to avoid async local variable access.
+		Entity[] entityArray = entities.getArray(event); // We have to fetch this before possible async execution to avoid async local variable access.
 		if (entityArray.length == 0)
 			return next;
 
 		if (!delayed) {
-			if (e instanceof PlayerRespawnEvent && entityArray.length == 1 && entityArray[0].equals(((PlayerRespawnEvent) e).getPlayer())) {
+			if (event instanceof PlayerRespawnEvent playerRespawnEvent && entityArray.length == 1 && entityArray[0].equals(playerRespawnEvent.getPlayer())) {
 				if (unknownWorld)
 					return next;
-				((PlayerRespawnEvent) e).setRespawnLocation(loc);
+				playerRespawnEvent.setRespawnLocation(location);
 				return next;
 			}
 
-			if (e instanceof PlayerMoveEvent && entityArray.length == 1 && entityArray[0].equals(((PlayerMoveEvent) e).getPlayer())) {
+			if (event instanceof PlayerMoveEvent playerMoveEvent && entityArray.length == 1 && entityArray[0].equals(playerMoveEvent.getPlayer())) {
 				if (unknownWorld) { // we can approximate the world
-					loc = loc.clone();
-					loc.setWorld(((PlayerMoveEvent) e).getFrom().getWorld());
+					location = location.clone();
+					location.setWorld(playerMoveEvent.getFrom().getWorld());
 				}
-				((PlayerMoveEvent) e).setTo(loc);
+				playerMoveEvent.setTo(location);
 				return next;
 			}
 		}
-
-		if (!isAsync) {
-			for (Entity entity : entityArray) {
-				EntityUtils.teleport(entity, loc);
-			}
-			return next;
-		}
-
 		if (unknownWorld) { // we can't fetch the chunk without a world
 			if (entityArray.length == 1) { // if there's 1 thing we can borrow its world
 				Entity entity = entityArray[0];
 				if (entity == null)
 					return next;
 				// assume it's a local teleport, use the first entity we find as a reference
-				loc = loc.clone();
-				loc.setWorld(entity.getWorld());
+				location = location.clone();
+				location.setWorld(entity.getWorld());
 			} else {
 				return next; // no entities = no chunk = nobody teleporting
 			}
 		}
-		final Location fixed = loc;
-		Delay.addDelayedEvent(e);
-		Object localVars = Variables.removeLocals(e);
-		
+
+		if (!async) {
+			SkriptTeleportFlag[] teleportFlags = this.teleportFlags == null ? null : this.teleportFlags.getArray(event);
+			for (Entity entity : entityArray) {
+				teleport(entity, location, teleportFlags);
+			}
+			return next;
+		}
+
+		final Location fixed = location;
+		Delay.addDelayedEvent(event);
+		Object localVars = Variables.removeLocals(event);
+
 		// This will either fetch the chunk instantly if on Spigot or already loaded or fetch it async if on Paper.
-		PaperLib.getChunkAtAsync(loc).thenAccept(chunk -> {
+		PaperLib.getChunkAtAsync(location).thenAccept(chunk -> {
 			// The following is now on the main thread
+			SkriptTeleportFlag[] teleportFlags = this.teleportFlags == null ? null : this.teleportFlags.getArray(event);
 			for (Entity entity : entityArray) {
-				EntityUtils.teleport(entity, fixed);
+				teleport(entity, fixed, teleportFlags);
 			}
 
 			// Re-set local variables
 			if (localVars != null)
-				Variables.setLocalVariables(e, localVars);
+				Variables.setLocalVariables(event, localVars);
 			
 			// Continue the rest of the trigger if there is one
 			Object timing = null;
@@ -167,22 +158,43 @@ protected TriggerItem walk(Event e) {
 					}
 				}
 
-				TriggerItem.walk(next, e);
+				TriggerItem.walk(next, event);
 			}
-			Variables.removeLocals(e); // Clean up local vars, we may be exiting now
+			Variables.removeLocals(event); // Clean up local vars, we may be exiting now
 			SkriptTimings.stop(timing);
 		});
 		return null;
 	}
 
 	@Override
-	protected void execute(Event e) {
-		// Nothing needs to happen here, we're executing in walk
+	protected void execute(Event event) {
+		assert false;
 	}
 
 	@Override
-	public String toString(@Nullable Event e, boolean debug) {
-		return "teleport " + entities.toString(e, debug) + " to " + location.toString(e, debug);
+	public String toString(@Nullable Event event, boolean debug) {
+		SyntaxStringBuilder builder = new SyntaxStringBuilder(event, debug)
+				.append("teleport", entities, "to", location);
+		if (teleportFlags != null)
+			builder.append("retaining", teleportFlags);
+		return builder.toString();
+	}
+
+	private void teleport(@NotNull Entity entity, @NotNull Location location, SkriptTeleportFlag... skriptTeleportFlags) {
+		if (location.getWorld() == null) {
+			location = location.clone();
+			location.setWorld(entity.getWorld());
+		}
+
+		if (!TELEPORT_FLAGS_SUPPORTED || skriptTeleportFlags == null) {
+			entity.teleport(location);
+			return;
+		}
+
+		Stream<TeleportFlag> teleportFlags = Arrays.stream(skriptTeleportFlags)
+				.flatMap(teleportFlag -> Stream.of(teleportFlag.getTeleportFlags()))
+				.filter(Objects::nonNull);
+		entity.teleport(location, teleportFlags.toArray(TeleportFlag[]::new));
 	}
 
 }
diff --git a/src/main/java/ch/njol/skript/effects/EffToggle.java b/src/main/java/ch/njol/skript/effects/EffToggle.java
index 065186aee56..91bcd7d4344 100644
--- a/src/main/java/ch/njol/skript/effects/EffToggle.java
+++ b/src/main/java/ch/njol/skript/effects/EffToggle.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.effects;
 
 import java.lang.invoke.MethodHandle;
diff --git a/src/main/java/ch/njol/skript/effects/EffToggleCanPickUpItems.java b/src/main/java/ch/njol/skript/effects/EffToggleCanPickUpItems.java
index 2833d8857c9..41810ff4dfe 100644
--- a/src/main/java/ch/njol/skript/effects/EffToggleCanPickUpItems.java
+++ b/src/main/java/ch/njol/skript/effects/EffToggleCanPickUpItems.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.effects;
 
 import ch.njol.skript.Skript;
diff --git a/src/main/java/ch/njol/skript/effects/EffToggleFlight.java b/src/main/java/ch/njol/skript/effects/EffToggleFlight.java
index 2459573f5e6..35a5375a382 100644
--- a/src/main/java/ch/njol/skript/effects/EffToggleFlight.java
+++ b/src/main/java/ch/njol/skript/effects/EffToggleFlight.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.effects;
 
 import org.bukkit.entity.Player;
diff --git a/src/main/java/ch/njol/skript/effects/EffTooltip.java b/src/main/java/ch/njol/skript/effects/EffTooltip.java
index bdc17264bc4..f9fa46e7a94 100644
--- a/src/main/java/ch/njol/skript/effects/EffTooltip.java
+++ b/src/main/java/ch/njol/skript/effects/EffTooltip.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.effects;
 
 import ch.njol.skript.Skript;
diff --git a/src/main/java/ch/njol/skript/effects/EffTransform.java b/src/main/java/ch/njol/skript/effects/EffTransform.java
new file mode 100644
index 00000000000..d4717dd254a
--- /dev/null
+++ b/src/main/java/ch/njol/skript/effects/EffTransform.java
@@ -0,0 +1,143 @@
+package ch.njol.skript.effects;
+
+import ch.njol.skript.Skript;
+import ch.njol.skript.doc.Description;
+import ch.njol.skript.doc.Examples;
+import ch.njol.skript.doc.Keywords;
+import ch.njol.skript.doc.Name;
+import ch.njol.skript.doc.Since;
+import ch.njol.skript.expressions.ExprInput;
+import ch.njol.skript.lang.Effect;
+import ch.njol.skript.lang.Expression;
+import ch.njol.skript.lang.InputSource;
+import ch.njol.skript.lang.SkriptParser;
+import ch.njol.skript.lang.SkriptParser.ParseResult;
+import ch.njol.skript.lang.Variable;
+import ch.njol.skript.lang.parser.ParserInstance;
+import ch.njol.skript.variables.Variables;
+import ch.njol.util.Kleenean;
+import ch.njol.util.Pair;
+import ch.njol.util.StringUtils;
+import org.bukkit.event.Event;
+import org.jetbrains.annotations.Nullable;
+import org.jetbrains.annotations.UnknownNullability;
+
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
+
+@Name("Transform List")
+@Description({
+	"Transforms (or 'maps') a list's values using a given expression. This is akin to looping over the list and setting " +
+	"each value to a modified version of itself.",
+	"Evaluates the given expression for each element in the list, replacing the original element with the expression's result.",
+	"If the given expression returns a single value, the indices of the list will not change. If the expression returns " +
+	"multiple values, then then indices will be reset as a single index cannot contain multiple values.",
+	"Only variable lists can be transformed with this effect. For other lists, see the transform expression."
+})
+@Examples({
+	"set {_a::*} to 1, 2, and 3",
+	"transform {_a::*} using input * 2",
+	"# {_a::*} is now 2, 4, and 6",
+	"",
+	"# get a list of the sizes of all clans without manually looping",
+	"set {_clan-sizes::*} to indices of {clans::*}",
+	"transform {_clan-sizes::*} using {clans::%input%::size}",
+	"",
+	"# set all existing values of a list to 0:",
+	"transform {_list::*} to 0"
+})
+@Since("2.10")
+@Keywords("input")
+public class EffTransform extends Effect implements InputSource {
+
+	static {
+		Skript.registerEffect(EffTransform.class, "(transform|map) %~objects% (using|with) <.+>");
+		if (!ParserInstance.isRegistered(InputData.class))
+			ParserInstance.registerData(InputData.class, InputData::new);
+	}
+
+	private @UnknownNullability Expression<?> mappingExpr;
+	private @UnknownNullability Variable<?> unmappedObjects;
+
+	private final Set<ExprInput<?>> dependentInputs = new HashSet<>();
+
+	private @Nullable Object currentValue;
+	private @UnknownNullability String currentIndex;
+
+	@Override
+	public boolean init(Expression<?>[] expressions, int matchedPattern, Kleenean isDelayed, ParseResult parseResult) {
+		if (expressions[0].isSingle() || !(expressions[0] instanceof Variable)) {
+			Skript.error("You can only transform list variables!");
+			return false;
+		}
+		unmappedObjects = (Variable<?>) expressions[0];
+
+		//noinspection DuplicatedCode
+		if (!parseResult.regexes.isEmpty()) {
+			@Nullable String unparsedExpression = parseResult.regexes.get(0).group();
+			assert unparsedExpression != null;
+			mappingExpr = parseExpression(unparsedExpression, getParser(), SkriptParser.ALL_FLAGS);
+			return mappingExpr != null;
+		}
+		return true;
+	}
+
+	@Override
+	protected void execute(Event event) {
+		Map<String, Object> mappedValues = new HashMap<>();
+		assert mappingExpr != null;
+		boolean isSingle = mappingExpr.isSingle();
+
+		String varName = unmappedObjects.getName().toString(event);
+		String varSubName = StringUtils.substring(varName, 0, -1);
+		boolean local = unmappedObjects.isLocal();
+
+		int i = 1;
+		for (Iterator<Pair<String, Object>> it = unmappedObjects.variablesIterator(event); it.hasNext(); ) {
+			Pair<String, Object> pair = it.next();
+			currentIndex = pair.getKey();
+			currentValue = pair.getValue();
+
+			if (isSingle) {
+				mappedValues.put(currentIndex, mappingExpr.getSingle(event));
+			} else {
+				for (Object value : mappingExpr.getArray(event)) {
+					mappedValues.put(String.valueOf(i++), value);
+					mappedValues.putIfAbsent(currentIndex, null); // clears only unused indices instead of having to delete entire var.
+				}
+			}
+		}
+
+		for (Map.Entry<String, Object> pair : mappedValues.entrySet())
+			Variables.setVariable(varSubName + pair.getKey(), pair.getValue(), event, local);
+	}
+
+	@Override
+	public Set<ExprInput<?>> getDependentInputs() {
+		return dependentInputs;
+	}
+
+	@Override
+	public @Nullable Object getCurrentValue() {
+		return currentValue;
+	}
+
+	@Override
+	public boolean hasIndices() {
+		return true;
+	}
+
+	@Override
+	public @UnknownNullability String getCurrentIndex() {
+		return currentIndex;
+	}
+
+	@Override
+	public String toString(@Nullable Event event, boolean debug) {
+		return "transform " + unmappedObjects.toString(event, debug) + " using " + mappingExpr.toString(event, debug);
+	}
+
+}
diff --git a/src/main/java/ch/njol/skript/effects/EffTree.java b/src/main/java/ch/njol/skript/effects/EffTree.java
index 2d9f838de71..a9369177231 100644
--- a/src/main/java/ch/njol/skript/effects/EffTree.java
+++ b/src/main/java/ch/njol/skript/effects/EffTree.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.effects;
 
 import org.bukkit.Location;
diff --git a/src/main/java/ch/njol/skript/effects/EffVectorRotateAroundAnother.java b/src/main/java/ch/njol/skript/effects/EffVectorRotateAroundAnother.java
deleted file mode 100644
index 2ffddda71d9..00000000000
--- a/src/main/java/ch/njol/skript/effects/EffVectorRotateAroundAnother.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
-package ch.njol.skript.effects;
-
-import org.bukkit.event.Event;
-import org.bukkit.util.Vector;
-import org.jetbrains.annotations.Nullable;
-
-import ch.njol.skript.Skript;
-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.Effect;
-import ch.njol.skript.lang.Expression;
-import ch.njol.skript.lang.SkriptParser.ParseResult;
-import ch.njol.util.Kleenean;
-import ch.njol.util.VectorMath;
-
-@Name("Vectors - Rotate Around Vector")
-@Description("Rotates one or more vectors around another vector")
-@Examples("rotate {_v} around vector 1, 0, 0 by 90")
-@Since("2.2-dev28")
-public class EffVectorRotateAroundAnother extends Effect {
-
-	static {
-		Skript.registerEffect(EffVectorRotateAroundAnother.class, "rotate %vectors% around %vector% by %number% [degrees]");
-	}
-	
-	@SuppressWarnings("null")
-	private Expression<Vector> vectors, axis;
-
-	@SuppressWarnings("null")
-	private Expression<Number> degree;
-
-	@SuppressWarnings({"unchecked", "null"})
-	@Override
-	public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean kleenean, ParseResult parseResult) {
-		vectors = (Expression<Vector>) exprs[0];
-		axis = (Expression<Vector>) exprs[1];
-		degree = (Expression<Number>) exprs[2];
-		return true;
-	}
-
-	@SuppressWarnings("null")
-	@Override
-	protected void execute(Event event) {
-		Vector axis = this.axis.getSingle(event);
-		Number angle = degree.getSingle(event);
-		if (axis == null || angle == null)
-			return;
-		for (Vector vector : vectors.getArray(event))
-			VectorMath.rot(vector, axis, angle.doubleValue());
-	}
-
-	@Override
-	public String toString(@Nullable Event event, boolean debug) {
-		return "rotate " + vectors.toString(event, debug) + " around " + axis.toString(event, debug) + " by " + degree.toString(event, debug) + "degrees";
-	}
-
-}
diff --git a/src/main/java/ch/njol/skript/effects/EffVectorRotateXYZ.java b/src/main/java/ch/njol/skript/effects/EffVectorRotateXYZ.java
deleted file mode 100644
index a24ad0dcd51..00000000000
--- a/src/main/java/ch/njol/skript/effects/EffVectorRotateXYZ.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
-package ch.njol.skript.effects;
-
-import org.bukkit.event.Event;
-import org.bukkit.util.Vector;
-import org.jetbrains.annotations.Nullable;
-
-import ch.njol.skript.Skript;
-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.Effect;
-import ch.njol.skript.lang.Expression;
-import ch.njol.skript.lang.SkriptParser.ParseResult;
-import ch.njol.util.Kleenean;
-import ch.njol.util.VectorMath;
-
-@Name("Vectors - Rotate around XYZ")
-@Description("Rotates one or more vectors around the x, y, or z axis by some amount of degrees")
-@Examples({
-	"rotate {_v} around x-axis by 90",
-	"rotate {_v} around y-axis by 90",
-	"rotate {_v} around z-axis by 90 degrees"
-})
-@Since("2.2-dev28")
-public class EffVectorRotateXYZ extends Effect {
-
-	static {
-		Skript.registerEffect(EffVectorRotateXYZ.class, "rotate %vectors% around (0¦x|1¦y|2¦z)(-| )axis by %number% [degrees]");
-	}
-
-	private final static Character[] axes = new Character[] {'x', 'y', 'z'};
-
-	@SuppressWarnings("null")
-	private Expression<Vector> vectors;
-
-	@SuppressWarnings("null")
-	private Expression<Number> degree;
-	private int axis;
-
-	@Override
-	@SuppressWarnings({"unchecked", "null"})
-	public boolean init(Expression<?>[] expressions, int matchedPattern, Kleenean isDelayed, ParseResult parseResult) {
-		vectors = (Expression<Vector>) expressions[0];
-		degree = (Expression<Number>) expressions[1];
-		axis = parseResult.mark;
-		return true;
-	}
-
-	@Override
-	@SuppressWarnings("null")
-	protected void execute(Event event) {
-		Number angle = degree.getSingle(event);
-		if (angle == null)
-			return;
-		switch (axis) {
-			case 0:
-				for (Vector vector : vectors.getArray(event))
-					VectorMath.rotX(vector, angle.doubleValue());
-				break;
-			case 1:
-				for (Vector vector : vectors.getArray(event))
-					VectorMath.rotY(vector, angle.doubleValue());
-				break;
-			case 2:
-				for (Vector vector : vectors.getArray(event))
-					VectorMath.rotZ(vector, angle.doubleValue());
-		}
-	}
-
-	@Override
-	public String toString(@Nullable Event event, boolean debug) {
-		return "rotate " + vectors.toString(event, debug) + " around " + axes[axis] + "-axis" + " by " + degree.toString(event, debug) + "degrees";
-	}
-
-}
diff --git a/src/main/java/ch/njol/skript/effects/EffVehicle.java b/src/main/java/ch/njol/skript/effects/EffVehicle.java
index cfc9f9fe2fb..39e9bd58e49 100644
--- a/src/main/java/ch/njol/skript/effects/EffVehicle.java
+++ b/src/main/java/ch/njol/skript/effects/EffVehicle.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.effects;
 
 import org.bukkit.entity.Entity;
diff --git a/src/main/java/ch/njol/skript/effects/EffVisualEffect.java b/src/main/java/ch/njol/skript/effects/EffVisualEffect.java
index dc79b004f34..e0a6652ae09 100644
--- a/src/main/java/ch/njol/skript/effects/EffVisualEffect.java
+++ b/src/main/java/ch/njol/skript/effects/EffVisualEffect.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.effects;
 
 import org.bukkit.Location;
diff --git a/src/main/java/ch/njol/skript/effects/EffWorldLoad.java b/src/main/java/ch/njol/skript/effects/EffWorldLoad.java
index 50172274146..d1198a56e90 100644
--- a/src/main/java/ch/njol/skript/effects/EffWorldLoad.java
+++ b/src/main/java/ch/njol/skript/effects/EffWorldLoad.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.effects;
 
 import ch.njol.skript.Skript;
diff --git a/src/main/java/ch/njol/skript/effects/EffWorldSave.java b/src/main/java/ch/njol/skript/effects/EffWorldSave.java
index 316f8eca288..760b4459d87 100644
--- a/src/main/java/ch/njol/skript/effects/EffWorldSave.java
+++ b/src/main/java/ch/njol/skript/effects/EffWorldSave.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.effects;
 
 import ch.njol.skript.Skript;
diff --git a/src/main/java/ch/njol/skript/effects/IndeterminateDelay.java b/src/main/java/ch/njol/skript/effects/IndeterminateDelay.java
index dcbe6bc17e8..5179d20fd36 100644
--- a/src/main/java/ch/njol/skript/effects/IndeterminateDelay.java
+++ b/src/main/java/ch/njol/skript/effects/IndeterminateDelay.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.effects;
 
 import org.bukkit.Bukkit;
@@ -57,7 +39,7 @@ protected TriggerItem walk(Event event) {
 					Variables.setLocalVariables(event, localVars);
 
 				TriggerItem.walk(next, event);
-			}, duration.getTicks());
+			}, duration.getAs(Timespan.TimePeriod.TICK));
 		}
 
 		return null;
diff --git a/src/main/java/ch/njol/skript/entity/AxolotlData.java b/src/main/java/ch/njol/skript/entity/AxolotlData.java
index 1dbcda1374f..0fe0ae9d877 100644
--- a/src/main/java/ch/njol/skript/entity/AxolotlData.java
+++ b/src/main/java/ch/njol/skript/entity/AxolotlData.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.entity;
 
 import ch.njol.skript.Skript;
diff --git a/src/main/java/ch/njol/skript/entity/BeeData.java b/src/main/java/ch/njol/skript/entity/BeeData.java
index 7dcc5cb0f77..90c34f700af 100644
--- a/src/main/java/ch/njol/skript/entity/BeeData.java
+++ b/src/main/java/ch/njol/skript/entity/BeeData.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.entity;
 
 import java.util.Random;
diff --git a/src/main/java/ch/njol/skript/entity/BoatChestData.java b/src/main/java/ch/njol/skript/entity/BoatChestData.java
index 4b136650393..c4918af95b6 100644
--- a/src/main/java/ch/njol/skript/entity/BoatChestData.java
+++ b/src/main/java/ch/njol/skript/entity/BoatChestData.java
@@ -1,59 +1,43 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.entity;
 
 import ch.njol.skript.Skript;
+import ch.njol.skript.aliases.ItemData;
 import ch.njol.skript.aliases.ItemType;
 import ch.njol.skript.lang.Literal;
 import ch.njol.skript.lang.SkriptParser;
 import org.bukkit.Material;
-import org.bukkit.TreeSpecies;
+import org.bukkit.entity.Boat;
 import org.bukkit.entity.ChestBoat;
-import org.bukkit.entity.boat.AcaciaChestBoat;
-import org.bukkit.entity.boat.BirchChestBoat;
-import org.bukkit.entity.boat.DarkOakChestBoat;
-import org.bukkit.entity.boat.JungleChestBoat;
-import org.bukkit.entity.boat.OakChestBoat;
-import org.bukkit.entity.boat.SpruceChestBoat;
 import org.jetbrains.annotations.Nullable;
 
-import java.util.EnumMap;
+import java.util.HashMap;
+import java.util.Locale;
+import java.util.Map;
 import java.util.Random;
 
+// For <1.21.3 compatability only. 1.21.3+ boats are SimpleEntityDatas
 public class BoatChestData extends EntityData<ChestBoat> {
 
-	private static final EnumMap<TreeSpecies, Class<? extends ChestBoat>> typeToClassMap = new EnumMap<>(TreeSpecies.class);
-	private static final boolean IS_RUNNING_1_21_3 = Skript.isRunningMinecraft(1, 21, 3);
+	private static final Boat.Type[] types = Boat.Type.values();
 
 	static {
-		if (Skript.classExists("org.bukkit.entity.ChestBoat")) {
-			EntityData.register(BoatChestData.class, "chest boat", ChestBoat.class, 0,
-				"chest boat", "any chest boat", "oak chest boat", "spruce chest boat", "birch chest boat",
-				"jungle chest boat", "acacia chest boat", "dark oak chest boat");
-			if (IS_RUNNING_1_21_3) {
-				typeToClassMap.put(TreeSpecies.GENERIC, OakChestBoat.class);
-				typeToClassMap.put(TreeSpecies.REDWOOD, SpruceChestBoat.class);
-				typeToClassMap.put(TreeSpecies.BIRCH, BirchChestBoat.class);
-				typeToClassMap.put(TreeSpecies.JUNGLE, JungleChestBoat.class);
-				typeToClassMap.put(TreeSpecies.ACACIA, AcaciaChestBoat.class);
-				typeToClassMap.put(TreeSpecies.DARK_OAK, DarkOakChestBoat.class);
+		if (!Skript.isRunningMinecraft(1, 21, 2)) {
+			// This ensures all boats are registered
+			// As well as in the correct order via 'ordinal'
+			String[] patterns = new String[types.length + 2];
+			patterns[0] = "chest boat";
+			patterns[1] = "any chest boat";
+			for (Boat.Type boat : types) {
+				String boatName;
+				if (boat == Boat.Type.BAMBOO) {
+					boatName = "bamboo chest raft";
+				} else {
+					boatName = boat.toString().replace("_", " ").toLowerCase(Locale.ENGLISH) + " chest boat";
+				}
+				patterns[boat.ordinal() + 2] = boatName;
 			}
+
+			EntityData.register(BoatChestData.class, "chest boat", ChestBoat.class, 0, patterns);
 		}
 	}
 
@@ -61,7 +45,7 @@ public BoatChestData() {
 		this(0);
 	}
 
-	public BoatChestData(@Nullable TreeSpecies type) {
+	public BoatChestData(@Nullable Boat.Type type) {
 		this(type != null ? type.ordinal() + 2 : 1);
 	}
 
@@ -75,29 +59,27 @@ protected boolean init(Literal<?>[] exprs, int matchedPattern, SkriptParser.Pars
 	}
 
 	@Override
-	protected boolean init(@Nullable Class<? extends ChestBoat> c, @Nullable ChestBoat e) {
-		if (e != null)
-			matchedPattern = 2 + e.getWoodType().ordinal();
+	protected boolean init(@Nullable Class<? extends ChestBoat> clazz, @Nullable ChestBoat entity) {
+		if (entity != null)
+			matchedPattern = 2 + entity.getBoatType().ordinal();
 		return true;
 	}
 
 	@Override
 	public void set(ChestBoat entity) {
 		if (matchedPattern == 1) // If the type is 'any boat'.
-			matchedPattern += new Random().nextInt(TreeSpecies.values().length); // It will spawn a random boat type in case is 'any boat'.
+			matchedPattern += new Random().nextInt(Boat.Type.values().length); // It will spawn a random boat type in case is 'any boat'.
 		if (matchedPattern > 1) // 0 and 1 are excluded
-			entity.setWoodType(TreeSpecies.values()[matchedPattern - 2]); // Removes 2 to fix the index.
+			entity.setBoatType(types[matchedPattern - 2]); // Removes 2 to fix the index.
 	}
 
 	@Override
 	protected boolean match(ChestBoat entity) {
-		return matchedPattern <= 1 || entity.getWoodType().ordinal() == matchedPattern - 2;
+		return matchedPattern <= 1 || entity.getBoatType().ordinal() == matchedPattern - 2;
 	}
 
 	@Override
 	public Class<? extends ChestBoat> getType() {
-		if (IS_RUNNING_1_21_3)
-			return typeToClassMap.get(TreeSpecies.values()[matchedPattern - 2]);
 		return ChestBoat.class;
 	}
 
@@ -113,35 +95,45 @@ protected int hashCode_i() {
 
 	@Override
 	protected boolean equals_i(EntityData<?> obj) {
-		if (obj instanceof BoatData)
-			return matchedPattern == ((BoatData) obj).matchedPattern;
+		if (obj instanceof BoatChestData boatChestData)
+			return matchedPattern == boatChestData.matchedPattern;
 		return false;
 	}
 
 	@Override
-	public boolean isSupertypeOf(EntityData<?> e) {
-		if (e instanceof BoatData)
-			return matchedPattern <= 1 || matchedPattern == ((BoatData) e).matchedPattern;
+	public boolean isSupertypeOf(EntityData<?> entity) {
+		if (entity instanceof BoatChestData boatChestData)
+			return matchedPattern <= 1 || matchedPattern == boatChestData.matchedPattern;
 		return false;
 	}
 
+
+	private static final Map<Material, Boat.Type> materialToType = new HashMap<>();
+	static {
+		materialToType.put(Material.OAK_CHEST_BOAT, Boat.Type.OAK);
+		materialToType.put(Material.BIRCH_CHEST_BOAT, Boat.Type.BIRCH);
+		materialToType.put(Material.SPRUCE_CHEST_BOAT, Boat.Type.SPRUCE);
+		materialToType.put(Material.JUNGLE_CHEST_BOAT, Boat.Type.JUNGLE);
+		materialToType.put(Material.DARK_OAK_CHEST_BOAT, Boat.Type.DARK_OAK);
+		materialToType.put(Material.ACACIA_CHEST_BOAT, Boat.Type.ACACIA);
+		materialToType.put(Material.MANGROVE_CHEST_BOAT, Boat.Type.MANGROVE);
+		materialToType.put(Material.CHERRY_CHEST_BOAT, Boat.Type.CHERRY);
+		materialToType.put(Material.BAMBOO_CHEST_RAFT, Boat.Type.BAMBOO);
+	}
+
 	public boolean isOfItemType(ItemType itemType) {
-		int ordinal = -1;
-
-		Material type = itemType.getMaterial();
-		if (type == Material.OAK_CHEST_BOAT)
-			ordinal = 0;
-		else if (type == Material.SPRUCE_CHEST_BOAT)
-			ordinal = TreeSpecies.REDWOOD.ordinal();
-		else if (type == Material.BIRCH_CHEST_BOAT)
-			ordinal = TreeSpecies.BIRCH.ordinal();
-		else if (type == Material.JUNGLE_CHEST_BOAT)
-			ordinal = TreeSpecies.JUNGLE.ordinal();
-		else if (type == Material.ACACIA_CHEST_BOAT)
-			ordinal = TreeSpecies.ACACIA.ordinal();
-		else if (type == Material.DARK_OAK_CHEST_BOAT)
-			ordinal = TreeSpecies.DARK_OAK.ordinal();
-		return hashCode_i() == ordinal + 2 || (matchedPattern + ordinal == 0) || ordinal == 0;
+		for (ItemData itemData : itemType.getTypes()) {
+			int ordinal;
+			Material material = itemData.getType();
+			Boat.Type type = materialToType.get(material);
+			// material is a boat AND (data matches any boat OR material and data are same)
+			if (type != null) {
+				ordinal = type.ordinal();
+				if (matchedPattern <= 1 || matchedPattern == ordinal + 2)
+					return true;
+			}
+		}
+		return false;
 	}
 
 }
diff --git a/src/main/java/ch/njol/skript/entity/BoatData.java b/src/main/java/ch/njol/skript/entity/BoatData.java
index 22b8d58b251..e6c9535f2be 100644
--- a/src/main/java/ch/njol/skript/entity/BoatData.java
+++ b/src/main/java/ch/njol/skript/entity/BoatData.java
@@ -1,103 +1,83 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.entity;
 
 import ch.njol.skript.Skript;
+import ch.njol.skript.aliases.ItemData;
 import ch.njol.skript.aliases.ItemType;
 import ch.njol.skript.lang.Literal;
 import ch.njol.skript.lang.SkriptParser.ParseResult;
 import org.bukkit.Material;
-import org.bukkit.TreeSpecies;
 import org.bukkit.entity.Boat;
-import org.bukkit.entity.boat.AcaciaBoat;
-import org.bukkit.entity.boat.BirchBoat;
-import org.bukkit.entity.boat.DarkOakBoat;
-import org.bukkit.entity.boat.JungleBoat;
-import org.bukkit.entity.boat.OakBoat;
-import org.bukkit.entity.boat.SpruceBoat;
 import org.jetbrains.annotations.Nullable;
 
-import java.util.EnumMap;
+import java.util.HashMap;
+import java.util.Locale;
+import java.util.Map;
 import java.util.Random;
 
+// For <1.21.3 compatability only. 1.21.3+ boats are SimpleEntityDatas
 public class BoatData extends EntityData<Boat> {
 
-	private static final EnumMap<TreeSpecies, Class<? extends Boat>> typeToClassMap = new EnumMap<>(TreeSpecies.class);
-	private static final boolean IS_RUNNING_1_21_3 = Skript.isRunningMinecraft(1, 21, 3);
+	private static final Boat.Type[] types = Boat.Type.values();
 
 	static {
-		EntityData.register(BoatData.class, "boat", Boat.class, 0,
-				"boat", "any boat", "oak boat", "spruce boat", "birch boat", "jungle boat", "acacia boat", "dark oak boat");
-		if (IS_RUNNING_1_21_3) {
-			typeToClassMap.put(TreeSpecies.GENERIC, OakBoat.class);
-			typeToClassMap.put(TreeSpecies.REDWOOD, SpruceBoat.class);
-			typeToClassMap.put(TreeSpecies.BIRCH, BirchBoat.class);
-			typeToClassMap.put(TreeSpecies.JUNGLE, JungleBoat.class);
-			typeToClassMap.put(TreeSpecies.ACACIA, AcaciaBoat.class);
-			typeToClassMap.put(TreeSpecies.DARK_OAK, DarkOakBoat.class);
+		if (!Skript.isRunningMinecraft(1, 21, 2)) {
+			// This ensures all boats are registered
+			// As well as in the correct order via 'ordinal'
+			String[] patterns = new String[types.length + 2];
+			patterns[0] = "boat";
+			patterns[1] = "any boat";
+			for (Boat.Type boat : types) {
+				String boatName;
+				if (boat == Boat.Type.BAMBOO) {
+					boatName = "bamboo raft";
+				} else {
+					boatName = boat.toString().replace("_", " ").toLowerCase(Locale.ENGLISH) + " boat";
+				}
+				patterns[boat.ordinal() + 2] = boatName;
+			}
+			EntityData.register(BoatData.class, "boat", Boat.class, 0, patterns);
 		}
 	}
-
-
 	
 	public BoatData(){
 		this(0);
 	}
-	
-	public BoatData(@Nullable TreeSpecies type){
+
+	public BoatData(@Nullable Boat.Type type){
 		this(type != null ? type.ordinal() + 2 : 1);
 	}
 	
-	private BoatData(int type){
+	private BoatData(int type) {
 		matchedPattern = type;
 	}
-	
+
 	@Override
 	protected boolean init(Literal<?>[] exprs, int matchedPattern, ParseResult parseResult) {
-		
 		return true;
 	}
 
 	@Override
-	protected boolean init(@Nullable Class<? extends Boat> c, @Nullable Boat e) {
-		if (e != null)
-			matchedPattern = 2 + e.getWoodType().ordinal();
+	protected boolean init(@Nullable Class<? extends Boat> clazz, @Nullable Boat entity) {
+		if (entity != null)
+			matchedPattern = 2 + entity.getBoatType().ordinal();
 		return true;
 	}
 
 	@Override
 	public void set(Boat entity) {
 		if (matchedPattern == 1) // If the type is 'any boat'.
-			matchedPattern += new Random().nextInt(TreeSpecies.values().length); // It will spawn a random boat type in case is 'any boat'.
+			matchedPattern += new Random().nextInt(Boat.Type.values().length); // It will spawn a random boat type in case is 'any boat'.
 		if (matchedPattern > 1) // 0 and 1 are excluded
-			entity.setWoodType(TreeSpecies.values()[matchedPattern - 2]); // Removes 2 to fix the index.
+			entity.setBoatType(types[matchedPattern - 2]); // Removes 2 to fix the index.
 	}
 
 	@Override
 	protected boolean match(Boat entity) {
-		return matchedPattern <= 1 || entity.getWoodType().ordinal() == matchedPattern - 2;
+		return matchedPattern <= 1 || entity.getBoatType().ordinal() == matchedPattern - 2;
 	}
 
 	@Override
 	public Class<? extends Boat> getType() {
-		if (IS_RUNNING_1_21_3)
-			return typeToClassMap.get(TreeSpecies.values()[matchedPattern - 2]);
 		return Boat.class;
 	}
 
@@ -113,36 +93,54 @@ protected int hashCode_i() {
 
 	@Override
 	protected boolean equals_i(EntityData<?> obj) {
-		if (obj instanceof BoatData)
-			return matchedPattern == ((BoatData)obj).matchedPattern;
+		if (obj instanceof BoatData boatData)
+			return matchedPattern == boatData.matchedPattern;
 		return false;
 	}
 
 	@Override
-	public boolean isSupertypeOf(EntityData<?> e) {
-		if (e instanceof BoatData)
-			return matchedPattern <= 1 || matchedPattern == ((BoatData)e).matchedPattern;
+	public boolean isSupertypeOf(EntityData<?> entity) {
+		if (entity instanceof BoatData boatData)
+			return matchedPattern <= 1 || matchedPattern == boatData.matchedPattern;
 		return false;
 	}
-	
-	public boolean isOfItemType(ItemType i){
-		int ordinal = -1;
-
-		Material type = i.getMaterial();
-		if (type == Material.OAK_BOAT)
-			ordinal = 0;
-		else if (type == Material.SPRUCE_BOAT)
-			ordinal = TreeSpecies.REDWOOD.ordinal();
-		else if (type == Material.BIRCH_BOAT)
-			ordinal = TreeSpecies.BIRCH.ordinal();
-		else if (type == Material.JUNGLE_BOAT)
-			ordinal = TreeSpecies.JUNGLE.ordinal();
-		else if (type == Material.ACACIA_BOAT)
-			ordinal = TreeSpecies.ACACIA.ordinal();
-		else if (type == Material.DARK_OAK_BOAT)
-			ordinal = TreeSpecies.DARK_OAK.ordinal();
-		return hashCode_i() == ordinal + 2 || (matchedPattern + ordinal == 0) || ordinal == 0;
-		
+
+	private static final Map<Material, Boat.Type> materialToType = new HashMap<>();
+	static {
+		materialToType.put(Material.OAK_BOAT, Boat.Type.OAK);
+		materialToType.put(Material.BIRCH_BOAT, Boat.Type.BIRCH);
+		materialToType.put(Material.SPRUCE_BOAT, Boat.Type.SPRUCE);
+		materialToType.put(Material.JUNGLE_BOAT, Boat.Type.JUNGLE);
+		materialToType.put(Material.DARK_OAK_BOAT, Boat.Type.DARK_OAK);
+		materialToType.put(Material.ACACIA_BOAT, Boat.Type.ACACIA);
+		materialToType.put(Material.MANGROVE_BOAT, Boat.Type.MANGROVE);
+		materialToType.put(Material.CHERRY_BOAT, Boat.Type.CHERRY);
+		materialToType.put(Material.BAMBOO_RAFT, Boat.Type.BAMBOO);
+		// 'oak chest boat is a boat' should pass
+		materialToType.put(Material.OAK_CHEST_BOAT, Boat.Type.OAK);
+		materialToType.put(Material.BIRCH_CHEST_BOAT, Boat.Type.BIRCH);
+		materialToType.put(Material.SPRUCE_CHEST_BOAT, Boat.Type.SPRUCE);
+		materialToType.put(Material.JUNGLE_CHEST_BOAT, Boat.Type.JUNGLE);
+		materialToType.put(Material.DARK_OAK_CHEST_BOAT, Boat.Type.DARK_OAK);
+		materialToType.put(Material.ACACIA_CHEST_BOAT, Boat.Type.ACACIA);
+		materialToType.put(Material.MANGROVE_CHEST_BOAT, Boat.Type.MANGROVE);
+		materialToType.put(Material.CHERRY_CHEST_BOAT, Boat.Type.CHERRY);
+		materialToType.put(Material.BAMBOO_CHEST_RAFT, Boat.Type.BAMBOO);
+	}
+
+	public boolean isOfItemType(ItemType itemType) {
+		for (ItemData itemData : itemType.getTypes()) {
+			int ordinal;
+			Material material = itemData.getType();
+			Boat.Type type = materialToType.get(material);
+			// material is a boat AND (data matches any boat OR material and data are same)
+			if (type != null) {
+				ordinal = type.ordinal();
+				if (matchedPattern <= 1 || matchedPattern == ordinal + 2)
+					return true;
+			}
+		}
+		return false;
 	}
 
 }
diff --git a/src/main/java/ch/njol/skript/entity/CatData.java b/src/main/java/ch/njol/skript/entity/CatData.java
index b1b381dd1fc..aa186aeaf1e 100644
--- a/src/main/java/ch/njol/skript/entity/CatData.java
+++ b/src/main/java/ch/njol/skript/entity/CatData.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.entity;
 
 import ch.njol.skript.registrations.Classes;
diff --git a/src/main/java/ch/njol/skript/entity/CreeperData.java b/src/main/java/ch/njol/skript/entity/CreeperData.java
index 523f165e7db..25aecb6d948 100644
--- a/src/main/java/ch/njol/skript/entity/CreeperData.java
+++ b/src/main/java/ch/njol/skript/entity/CreeperData.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.entity;
 
 import org.bukkit.entity.Creeper;
diff --git a/src/main/java/ch/njol/skript/entity/DroppedItemData.java b/src/main/java/ch/njol/skript/entity/DroppedItemData.java
index aa7b4a6b8a4..ec1b330e36b 100644
--- a/src/main/java/ch/njol/skript/entity/DroppedItemData.java
+++ b/src/main/java/ch/njol/skript/entity/DroppedItemData.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.entity;
 
 import java.lang.reflect.InvocationTargetException;
diff --git a/src/main/java/ch/njol/skript/entity/EndermanData.java b/src/main/java/ch/njol/skript/entity/EndermanData.java
index 188c99e1159..3fb1685dec4 100644
--- a/src/main/java/ch/njol/skript/entity/EndermanData.java
+++ b/src/main/java/ch/njol/skript/entity/EndermanData.java
@@ -1,59 +1,38 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.entity;
 
-import java.util.Arrays;
-
-import org.bukkit.Bukkit;
-import org.bukkit.Material;
-import org.bukkit.block.data.BlockData;
-import org.bukkit.entity.Enderman;
-import org.bukkit.inventory.ItemStack;
-import org.bukkit.material.MaterialData;
-import org.jetbrains.annotations.Nullable;
-
-import ch.njol.skript.Skript;
 import ch.njol.skript.aliases.ItemType;
 import ch.njol.skript.lang.Literal;
 import ch.njol.skript.lang.SkriptParser.ParseResult;
 import ch.njol.skript.lang.util.SimpleExpression;
 import ch.njol.skript.localization.ArgsMessage;
 import ch.njol.skript.registrations.Classes;
-import ch.njol.util.Checker;
 import ch.njol.util.coll.CollectionUtils;
+import org.bukkit.Bukkit;
+import org.bukkit.Material;
+import org.bukkit.block.data.BlockData;
+import org.bukkit.entity.Enderman;
+import org.bukkit.inventory.ItemStack;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.Arrays;
+import java.util.function.Predicate;
 
 @SuppressWarnings("deprecation")
 public class EndermanData extends EntityData<Enderman> {
-	
+
 	static {
 		EntityData.register(EndermanData.class, "enderman", Enderman.class, "enderman");
 	}
 
 	@Nullable
 	private ItemType[] hand = null;
-	
+
 	public EndermanData() {}
-	
+
 	public EndermanData(@Nullable ItemType[] hand) {
 		this.hand = hand;
 	}
-	
+
 	@SuppressWarnings("unchecked")
 	@Override
 	protected boolean init(final Literal<?>[] exprs, final int matchedPattern, final ParseResult parseResult) {
@@ -61,7 +40,7 @@ protected boolean init(final Literal<?>[] exprs, final int matchedPattern, final
 			hand = ((Literal<ItemType>) exprs[0]).getAll();
 		return true;
 	}
-	
+
 	@Override
 	protected boolean init(final @Nullable Class<? extends Enderman> c, final @Nullable Enderman e) {
 		if (e != null) {
@@ -74,7 +53,7 @@ protected boolean init(final @Nullable Class<? extends Enderman> c, final @Nulla
 		}
 		return true;
 	}
-	
+
 	@Override
 	public void set(final Enderman entity) {
 		if (hand != null) {
@@ -86,28 +65,24 @@ public void set(final Enderman entity) {
 				entity.setCarriedBlock(Bukkit.createBlockData(i.getType()));
 			}
 		}
-		
+
 	}
-	
+
 	@Override
 	public boolean match(final Enderman entity) {
-		return hand == null || SimpleExpression.check(hand, new Checker<ItemType>() {
-			@SuppressWarnings("null")
-			@Override
-			public boolean check(final @Nullable ItemType t) {
-				// TODO {Block/Material}Data -> Material conversion is not 100% accurate, needs a better solution
-				return t != null && t.isOfType(entity.getCarriedBlock().getMaterial());
-			}
+		return hand == null || SimpleExpression.check(hand, type -> {
+			// TODO {Block/Material}Data -> Material conversion is not 100% accurate, needs a better solution
+			return type != null && type.isOfType(entity.getCarriedBlock().getMaterial());
 		}, false, false);
 	}
-	
+
 	@Override
 	public Class<Enderman> getType() {
 		return Enderman.class;
 	}
-	
+
 	private final static ArgsMessage format = new ArgsMessage("entities.enderman.format");
-	
+
 	@Override
 	public String toString(final int flags) {
 		final ItemType[] hand = this.hand;
@@ -115,12 +90,12 @@ public String toString(final int flags) {
 			return super.toString(flags);
 		return format.toString(super.toString(flags), Classes.toString(hand, false));
 	}
-	
+
 	@Override
 	protected int hashCode_i() {
 		return Arrays.hashCode(hand);
 	}
-	
+
 	@Override
 	protected boolean equals_i(final EntityData<?> obj) {
 		if (!(obj instanceof EndermanData))
@@ -128,7 +103,7 @@ protected boolean equals_i(final EntityData<?> obj) {
 		final EndermanData other = (EndermanData) obj;
 		return Arrays.equals(hand, other.hand);
 	}
-	
+
 //		if (hand == null)
 //			return "";
 //		final StringBuilder b = new StringBuilder();
@@ -162,23 +137,23 @@ protected boolean deserialize(final String s) {
 		}
 		return false;
 	}
-	
+
 	private boolean isSubhand(final @Nullable ItemType[] sub) {
 		if (hand != null)
 			return sub != null && ItemType.isSubset(hand, sub);
 		return true;
 	}
-	
+
 	@Override
 	public boolean isSupertypeOf(final EntityData<?> e) {
 		if (e instanceof EndermanData)
 			return isSubhand(((EndermanData) e).hand);
 		return false;
 	}
-	
+
 	@Override
 	public EntityData getSuperType() {
 		return new EndermanData(hand);
 	}
-	
+
 }
diff --git a/src/main/java/ch/njol/skript/entity/EntityData.java b/src/main/java/ch/njol/skript/entity/EntityData.java
index 2892d24c156..f7ea4d45dd3 100644
--- a/src/main/java/ch/njol/skript/entity/EntityData.java
+++ b/src/main/java/ch/njol/skript/entity/EntityData.java
@@ -1,72 +1,40 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.entity;
 
-import java.io.NotSerializableException;
-import java.io.StreamCorruptedException;
-import java.lang.reflect.Array;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.List;
-import java.util.function.Consumer;
-import java.util.regex.Pattern;
-import java.util.stream.Collectors;
-
-import org.bukkit.Bukkit;
-import org.bukkit.Chunk;
-import org.bukkit.Location;
-import org.bukkit.RegionAccessor;
-import org.bukkit.World;
-import org.bukkit.entity.Entity;
-import org.bukkit.entity.EntityType;
-import org.bukkit.entity.Player;
-import org.jetbrains.annotations.Nullable;
-
 import ch.njol.skript.Skript;
 import ch.njol.skript.SkriptAPIException;
 import ch.njol.skript.bukkitutil.EntityUtils;
 import ch.njol.skript.classes.ClassInfo;
 import ch.njol.skript.classes.Parser;
 import ch.njol.skript.classes.Serializer;
-import ch.njol.skript.lang.Expression;
-import ch.njol.skript.lang.Literal;
-import ch.njol.skript.lang.ParseContext;
-import ch.njol.skript.lang.SkriptParser;
+import ch.njol.skript.lang.*;
 import ch.njol.skript.lang.SkriptParser.ParseResult;
-import ch.njol.skript.lang.SyntaxElement;
-import ch.njol.skript.lang.SyntaxElementInfo;
 import ch.njol.skript.lang.util.SimpleLiteral;
-import ch.njol.skript.localization.Adjective;
-import ch.njol.skript.localization.Language;
+import ch.njol.skript.localization.*;
 import ch.njol.skript.localization.Language.LanguageListenerPriority;
-import ch.njol.skript.localization.LanguageChangeListener;
-import ch.njol.skript.localization.Message;
-import ch.njol.skript.localization.Noun;
 import ch.njol.skript.registrations.Classes;
 import ch.njol.util.Kleenean;
 import ch.njol.util.coll.CollectionUtils;
 import ch.njol.util.coll.iterator.SingleItemIterator;
 import ch.njol.yggdrasil.Fields;
 import ch.njol.yggdrasil.YggdrasilSerializable.YggdrasilExtendedSerializable;
+import org.bukkit.*;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.EntityType;
+import org.bukkit.entity.Player;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.io.NotSerializableException;
+import java.io.StreamCorruptedException;
+import java.lang.reflect.Array;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Iterator;
+import java.util.List;
+import java.util.function.Consumer;
+import java.util.stream.Collectors;
 
 @SuppressWarnings("rawtypes")
 public abstract class EntityData<E extends Entity> implements SyntaxElement, YggdrasilExtendedSerializable {// TODO extended horse support, zombie villagers // REMIND unit
@@ -105,8 +73,6 @@ public abstract class EntityData<E extends Entity> implements SyntaxElement, Ygg
 	// must be here to be initialised before 'new SimpleLiteral' is called in the register block below
 	private final static List<EntityDataInfo<EntityData<?>>> infos = new ArrayList<>();
 
-	private static final Pattern REGEX_PATTERN = Pattern.compile("[a-zA-Z -]+");
-
 	private static final List<EntityData> ALL_ENTITY_DATAS = new ArrayList<>();
 
 	public static Serializer<EntityData> serializer = new Serializer<EntityData>() {
@@ -116,17 +82,17 @@ public Fields serialize(final EntityData o) throws NotSerializableException {
 			f.putObject("codeName", o.info.codeName);
 			return f;
 		}
-		
+
 		@Override
 		public boolean canBeInstantiated() {
 			return false;
 		}
-		
+
 		@Override
 		public void deserialize(final EntityData o, final Fields f) throws StreamCorruptedException {
 			assert false;
 		}
-		
+
 		@Override
 		protected EntityData deserialize(final Fields fields) throws StreamCorruptedException, NotSerializableException {
 			final String codeName = fields.getAndRemoveObject("codeName", String.class);
@@ -146,7 +112,7 @@ protected EntityData deserialize(final Fields fields) throws StreamCorruptedExce
 			}
 			throw new StreamCorruptedException();
 		}
-		
+
 //		return getInfo((Class<? extends EntityData<?>>) d.getClass()).codeName + ":" + d.serialize();
 		@SuppressWarnings("null")
 		@Override
@@ -170,13 +136,13 @@ public EntityData deserialize(final String s) {
 				return null;
 			return d;
 		}
-		
+
 		@Override
 		public boolean mustSyncDeserialization() {
 			return false;
 		}
 	};
-	
+
 	static {
 		Classes.registerClass(new ClassInfo<>(EntityData.class, "entitydata")
 				.user("entity ?types?")
@@ -194,13 +160,13 @@ public boolean mustSyncDeserialization() {
 					public String toString(final EntityData d, final int flags) {
 						return d.toString(flags);
 					}
-					
+
 					@Override
 					@Nullable
 					public EntityData parse(final String s, final ParseContext context) {
 						return EntityData.parse(s);
 					}
-					
+
 					@Override
 					public String toVariableNameString(final EntityData o) {
 						return "entitydata:" + o.toString();
@@ -221,13 +187,15 @@ public static void onRegistrationStop() {
 		});
 	}
 
-	private final static class EntityDataInfo<T extends EntityData<?>> extends SyntaxElementInfo<T> implements LanguageChangeListener {
+	private final static class EntityDataInfo<T extends EntityData<?>> extends SyntaxElementInfo<T>
+		implements LanguageChangeListener {
+
 		final String codeName;
 		final String[] codeNames;
 		final int defaultName;
 		final Class<? extends Entity> entityClass;
 		final Noun[] names;
-		
+
 		public EntityDataInfo(final Class<T> dataClass, final String codeName, final String[] codeNames, final int defaultName, final Class<? extends Entity> entityClass) throws IllegalArgumentException {
 			super(new String[codeNames.length], dataClass, dataClass.getName());
 			assert codeName != null && entityClass != null && codeNames.length > 0;
@@ -240,16 +208,16 @@ public EntityDataInfo(final Class<T> dataClass, final String codeName, final Str
 				assert codeNames[i] != null;
 				names[i] = new Noun(LANGUAGE_NODE + "." + codeNames[i] + ".name");
 			}
-			
+
 			Language.addListener(this, LanguageListenerPriority.LATEST); // will initialise patterns, LATEST to make sure that m_age_pattern is updated before this
 		}
-		
+
 		@Override
 		public void onLanguageChange() {
 			for (int i = 0; i < codeNames.length; i++)
 				patterns[i] = Language.get(LANGUAGE_NODE + "." + codeNames[i] + ".pattern").replace("<age>", m_age_pattern.toString());
 		}
-		
+
 		@Override
 		public int hashCode() {
 			final int prime = 31;
@@ -257,7 +225,7 @@ public int hashCode() {
 			result = prime * result + codeName.hashCode();
 			return result;
 		}
-		
+
 		@Override
 		public boolean equals(final @Nullable Object obj) {
 			if (this == obj)
@@ -274,13 +242,13 @@ public boolean equals(final @Nullable Object obj) {
 			assert entityClass == other.entityClass;
 			return true;
 		}
-		
+
 	}
-	
+
 	public static <E extends Entity, T extends EntityData<E>> void register(final Class<T> dataClass, final String name, final Class<E> entityClass, final String codeName) throws IllegalArgumentException {
 		register(dataClass, name, entityClass, 0, codeName);
 	}
-	
+
 	@SuppressWarnings("unchecked")
 	public static <E extends Entity, T extends EntityData<E>> void register(final Class<T> dataClass, final String name, final Class<E> entityClass, final int defaultName, final String... codeNames) throws IllegalArgumentException {
 		final EntityDataInfo<T> info = new EntityDataInfo<>(dataClass, name, codeNames, defaultName, entityClass);
@@ -292,12 +260,12 @@ public static <E extends Entity, T extends EntityData<E>> void register(final Cl
 		}
 		infos.add((EntityDataInfo<EntityData<?>>) info);
 	}
-	
+
 	transient EntityDataInfo<?> info;
 	protected int matchedPattern = 0;
 	private Kleenean plural = Kleenean.UNKNOWN;
 	private Kleenean baby = Kleenean.UNKNOWN;
-	
+
 	public EntityData() {
 		for (final EntityDataInfo<?> i : infos) {
 			if (getClass() == i.getElementClass()) {
@@ -308,7 +276,7 @@ public EntityData() {
 		}
 		throw new IllegalStateException();
 	}
-	
+
 	@SuppressWarnings("null")
 	@Override
 	public final boolean init(final Expression<?>[] exprs, final int matchedPattern, final Kleenean isDelayed, final ParseResult parseResult) {
@@ -321,60 +289,60 @@ public final boolean init(final Expression<?>[] exprs, final int matchedPattern,
 		this.baby = ageBits == 4 ? Kleenean.TRUE : ageBits == 8 ? Kleenean.FALSE : Kleenean.UNKNOWN;
 		return init(Arrays.copyOf(exprs, exprs.length, Literal[].class), matchedPattern, parseResult);
 	}
-	
+
 	protected abstract boolean init(final Literal<?>[] exprs, final int matchedPattern, final ParseResult parseResult);
-	
+
 	/**
 	 * @param c An entity's class, e.g. Player
 	 * @param e An actual entity, or null to get an entity data for an entity class
 	 * @return Whether initialisation was successful
 	 */
 	protected abstract boolean init(@Nullable Class<? extends E> c, @Nullable E e);
-	
+
 	public abstract void set(E entity);
-	
+
 	protected abstract boolean match(E entity);
-	
+
 	public abstract Class<? extends E> getType();
-	
+
 	/**
 	 * Returns the super type of this entity data, e.g. 'wolf' for 'angry wolf'.
 	 *
 	 * @return The supertype of this entity data. Must not be null.
 	 */
 	public abstract EntityData getSuperType();
-	
+
 	@Override
 	public final String toString() {
 		return toString(0);
 	}
-	
+
 	@SuppressWarnings("null")
 	protected Noun getName() {
 		return info.names[matchedPattern];
 	}
-	
+
 	@Nullable
 	protected Adjective getAgeAdjective() {
 		return baby.isTrue() ? m_baby : baby.isFalse() ? m_adult : null;
 	}
-	
+
 	@SuppressWarnings("null")
 	public String toString(final int flags) {
 		final Noun name = info.names[matchedPattern];
 		return baby.isTrue() ? m_baby.toString(name, flags) : baby.isFalse() ? m_adult.toString(name, flags) : name.toString(flags);
 	}
-	
+
 	public Kleenean isPlural() {
 		return plural;
 	}
-	
+
 	public Kleenean isBaby() {
 		return baby;
 	}
-	
+
 	protected abstract int hashCode_i();
-	
+
 	@Override
 	public final int hashCode() {
 		final int prime = 31;
@@ -386,9 +354,9 @@ public final int hashCode() {
 		result = prime * result + hashCode_i();
 		return result;
 	}
-	
+
 	protected abstract boolean equals_i(EntityData<?> obj);
-	
+
 	@Override
 	public final boolean equals(final @Nullable Object obj) {
 		if (this == obj)
@@ -408,7 +376,7 @@ public final boolean equals(final @Nullable Object obj) {
 			return false;
 		return equals_i(other);
 	}
-	
+
 	public static EntityDataInfo<?> getInfo(final Class<? extends EntityData<?>> c) {
 		for (final EntityDataInfo<?> i : infos) {
 			if (i.getElementClass() == c)
@@ -416,7 +384,7 @@ public static EntityDataInfo<?> getInfo(final Class<? extends EntityData<?>> c)
 		}
 		throw new SkriptAPIException("Unregistered EntityData class " + c.getName());
 	}
-	
+
 	@Nullable
 	public static EntityDataInfo<?> getInfo(final String codeName) {
 		for (final EntityDataInfo<?> i : infos) {
@@ -435,12 +403,10 @@ public static EntityDataInfo<?> getInfo(final String codeName) {
 	@SuppressWarnings("null")
 	@Nullable
 	public static EntityData<?> parse(String s) {
-		if (!REGEX_PATTERN.matcher(s).matches())
-			return null;
-		Iterator<EntityDataInfo<EntityData<?>>> it = infos.iterator();
+		Iterator<EntityDataInfo<EntityData<?>>> it = new ArrayList<>(infos).iterator();
 		return SkriptParser.parseStatic(Noun.stripIndefiniteArticle(s), it, null);
 	}
-	
+
 	/**
 	 * Prints errors.
 	 *
@@ -449,9 +415,7 @@ public static EntityData<?> parse(String s) {
 	 */
 	@Nullable
 	public static EntityData<?> parseWithoutIndefiniteArticle(String s) {
-		if (!REGEX_PATTERN.matcher(s).matches())
-			return null;
-		Iterator<EntityDataInfo<EntityData<?>>> it = infos.iterator();
+		Iterator<EntityDataInfo<EntityData<?>>> it = new ArrayList<>(infos).iterator();
 		return SkriptParser.parseStatic(s, it, null);
 	}
 
@@ -472,7 +436,7 @@ private E apply(E entity) {
 	 * @param world World to check if entity can spawn in
 	 * @return True if entity can spawn else false
 	 */
-	@SuppressWarnings("ConstantValue")
+	@SuppressWarnings({"ConstantValue", "removal"})
 	public boolean canSpawn(@Nullable World world) {
 		if (world == null)
 			return false;
@@ -548,7 +512,7 @@ public E[] getAll(final World... worlds) {
 		}
 		return list.toArray((E[]) Array.newInstance(getType(), list.size()));
 	}
-	
+
 	/**
 	 * @param types
 	 * @param type
@@ -583,7 +547,7 @@ public static <E extends Entity> E[] getAll(final EntityData<?>[] types, final C
 		}
 		return list.toArray((E[]) Array.newInstance(type, list.size()));
 	}
-	
+
 	@SuppressWarnings("unchecked")
 	public static <E extends Entity> E[] getAll(final EntityData<?>[] types, final Class<E> type, Chunk[] chunks) {
 		assert types.length > 0;
@@ -600,7 +564,7 @@ public static <E extends Entity> E[] getAll(final EntityData<?>[] types, final C
 		}
 		return list.toArray((E[]) Array.newInstance(type, list.size()));
 	}
-	
+
 	private static <E extends Entity> EntityData<? super E> getData(final @Nullable Class<E> c, final @Nullable E e) {
 		assert c == null ^ e == null;
 		assert c == null || c.isInterface();
@@ -623,31 +587,31 @@ private static <E extends Entity> EntityData<? super E> getData(final @Nullable
 			return new SimpleEntityData(c);
 		}
 	}
-	
+
 	public static <E extends Entity> EntityData<? super E> fromClass(final Class<E> c) {
 		return getData(c, null);
 	}
-	
+
 	public static <E extends Entity> EntityData<? super E> fromEntity(final E e) {
 		return getData(null, e);
 	}
-	
+
 	public static String toString(final Entity e) {
 		return fromEntity(e).getSuperType().toString();
 	}
-	
+
 	public static String toString(final Class<? extends Entity> c) {
 		return fromClass(c).getSuperType().toString();
 	}
-	
+
 	public static String toString(final Entity e, final int flags) {
 		return fromEntity(e).getSuperType().toString(flags);
 	}
-	
+
 	public static String toString(final Class<? extends Entity> c, final int flags) {
 		return fromClass(c).getSuperType().toString(flags);
 	}
-	
+
 	@SuppressWarnings("unchecked")
 	public final boolean isInstance(final @Nullable Entity e) {
 		if (e == null)
@@ -656,24 +620,29 @@ public final boolean isInstance(final @Nullable Entity e) {
 			return false;
 		return getType().isInstance(e) && match((E) e);
 	}
-	
+
 	public abstract boolean isSupertypeOf(EntityData<?> e);
-	
+
 	@Override
 	public Fields serialize() throws NotSerializableException {
 		return new Fields(this);
 	}
-	
+
 	@Override
 	public void deserialize(final Fields fields) throws StreamCorruptedException, NotSerializableException {
 		fields.setFields(this);
 	}
-	
+
 	@Deprecated
 	protected boolean deserialize(final String s) {
 		return false;
 	}
 
+	@Override
+	public @NotNull String getSyntaxTypeName() {
+		return "entity data";
+	}
+
 	@SuppressWarnings({"unchecked", "deprecation"})
 	protected static <E extends Entity> @Nullable E spawn(Location location, Class<E> type, Consumer<E> consumer) {
 		World world = location.getWorld();
@@ -695,4 +664,33 @@ protected boolean deserialize(final String s) {
         return world.spawn(location, type, consumer);
 	}
 
+	/**
+	 * Creates an entity in the server but does not spawn it
+	 *
+	 * @return The created entity
+	 */
+	public @Nullable E create() {
+		Location location = Bukkit.getWorlds().get(0).getSpawnLocation();
+		return create(location);
+	}
+
+	/**
+	 * Creates an entity at the provided location, but does not spawn it
+	 * NOTE: If {@link RegionAccessor#createEntity(Location, Class)} does not exist, will return {@link #spawn(Location)}
+	 * @param location The {@link Location} to create the entity at
+	 * @return The created entity
+	 */
+	public @Nullable E create(Location location) {
+		if (!Skript.methodExists(RegionAccessor.class, "createEntity"))
+			return spawn(location);
+		return create(location, getType());
+	}
+
+	protected static <E extends Entity> @Nullable E create(Location location, Class<E> type) {
+		World world = location.getWorld();
+		if (world == null)
+			return null;
+		return world.createEntity(location, type);
+	}
+
 }
diff --git a/src/main/java/ch/njol/skript/entity/EntityType.java b/src/main/java/ch/njol/skript/entity/EntityType.java
index dad96cad68f..9919d1956ad 100644
--- a/src/main/java/ch/njol/skript/entity/EntityType.java
+++ b/src/main/java/ch/njol/skript/entity/EntityType.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.entity;
 
 import org.bukkit.entity.Entity;
diff --git a/src/main/java/ch/njol/skript/entity/FallingBlockData.java b/src/main/java/ch/njol/skript/entity/FallingBlockData.java
index c67b624c69f..7502805482d 100644
--- a/src/main/java/ch/njol/skript/entity/FallingBlockData.java
+++ b/src/main/java/ch/njol/skript/entity/FallingBlockData.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.entity;
 
 import java.util.Arrays;
diff --git a/src/main/java/ch/njol/skript/entity/FoxData.java b/src/main/java/ch/njol/skript/entity/FoxData.java
index ab2c67c1739..ea2328b3dd4 100644
--- a/src/main/java/ch/njol/skript/entity/FoxData.java
+++ b/src/main/java/ch/njol/skript/entity/FoxData.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.entity;
 
 import org.bukkit.entity.Fox;
diff --git a/src/main/java/ch/njol/skript/entity/FrogData.java b/src/main/java/ch/njol/skript/entity/FrogData.java
index 9a0c8a4f82c..7eb9ace9858 100644
--- a/src/main/java/ch/njol/skript/entity/FrogData.java
+++ b/src/main/java/ch/njol/skript/entity/FrogData.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.entity;
 
 import ch.njol.skript.Skript;
diff --git a/src/main/java/ch/njol/skript/entity/GoatData.java b/src/main/java/ch/njol/skript/entity/GoatData.java
index cf70bc73c79..44140d40340 100644
--- a/src/main/java/ch/njol/skript/entity/GoatData.java
+++ b/src/main/java/ch/njol/skript/entity/GoatData.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.entity;
 
 import ch.njol.skript.Skript;
diff --git a/src/main/java/ch/njol/skript/entity/LlamaData.java b/src/main/java/ch/njol/skript/entity/LlamaData.java
index c5bda24d6f7..85bdea2f2fb 100644
--- a/src/main/java/ch/njol/skript/entity/LlamaData.java
+++ b/src/main/java/ch/njol/skript/entity/LlamaData.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.entity;
 
 import org.bukkit.entity.Llama;
diff --git a/src/main/java/ch/njol/skript/entity/MinecartData.java b/src/main/java/ch/njol/skript/entity/MinecartData.java
index e96540dbded..377c2a4be3b 100644
--- a/src/main/java/ch/njol/skript/entity/MinecartData.java
+++ b/src/main/java/ch/njol/skript/entity/MinecartData.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.entity;
 
 import java.util.ArrayList;
diff --git a/src/main/java/ch/njol/skript/entity/MooshroomData.java b/src/main/java/ch/njol/skript/entity/MooshroomData.java
index f54bbd754ae..79d2958fdca 100644
--- a/src/main/java/ch/njol/skript/entity/MooshroomData.java
+++ b/src/main/java/ch/njol/skript/entity/MooshroomData.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.entity;
 
 import org.bukkit.entity.MushroomCow;
diff --git a/src/main/java/ch/njol/skript/entity/OcelotData.java b/src/main/java/ch/njol/skript/entity/OcelotData.java
index 8d0eace2ec9..c845fefffcb 100644
--- a/src/main/java/ch/njol/skript/entity/OcelotData.java
+++ b/src/main/java/ch/njol/skript/entity/OcelotData.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.entity;
 
 import org.bukkit.entity.Ocelot;
diff --git a/src/main/java/ch/njol/skript/entity/PandaData.java b/src/main/java/ch/njol/skript/entity/PandaData.java
index ea74e337b65..bc704b045ce 100644
--- a/src/main/java/ch/njol/skript/entity/PandaData.java
+++ b/src/main/java/ch/njol/skript/entity/PandaData.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.entity;
 
 import java.util.concurrent.ThreadLocalRandom;
diff --git a/src/main/java/ch/njol/skript/entity/ParrotData.java b/src/main/java/ch/njol/skript/entity/ParrotData.java
index e512af6eff3..7a151c2512f 100644
--- a/src/main/java/ch/njol/skript/entity/ParrotData.java
+++ b/src/main/java/ch/njol/skript/entity/ParrotData.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.entity;
 
 import java.util.concurrent.ThreadLocalRandom;
diff --git a/src/main/java/ch/njol/skript/entity/PigData.java b/src/main/java/ch/njol/skript/entity/PigData.java
index 8ce406a705a..42713e1cd4d 100644
--- a/src/main/java/ch/njol/skript/entity/PigData.java
+++ b/src/main/java/ch/njol/skript/entity/PigData.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.entity;
 
 import org.bukkit.entity.Pig;
diff --git a/src/main/java/ch/njol/skript/entity/RabbitData.java b/src/main/java/ch/njol/skript/entity/RabbitData.java
index 49208e3eebe..3db721d73cf 100644
--- a/src/main/java/ch/njol/skript/entity/RabbitData.java
+++ b/src/main/java/ch/njol/skript/entity/RabbitData.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.entity;
 
 import org.bukkit.entity.Rabbit;
diff --git a/src/main/java/ch/njol/skript/entity/SalmonData.java b/src/main/java/ch/njol/skript/entity/SalmonData.java
new file mode 100644
index 00000000000..0151f31556e
--- /dev/null
+++ b/src/main/java/ch/njol/skript/entity/SalmonData.java
@@ -0,0 +1,94 @@
+package ch.njol.skript.entity;
+
+import ch.njol.skript.Skript;
+import ch.njol.skript.lang.Literal;
+import ch.njol.skript.lang.SkriptParser.ParseResult;
+import ch.njol.util.coll.CollectionUtils;
+import org.bukkit.entity.Salmon;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Locale;
+
+public class SalmonData extends EntityData<Salmon> {
+
+	private static final boolean SUPPORT_SALMON_VARIANTS = Skript.classExists("org.bukkit.entity.Salmon$Variant");
+	private static Object[] variants;
+
+	static {
+		List<String> patternList = new ArrayList<>();
+		patternList.add("salmon");
+		if (SUPPORT_SALMON_VARIANTS) {
+			variants = Salmon.Variant.values();
+			patternList.add("any salmon");
+			for (Object object : variants) {
+				Salmon.Variant variant = (Salmon.Variant) object;
+				patternList.add(variant.toString().replace("_", " ").toLowerCase(Locale.ENGLISH) + " salmon");
+			}
+		}
+
+		EntityData.register(SalmonData.class, "salmon", Salmon.class, 0, patternList.toArray(String[]::new));
+	}
+
+	private @Nullable Object variant;
+
+	@Override
+	protected boolean init(Literal<?>[] exprs, int matchedPattern, ParseResult parseResult) {
+		if (matchedPattern > 1)
+			variant = variants[matchedPattern - 2];
+		return true;
+	}
+
+	@Override
+	protected boolean init(@Nullable Class<? extends Salmon> c, @Nullable Salmon salmon) {
+		if (salmon != null && SUPPORT_SALMON_VARIANTS)
+			variant = salmon.getVariant();
+		return true;
+	}
+
+	@Override
+	public void set(Salmon entity) {
+		if (SUPPORT_SALMON_VARIANTS) {
+			Object variantSet = variant != null ? variant : CollectionUtils.getRandom(variants);
+			entity.setVariant((Salmon.Variant) variantSet);
+		}
+	}
+
+	@Override
+	protected boolean match(Salmon entity) {
+		return matchedPattern <= 1 || variant == entity.getVariant();
+	}
+
+	@Override
+	public Class<? extends Salmon> getType() {
+		return Salmon.class;
+	}
+
+	@Override
+	public EntityData getSuperType() {
+		return new SalmonData();
+	}
+
+	@Override
+	protected int hashCode_i() {
+		return matchedPattern <= 1 ? 0 : matchedPattern;
+	}
+
+	@Override
+	protected boolean equals_i(EntityData<?> obj) {
+		if (!(obj instanceof SalmonData salmonData))
+			return false;
+		if (matchedPattern > 1 && variant != salmonData.variant)
+			return false;
+		return true;
+	}
+
+	@Override
+	public boolean isSupertypeOf(EntityData<?> entity) {
+		if (entity instanceof SalmonData salmonData)
+			return matchedPattern <= 1 || variant == salmonData.variant;
+		return false;
+	}
+
+}
diff --git a/src/main/java/ch/njol/skript/entity/SheepData.java b/src/main/java/ch/njol/skript/entity/SheepData.java
index 119daf8c65f..26e6e351204 100644
--- a/src/main/java/ch/njol/skript/entity/SheepData.java
+++ b/src/main/java/ch/njol/skript/entity/SheepData.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.entity;
 
 import java.util.Arrays;
diff --git a/src/main/java/ch/njol/skript/entity/SimpleEntityData.java b/src/main/java/ch/njol/skript/entity/SimpleEntityData.java
index 7b6c48c3001..3509ab31ff7 100644
--- a/src/main/java/ch/njol/skript/entity/SimpleEntityData.java
+++ b/src/main/java/ch/njol/skript/entity/SimpleEntityData.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.entity;
 
 import ch.njol.skript.Skript;
@@ -25,6 +7,7 @@
 import ch.njol.yggdrasil.Fields;
 import org.bukkit.World;
 import org.bukkit.entity.*;
+import org.bukkit.entity.boat.*;
 import org.jetbrains.annotations.Nullable;
 
 import java.io.NotSerializableException;
@@ -158,7 +141,6 @@ private static void addSuperEntity(String codeName, Class<? extends Entity> enti
 		addSimpleEntity("turtle", Turtle.class);
 		addSimpleEntity("cod", Cod.class);
 		addSimpleEntity("puffer fish", PufferFish.class);
-		addSimpleEntity("salmon", Salmon.class);
 		addSimpleEntity("tropical fish", TropicalFish.class);
 		addSimpleEntity("trident", Trident.class);
 
@@ -192,16 +174,12 @@ private static void addSuperEntity(String codeName, Class<? extends Entity> enti
 			addSimpleEntity("warden", Warden.class);
 		}
 
-		if (Skript.isRunningMinecraft(1,19,3))
+		if (Skript.isRunningMinecraft(1, 19, 3))
 			addSimpleEntity("camel", Camel.class);
 
-		if (Skript.isRunningMinecraft(1,19,4)) {
+		if (Skript.isRunningMinecraft(1, 19, 4)) {
 			addSimpleEntity("sniffer", Sniffer.class);
-			addSimpleEntity("text display", TextDisplay.class);
-			addSimpleEntity("item display", ItemDisplay.class);
-			addSimpleEntity("block display", BlockDisplay.class);
 			addSimpleEntity("interaction", Interaction.class);
-			addSuperEntity("display", Display.class);
 		}
 
 		if (Skript.isRunningMinecraft(1, 20, 3)) {
@@ -214,15 +192,43 @@ private static void addSuperEntity(String codeName, Class<? extends Entity> enti
 			addSimpleEntity("bogged", Bogged.class);
 		}
 
-		if (Skript.isRunningMinecraft(1,21,3)) {
+		if (Skript.isRunningMinecraft(1,21,2)) {
+			addSimpleEntity("creaking", Creaking.class);
 			addSimpleEntity("creaking", Creaking.class);
+			// boats
+			addSimpleEntity("oak boat", OakBoat.class);
+			addSimpleEntity("dark oak boat", DarkOakBoat.class);
+			addSimpleEntity("pale oak boat", PaleOakBoat.class);
+			addSimpleEntity("acacia boat", AcaciaBoat.class);
+			addSimpleEntity("birch boat", BirchBoat.class);
+			addSimpleEntity("spruce boat", SpruceBoat.class);
+			addSimpleEntity("jungle boat", JungleBoat.class);
+			addSimpleEntity("bamboo raft", BambooRaft.class);
+			addSimpleEntity("mangrove boat", MangroveBoat.class);
+			addSimpleEntity("cherry boat", CherryBoat.class);
+			// chest boats
+			addSimpleEntity("oak chest boat", OakChestBoat.class);
+			addSimpleEntity("dark oak chest boat", DarkOakChestBoat.class);
+			addSimpleEntity("pale oak chest boat", PaleOakChestBoat.class);
+			addSimpleEntity("acacia chest boat", AcaciaChestBoat.class);
+			addSimpleEntity("birch chest boat", BirchChestBoat.class);
+			addSimpleEntity("spruce chest boat", SpruceChestBoat.class);
+			addSimpleEntity("jungle chest boat", JungleChestBoat.class);
+			addSimpleEntity("bamboo chest raft", BambooChestRaft.class);
+			addSimpleEntity("mangrove chest boat", MangroveChestBoat.class);
+			addSimpleEntity("cherry chest boat", CherryChestBoat.class);
+			// supers
+			addSuperEntity("boat", Boat.class);
+			addSuperEntity("any boat", Boat.class);
+			addSuperEntity("chest boat", ChestBoat.class);
+			addSuperEntity("any chest boat", ChestBoat.class);
 		}
 
 		// Register zombie after Husk and Drowned to make sure both work
 		addSimpleEntity("zombie", Zombie.class);
 		// Register squid after glow squid to make sure both work
 		addSimpleEntity("squid", Squid.class);
-		
+
 		// SuperTypes
 		addSuperEntity("human", HumanEntity.class);
 		addSuperEntity("damageable", Damageable.class);
@@ -243,12 +249,14 @@ private static void addSuperEntity(String codeName, Class<? extends Entity> enti
 		addSuperEntity("any fireball", Fireball.class);
 		addSuperEntity("illager", Illager.class);
 		addSuperEntity("spellcaster", Spellcaster.class);
-		if (Skript.classExists("org.bukkit.entity.Raider")) // Introduced in Spigot 1.14
+		if (Skript.classExists("org.bukkit.entity.Raider")) // 1.14
 			addSuperEntity("raider", Raider.class);
-		if (Skript.classExists("org.bukkit.entity.Enemy")) // Introduced in Spigot 1.19.3
+		if (Skript.classExists("org.bukkit.entity.Enemy")) // 1.19.3
 			addSuperEntity("enemy", Enemy.class);
+		if (Skript.classExists("org.bukkit.entity.Display")) // 1.19.4
+			addSuperEntity("display", Display.class);
 	}
-	
+
 	static {
 		final String[] codeNames = new String[types.size()];
 		int i = 0;
diff --git a/src/main/java/ch/njol/skript/entity/ThrownPotionData.java b/src/main/java/ch/njol/skript/entity/ThrownPotionData.java
index 22ec2711951..30a832ee5f7 100644
--- a/src/main/java/ch/njol/skript/entity/ThrownPotionData.java
+++ b/src/main/java/ch/njol/skript/entity/ThrownPotionData.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.entity;
 
 import java.util.Arrays;
diff --git a/src/main/java/ch/njol/skript/entity/TropicalFishData.java b/src/main/java/ch/njol/skript/entity/TropicalFishData.java
index b8266a09537..8b173e73914 100644
--- a/src/main/java/ch/njol/skript/entity/TropicalFishData.java
+++ b/src/main/java/ch/njol/skript/entity/TropicalFishData.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.entity;
 
 import java.util.Objects;
diff --git a/src/main/java/ch/njol/skript/entity/VillagerData.java b/src/main/java/ch/njol/skript/entity/VillagerData.java
index 3e1cb593de7..7231e4637c5 100644
--- a/src/main/java/ch/njol/skript/entity/VillagerData.java
+++ b/src/main/java/ch/njol/skript/entity/VillagerData.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.entity;
 
 import java.lang.invoke.MethodHandles;
diff --git a/src/main/java/ch/njol/skript/entity/WolfData.java b/src/main/java/ch/njol/skript/entity/WolfData.java
index c164cdc8814..d79ebd79591 100644
--- a/src/main/java/ch/njol/skript/entity/WolfData.java
+++ b/src/main/java/ch/njol/skript/entity/WolfData.java
@@ -1,41 +1,39 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.entity;
 
+import ch.njol.skript.bukkitutil.BukkitUtils;
+import ch.njol.skript.registrations.Classes;
+import ch.njol.util.coll.CollectionUtils;
+import com.google.common.collect.Iterators;
 import org.bukkit.DyeColor;
 import org.bukkit.entity.Wolf;
 import org.jetbrains.annotations.Nullable;
 
+import ch.njol.skript.Skript;
 import ch.njol.skript.lang.Literal;
 import ch.njol.skript.lang.SkriptParser.ParseResult;
 import ch.njol.skript.util.Color;
 
+import java.util.Objects;
+
 public class WolfData extends EntityData<Wolf> {
 
+	private static boolean variantsEnabled = false;
+
 	static {
 		EntityData.register(WolfData.class, "wolf", Wolf.class, 1,
 				"peaceful wolf", "wolf", "angry wolf",
 				"wild wolf", "tamed wolf");
+		if (Skript.classExists("org.bukkit.entity.Wolf$Variant") && BukkitUtils.registryExists("WOLF_VARIANT")) {
+			variantsEnabled = true;
+			variants = Iterators.toArray(Classes.getExactClassInfo(Wolf.Variant.class).getSupplier().get(), Wolf.Variant.class);
+		}
 	}
 
-	@Nullable
-	private DyeColor collarColor;
+
+	private static Object[] variants;
+
+	private @Nullable Object variant;
+	private @Nullable DyeColor collarColor;
 
 	private int angry = 0;
 	private int tamed = 0;
@@ -47,8 +45,10 @@ protected boolean init(Literal<?>[] exprs, int matchedPattern, ParseResult parse
 			angry = matchedPattern - 1;
 		else
 			tamed = matchedPattern == 3 ? -1 : 1;
-		if (exprs[0] != null)
-			collarColor = ((Literal<Color>) exprs[0]).getSingle().asDyeColor();
+		if (exprs[0] != null && variantsEnabled)
+			variant = ((Literal<Wolf.Variant>) exprs[0]).getSingle();
+		if (exprs[1] != null)
+			collarColor = ((Literal<Color>) exprs[1]).getSingle().asDyeColor();
 		return true;
 	}
 
@@ -58,6 +58,8 @@ protected boolean init(@Nullable Class<? extends Wolf> c, @Nullable Wolf wolf) {
 			angry = wolf.isAngry() ? 1 : -1;
 			tamed = wolf.isTamed() ? 1 : -1;
 			collarColor = wolf.getCollarColor();
+			if (variantsEnabled)
+				variant = wolf.getVariant();
 		}
 		return true;
 	}
@@ -70,11 +72,17 @@ public void set(Wolf entity) {
 			entity.setTamed(tamed == 1);
 		if (collarColor != null)
 			entity.setCollarColor(collarColor);
+		Object variantSet = null;
+		if (variantsEnabled) {
+			variantSet = variant != null ? variant : CollectionUtils.getRandom(variants);
+			entity.setVariant((Wolf.Variant) variantSet);
+		}
 	}
 
 	@Override
 	public boolean match(Wolf entity) {
-		return (angry == 0 || entity.isAngry() == (angry == 1)) && (tamed == 0 || entity.isTamed() == (tamed == 1)) && (collarColor == null ? true : entity.getCollarColor() == collarColor);
+		return (angry == 0 || entity.isAngry() == (angry == 1)) && (tamed == 0 || entity.isTamed() == (tamed == 1)) &&
+			(collarColor == null || entity.getCollarColor() == collarColor) && (variant == null || entity.getVariant() == variant);
 	}
 
 	@Override
@@ -88,6 +96,8 @@ protected int hashCode_i() {
 		result = prime * result + angry;
 		result = prime * result + tamed;
 		result = prime * result + (collarColor == null ? 0 : collarColor.hashCode());
+		if (variantsEnabled)
+			result = prime * result + (variant == null ? 0 : Objects.hashCode(variant));
 		return result;
 	}
 
@@ -102,6 +112,8 @@ protected boolean equals_i(EntityData<?> obj) {
 			return false;
 		if (collarColor != other.collarColor)
 			return false;
+		if (variantsEnabled && variant != other.variant)
+			return false;
 		return true;
 	}
 
@@ -127,7 +139,7 @@ protected boolean deserialize(String s) {
 	public boolean isSupertypeOf(EntityData<?> entityData) {
 		if (entityData instanceof WolfData) {
 			WolfData wolfData = (WolfData) entityData;
-			return (angry == 0 || wolfData.angry == angry) && (tamed == 0 || wolfData.tamed == tamed) && (wolfData.collarColor == collarColor);
+			return (angry == 0 || wolfData.angry == angry) && (tamed == 0 || wolfData.tamed == tamed) && (wolfData.collarColor == collarColor) && (!variantsEnabled || wolfData.variant == variant);
 		}
 		return false;
 	}
@@ -137,4 +149,9 @@ public EntityData<Wolf> getSuperType() {
 		return new WolfData();
 	}
 
+	/**
+	 * A dummy/placeholder class to ensure working operation on MC versions that do not have `Wolf.Variant`
+	 */
+	public static class VariantDummy {};
+
 }
diff --git a/src/main/java/ch/njol/skript/entity/XpOrbData.java b/src/main/java/ch/njol/skript/entity/XpOrbData.java
index 47dcce369fe..c2e80e7b5ba 100644
--- a/src/main/java/ch/njol/skript/entity/XpOrbData.java
+++ b/src/main/java/ch/njol/skript/entity/XpOrbData.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.entity;
 
 import java.util.function.Consumer;
diff --git a/src/main/java/ch/njol/skript/entity/ZombieVillagerData.java b/src/main/java/ch/njol/skript/entity/ZombieVillagerData.java
index 6b50870dd7e..63b36d1fd8a 100644
--- a/src/main/java/ch/njol/skript/entity/ZombieVillagerData.java
+++ b/src/main/java/ch/njol/skript/entity/ZombieVillagerData.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.entity;
 
 import org.bukkit.entity.Villager;
diff --git a/src/main/java/ch/njol/skript/events/EvtAtTime.java b/src/main/java/ch/njol/skript/events/EvtAtTime.java
index c7adae44144..0cbc5f96bef 100644
--- a/src/main/java/ch/njol/skript/events/EvtAtTime.java
+++ b/src/main/java/ch/njol/skript/events/EvtAtTime.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.events;
 
 import ch.njol.skript.Skript;
diff --git a/src/main/java/ch/njol/skript/events/EvtBeaconEffect.java b/src/main/java/ch/njol/skript/events/EvtBeaconEffect.java
new file mode 100644
index 00000000000..7aa46c2f1f0
--- /dev/null
+++ b/src/main/java/ch/njol/skript/events/EvtBeaconEffect.java
@@ -0,0 +1,69 @@
+package ch.njol.skript.events;
+
+import ch.njol.skript.Skript;
+import ch.njol.skript.doc.*;
+import ch.njol.skript.lang.Literal;
+import ch.njol.skript.lang.SkriptEvent;
+import ch.njol.skript.lang.SkriptParser.ParseResult;
+import com.destroystokyo.paper.event.block.BeaconEffectEvent;
+import org.bukkit.event.Event;
+import org.bukkit.potion.PotionEffectType;
+import org.jetbrains.annotations.Nullable;
+
+@Name("Beacon Effect")
+@Description("Called when a player gets an effect from a beacon.")
+@Examples({
+	"on beacon effect:",
+		"\tbroadcast applied effect",
+		"\tbroadcast event-player",
+		"\tbroadcast event-block",
+	"on primary beacon effect apply of haste:",
+	"on application of secondary beacon effect:",
+	"on beacon effect of speed:"
+})
+@RequiredPlugins("Paper")
+@Since("2.10")
+public class EvtBeaconEffect extends SkriptEvent {
+
+	static {
+		if (Skript.classExists("com.destroystokyo.paper.event.block.BeaconEffectEvent"))
+			Skript.registerEvent("Beacon Effect", EvtBeaconEffect.class, BeaconEffectEvent.class,
+				"[:primary|:secondary] beacon effect [of %-potioneffecttypes%]",
+				"application of [:primary|:secondary] beacon effect [of %-potioneffecttypes%]",
+				"[:primary|:secondary] beacon effect apply [of %-potioneffecttypes%]");
+
+	}
+
+	private @Nullable Literal<PotionEffectType> potionTypes;
+	private @Nullable Boolean primaryCheck;
+
+	@Override
+	@SuppressWarnings("unchecked")
+	public boolean init(Literal<?>[] exprs, int matchedPattern, ParseResult parseResult) {
+		potionTypes = (Literal<PotionEffectType>) exprs[0];
+		if (parseResult.hasTag("primary")) {
+			primaryCheck = true;
+		} else if (parseResult.hasTag("secondary")) {
+			primaryCheck = false;
+		}
+		return true;
+	}
+
+	@Override
+	public boolean check(Event event) {
+		if (!(event instanceof BeaconEffectEvent effectEvent))
+			return false;
+		if (primaryCheck != null && effectEvent.isPrimary() != primaryCheck)
+			return false;
+		if (potionTypes != null)
+			return potionTypes.check(event, type -> effectEvent.getEffect().getType() == type);
+		return true;
+	}
+
+	@Override
+	public String toString(@Nullable Event event, boolean debug) {
+		return (primaryCheck == null ? "" : primaryCheck ? "primary " : "secondary ") +
+			"beacon effect" + (potionTypes == null ? "" : " of " + potionTypes.toString(event, debug));
+	}
+
+}
diff --git a/src/main/java/ch/njol/skript/events/EvtBeaconToggle.java b/src/main/java/ch/njol/skript/events/EvtBeaconToggle.java
new file mode 100644
index 00000000000..8e9925014d5
--- /dev/null
+++ b/src/main/java/ch/njol/skript/events/EvtBeaconToggle.java
@@ -0,0 +1,58 @@
+package ch.njol.skript.events;
+
+import ch.njol.skript.Skript;
+import ch.njol.skript.doc.*;
+import ch.njol.skript.lang.Literal;
+import ch.njol.skript.lang.SkriptEvent;
+import ch.njol.skript.lang.SkriptParser.ParseResult;
+import io.papermc.paper.event.block.BeaconActivatedEvent;
+import io.papermc.paper.event.block.BeaconDeactivatedEvent;
+import org.bukkit.event.Event;
+import org.jetbrains.annotations.Nullable;
+
+@Name("Beacon Toggle")
+@Description("Called when a beacon is activated or deactivated.")
+@Examples({
+	"on beacon toggle:",
+	"on beacon activate:",
+	"on beacon deactivate:"
+})
+@RequiredPlugins("Paper")
+@Since("2.10")
+public class EvtBeaconToggle extends SkriptEvent {
+
+	static {
+		if (Skript.classExists("io.papermc.paper.event.block.BeaconActivatedEvent"))
+			Skript.registerEvent("Beacon Toggle", EvtBeaconToggle.class, new Class[] {BeaconActivatedEvent.class, BeaconDeactivatedEvent.class},
+					"beacon toggle",
+					"beacon activat(e|ion)",
+					"beacon deactivat(e|ion)");
+	}
+
+	private boolean isActivate, isToggle;
+
+	@Override
+    public boolean init(Literal<?>[] exprs, int matchedPattern, ParseResult parseResult) {
+		isToggle = matchedPattern == 0;
+		isActivate = matchedPattern == 1;
+		return true;
+	}
+
+	@Override
+	public boolean check(Event event) {
+		if (!isToggle) {
+			if (event instanceof BeaconActivatedEvent) {
+				return isActivate;
+			} else if (event instanceof BeaconDeactivatedEvent) {
+				return !isActivate;
+			}
+		}
+		return true;
+	}
+
+	@Override
+	public String toString(@Nullable Event event, boolean debug) {
+		return "beacon " + (isToggle ? "toggle" : isActivate ? "activate" : "deactivate");
+	}
+
+}
diff --git a/src/main/java/ch/njol/skript/events/EvtBlock.java b/src/main/java/ch/njol/skript/events/EvtBlock.java
index ddfdc512552..8b150a0d67a 100644
--- a/src/main/java/ch/njol/skript/events/EvtBlock.java
+++ b/src/main/java/ch/njol/skript/events/EvtBlock.java
@@ -1,33 +1,10 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.events;
 
 import org.bukkit.block.Block;
 import org.bukkit.block.BlockState;
 import org.bukkit.block.data.BlockData;
 import org.bukkit.event.Event;
-import org.bukkit.event.block.BlockBreakEvent;
-import org.bukkit.event.block.BlockBurnEvent;
-import org.bukkit.event.block.BlockEvent;
-import org.bukkit.event.block.BlockFadeEvent;
-import org.bukkit.event.block.BlockFormEvent;
-import org.bukkit.event.block.BlockPlaceEvent;
+import org.bukkit.event.block.*;
 import org.bukkit.event.hanging.HangingBreakEvent;
 import org.bukkit.event.hanging.HangingEvent;
 import org.bukkit.event.hanging.HangingPlaceEvent;
@@ -37,6 +14,7 @@
 
 import ch.njol.skript.Skript;
 import ch.njol.skript.aliases.ItemType;
+import org.jetbrains.annotations.NotNull;
 import org.skriptlang.skript.lang.comparator.Relation;
 import ch.njol.skript.classes.data.DefaultComparators;
 import ch.njol.skript.entity.EntityData;
@@ -74,6 +52,30 @@ public class EvtBlock extends SkriptEvent {
 			.description("Called when a block is created, but not by a player, e.g. snow forms due to snowfall, water freezes in cold biomes. This isn't called when block spreads (mushroom growth, water physics etc.), as it has its own event (see <a href='#spread'>spread event</a>).")
 			.examples("on form of snow:", "on form of a mushroom:")
 			.since("1.0, 2.6 (BlockData support)");
+		Skript.registerEvent("Block Drop", EvtBlock.class, BlockDropItemEvent.class, "block drop[ping] [[of] %-itemtypes/blockdatas%]")
+			.description(
+				"Called when a block broken by a player drops something.",
+				"<ul>",
+				"<li>event-player: The player that broke the block</li>",
+				"<li>past event-block: The block that was broken</li>",
+				"<li>event-block: The block after being broken</li>",
+				"<li>event-items (or drops): The drops of the block</li>",
+				"<li>event-entities: The entities of the dropped items</li>",
+				"</ul>",
+				"",
+				"If the breaking of the block leads to others being broken, such as torches, they will appear" +
+				"in \"event-items\" and \"event-entities\"."
+			)
+			.examples(
+				"on block drop:",
+					"\tbroadcast event-player",
+					"\tbroadcast past event-block",
+					"\tbroadcast event-block",
+					"\tbroadcast event-items",
+					"\tbroadcast event-entities",
+				"on block drop of oak log:"
+			)
+			.since("2.10");
 	}
 	
 	@Nullable
@@ -101,26 +103,26 @@ public boolean check(final Event event) {
 		ItemType item;
 		BlockData blockData = null;
 
-		if (event instanceof BlockFormEvent) {
-			BlockFormEvent blockFormEvent = (BlockFormEvent) event;
+		if (event instanceof BlockFormEvent blockFormEvent) {
 			BlockState newState = blockFormEvent.getNewState();
 			item = new ItemType(newState.getBlockData());
 			blockData = newState.getBlockData();
-		} else if (event instanceof BlockEvent) {
-			BlockEvent blockEvent = (BlockEvent) event;
+		} else if (event instanceof BlockDropItemEvent blockDropItemEvent) {
+			Block block = blockDropItemEvent.getBlock();
+			item = new ItemType(block);
+			blockData = block.getBlockData();
+		} else if (event instanceof BlockEvent blockEvent) {
 			Block block = blockEvent.getBlock();
 			item = new ItemType(block);
 			blockData = block.getBlockData();
-		} else if (event instanceof PlayerBucketFillEvent) {
-			PlayerBucketFillEvent playerBucketFillEvent = ((PlayerBucketFillEvent) event);
+		} else if (event instanceof PlayerBucketFillEvent playerBucketFillEvent) {
 			Block block = playerBucketFillEvent.getBlockClicked();
 			item = new ItemType(block);
 			blockData = block.getBlockData();
-		} else if (event instanceof PlayerBucketEmptyEvent) {
-			PlayerBucketEmptyEvent playerBucketEmptyEvent = ((PlayerBucketEmptyEvent) event);
+		} else if (event instanceof PlayerBucketEmptyEvent playerBucketEmptyEvent) {
 			item = new ItemType(playerBucketEmptyEvent.getItemStack());
-		} else if (event instanceof HangingEvent) {
-			final EntityData<?> d = EntityData.fromEntity(((HangingEvent) event).getEntity());
+		} else if (event instanceof HangingEvent hangingEvent) {
+			final EntityData<?> d = EntityData.fromEntity((hangingEvent.getEntity()));
 			return types.check(event, o -> {
 				if (o instanceof ItemType)
 					return Relation.EQUAL.isImpliedBy(DefaultComparators.entityItemComparator.compare(d, ((ItemType) o)));
@@ -144,8 +146,8 @@ else if (o instanceof BlockData && finalBlockData != null)
 	}
 	
 	@Override
-	public String toString(final @Nullable Event e, final boolean debug) {
-		return "break/place/burn/fade/form of " + Classes.toString(types);
+	public String toString(@Nullable Event event, boolean debug) {
+		return "break/place/burn/fade/form/drop of " + Classes.toString(types);
 	}
 	
 }
diff --git a/src/main/java/ch/njol/skript/events/EvtBookEdit.java b/src/main/java/ch/njol/skript/events/EvtBookEdit.java
index afca696b971..17d67baa28e 100644
--- a/src/main/java/ch/njol/skript/events/EvtBookEdit.java
+++ b/src/main/java/ch/njol/skript/events/EvtBookEdit.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.events;
 
 import ch.njol.skript.Skript;
diff --git a/src/main/java/ch/njol/skript/events/EvtBookSign.java b/src/main/java/ch/njol/skript/events/EvtBookSign.java
index 4f29a14d1ba..58c2cd61444 100644
--- a/src/main/java/ch/njol/skript/events/EvtBookSign.java
+++ b/src/main/java/ch/njol/skript/events/EvtBookSign.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.events;
 
 import ch.njol.skript.Skript;
diff --git a/src/main/java/ch/njol/skript/events/EvtClick.java b/src/main/java/ch/njol/skript/events/EvtClick.java
index 5d7e9137bae..2c77fb05add 100644
--- a/src/main/java/ch/njol/skript/events/EvtClick.java
+++ b/src/main/java/ch/njol/skript/events/EvtClick.java
@@ -1,24 +1,16 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.events;
 
+import ch.njol.skript.Skript;
+import ch.njol.skript.aliases.ItemType;
+import ch.njol.skript.bukkitutil.ClickEventTracker;
+import ch.njol.skript.classes.data.DefaultComparators;
+import ch.njol.skript.entity.EntityData;
+import ch.njol.skript.lang.Literal;
+import ch.njol.skript.lang.SkriptEvent;
+import ch.njol.skript.lang.SkriptParser.ParseResult;
+import ch.njol.util.coll.CollectionUtils;
 import org.bukkit.block.Block;
+import org.bukkit.block.data.BlockData;
 import org.bukkit.entity.ArmorStand;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Vehicle;
@@ -34,16 +26,7 @@
 import org.jetbrains.annotations.Nullable;
 import org.skriptlang.skript.lang.comparator.Relation;
 
-import ch.njol.skript.Skript;
-import ch.njol.skript.aliases.ItemType;
-import ch.njol.skript.bukkitutil.ClickEventTracker;
-import ch.njol.skript.classes.data.DefaultComparators;
-import ch.njol.skript.entity.EntityData;
-import ch.njol.skript.lang.Literal;
-import ch.njol.skript.lang.SkriptEvent;
-import ch.njol.skript.lang.SkriptParser.ParseResult;
-import ch.njol.util.Checker;
-import ch.njol.util.coll.CollectionUtils;
+import java.util.function.Predicate;
 
 public class EvtClick extends SkriptEvent {
 
@@ -55,37 +38,37 @@ public class EvtClick extends SkriptEvent {
 	/**
 	 * Tracks PlayerInteractEvents to deduplicate them.
 	 */
-	public static final ClickEventTracker interactTracker = new ClickEventTracker(Skript.getInstance());
+	public final static ClickEventTracker interactTracker = new ClickEventTracker(Skript.getInstance());
 
 	static {
 		Class<? extends PlayerEvent>[] eventTypes = CollectionUtils.array(
 			PlayerInteractEvent.class, PlayerInteractEntityEvent.class, PlayerInteractAtEntityEvent.class
 		);
 		Skript.registerEvent("Click", EvtClick.class, eventTypes,
-				"[(" + RIGHT + ":right|" + LEFT + ":left)(| |-)][mouse(| |-)]click[ing] [on %-entitydata/itemtype%] [(with|using|holding) %-itemtype%]",
-				"[(" + RIGHT + ":right|" + LEFT + ":left)(| |-)][mouse(| |-)]click[ing] (with|using|holding) %itemtype% on %entitydata/itemtype%")
-				.description("Called when a user clicks on a block, an entity or air with or without an item in their hand.",
-						"Please note that rightclick events with an empty hand while not looking at a block are not sent to the server, so there's no way to detect them.",
-						"Also note that a leftclick on an entity is an attack and thus not covered by the 'click' event, but the 'damage' event.")
-				.examples("on click:",
-						"on rightclick holding a fishing rod:",
-						"on leftclick on a stone or obsidian:",
-						"on rightclick on a creeper:",
-						"on click with a sword:")
-				.since("1.0");
+				"[(" + RIGHT + ":right|" + LEFT + ":left)(| |-)][mouse(| |-)]click[ing] [on %-entitydata/itemtype/blockdata%] [(with|using|holding) %-itemtype%]",
+				"[(" + RIGHT + ":right|" + LEFT + ":left)(| |-)][mouse(| |-)]click[ing] (with|using|holding) %itemtype% on %entitydata/itemtype/blockdata%")
+			.description("Called when a user clicks on a block, an entity or air with or without an item in their hand.",
+				"Please note that rightclick events with an empty hand while not looking at a block are not sent to the server, so there's no way to detect them.",
+				"Also note that a leftclick on an entity is an attack and thus not covered by the 'click' event, but the 'damage' event.")
+			.examples("on click:",
+				"on rightclick holding a fishing rod:",
+				"on leftclick on a stone or obsidian:",
+				"on rightclick on a creeper:",
+				"on click with a sword:",
+				"on click on chest[facing=north]:",
+				"on click on campfire[lit=true]:")
+			.since("1.0, 2.10 (blockdata)");
 	}
 
 	/**
 	 * Only trigger when one of these is interacted with.
 	 */
-	@Nullable
-	private Literal<?> type;
+	private @Nullable Literal<?> type;
 
 	/**
-	 * Only trigger when then item player clicks with is one of these.
+	 * Only trigger when the item that the player clicks with is one of these.
 	 */
-	@Nullable
-	private Literal<ItemType> tools;
+	private @Nullable Literal<ItemType> tools;
 
 	/**
 	 * Click types to trigger.
@@ -97,22 +80,22 @@ public class EvtClick extends SkriptEvent {
 	public boolean init(Literal<?>[] args, int matchedPattern, ParseResult parseResult) {
 		click = parseResult.mark == 0 ? ANY : parseResult.mark;
 		type = args[matchedPattern];
-		if (type != null && !ItemType.class.isAssignableFrom(type.getReturnType())) {
+		if (type != null && !ItemType.class.isAssignableFrom(type.getReturnType()) && !BlockData.class.isAssignableFrom(type.getReturnType())) {
 			Literal<EntityData<?>> entitydata = (Literal<EntityData<?>>) type;
 			if (click == LEFT) {
 				if (Vehicle.class.isAssignableFrom(entitydata.getSingle().getType())) {
-					Skript.error("A leftclick on an entity is an attack and thus not covered by the 'click' event, but the 'vehicle damage' event.");
+					Skript.error("A leftclick on a vehicle entity is an attack and thus not covered by the 'click' event, but the 'vehicle damage' event.");
 				} else {
 					Skript.error("A leftclick on an entity is an attack and thus not covered by the 'click' event, but the 'damage' event.");
 				}
 				return false;
 			} else if (click == ANY) {
 				if (Vehicle.class.isAssignableFrom(entitydata.getSingle().getType())) {
-					Skript.error("A leftclick on an entity is an attack and thus not covered by the 'click' event, but the 'vehicle damage' event. " +
-							"Change this event to a rightclick to fix this warning message.");
+					Skript.error("A leftclick on a vehicle entity is an attack and thus not covered by the 'click' event, but the 'vehicle damage' event. " +
+						"Change this event to a rightclick to fix this warning message.");
 				} else {
 					Skript.error("A leftclick on an entity is an attack and thus not covered by the 'click' event, but the 'damage' event. " +
-							"Change this event to a rightclick to fix this warning message.");
+						"Change this event to a rightclick to fix this warning message.");
 				}
 			}
 		}
@@ -124,100 +107,100 @@ public boolean init(Literal<?>[] args, int matchedPattern, ParseResult parseResu
 	public boolean check(Event event) {
 		Block block;
 		Entity entity;
-		
-		if (event instanceof PlayerInteractEntityEvent) {
-			PlayerInteractEntityEvent clickEvent = ((PlayerInteractEntityEvent) event);
-			Entity clicked = clickEvent.getRightClicked();
-			
+
+		if (event instanceof PlayerInteractEntityEvent interactEntityEvent) {
+			Entity clicked = interactEntityEvent.getRightClicked();
+
 			// Usually, don't handle these events
-			if (clickEvent instanceof PlayerInteractAtEntityEvent) {
+			if (interactEntityEvent instanceof PlayerInteractAtEntityEvent) {
 				// But armor stands are an exception
 				// Later, there may be more exceptions...
 				if (!(clicked instanceof ArmorStand))
 					return false;
 			}
-			
+
 			if (click == LEFT) // Lefts clicks on entities don't work
 				return false;
-			
+
 			// PlayerInteractAtEntityEvent called only once for armor stands
 			if (!(event instanceof PlayerInteractAtEntityEvent)) {
-				if (!interactTracker.checkEvent(clickEvent.getPlayer(), clickEvent, clickEvent.getHand())) {
+				if (!interactTracker.checkEvent(interactEntityEvent.getPlayer(), interactEntityEvent, interactEntityEvent.getHand())) {
 					return false; // Not first event this tick
 				}
 			}
-			
+
 			entity = clicked;
 			block = null;
-		} else if (event instanceof PlayerInteractEvent) {
-			PlayerInteractEvent clickEvent = ((PlayerInteractEvent) event);
-			
+		} else if (event instanceof PlayerInteractEvent interactEvent) {
 			// Figure out click type, filter non-click events
-			Action a = clickEvent.getAction();
+			Action action = interactEvent.getAction();
 			int click;
-			switch (a) {
-				case LEFT_CLICK_AIR:
-				case LEFT_CLICK_BLOCK:
-					click = LEFT;
-					break;
-				case RIGHT_CLICK_AIR:
-				case RIGHT_CLICK_BLOCK:
-					click = RIGHT;
-					break;
-				case PHYSICAL: // Not a click event
-				default:
+			switch (action)  {
+				case LEFT_CLICK_AIR, LEFT_CLICK_BLOCK -> click = LEFT;
+				case RIGHT_CLICK_AIR, RIGHT_CLICK_BLOCK -> click = RIGHT;
+				default -> {
 					return false;
+				}
 			}
 			if ((this.click & click) == 0)
 				return false; // We don't want to handle this kind of events
-			
-			EquipmentSlot hand = clickEvent.getHand();
+
+			EquipmentSlot hand = interactEvent.getHand();
 			assert hand != null; // Not PHYSICAL interaction
-			if (!interactTracker.checkEvent(clickEvent.getPlayer(), clickEvent, hand)) {
+			if (!interactTracker.checkEvent(interactEvent.getPlayer(), interactEvent, hand)) {
 				return false; // Not first event this tick
 			}
-			
-			block = clickEvent.getClickedBlock();
+
+			block = interactEvent.getClickedBlock();
 			entity = null;
 		} else {
 			assert false;
 			return false;
 		}
-		
-		if (tools != null && !tools.check(event, new Checker<ItemType>() {
-			@Override
-			public boolean check(final ItemType t) {
-				if (event instanceof PlayerInteractEvent) {
-					return t.isOfType(((PlayerInteractEvent) event).getItem());
-				} else { // PlayerInteractEntityEvent doesn't have item associated with it
-					PlayerInventory invi = ((PlayerInteractEntityEvent) event).getPlayer().getInventory();
-					ItemStack item = ((PlayerInteractEntityEvent) event).getHand() == EquipmentSlot.HAND
-							? invi.getItemInMainHand() : invi.getItemInOffHand();
-					return t.isOfType(item);
-				}
+
+		Predicate<ItemType> checker = itemType -> {
+			if (event instanceof PlayerInteractEvent interactEvent) {
+				return itemType.isOfType(interactEvent.getItem());
+			} else {
+				PlayerInventory invi = ((PlayerInteractEntityEvent) event).getPlayer().getInventory();
+				ItemStack item = ((PlayerInteractEntityEvent) event).getHand() == EquipmentSlot.HAND
+					? invi.getItemInMainHand() : invi.getItemInOffHand();
+				return itemType.isOfType(item);
 			}
-		})) {
+		};
+
+		if (tools != null && !tools.check(event, checker))
 			return false;
-		}
-		
+
 		if (type != null) {
-			return type.check(event, new Checker<Object>() {
-				@Override
-				public boolean check(final Object o) {
-					if (entity != null) {
-						return o instanceof EntityData ? ((EntityData<?>) o).isInstance(entity) : Relation.EQUAL.isImpliedBy(DefaultComparators.entityItemComparator.compare(EntityData.fromEntity(entity), (ItemType) o));
+			BlockData blockDataCheck = block != null ? block.getBlockData() : null;
+			return type.check(event, (Predicate<Object>) object -> {
+				if (entity != null) {
+					if (object instanceof EntityData<?> entityData) {
+						return entityData.isInstance(entity);
 					} else {
-						return o instanceof EntityData ? false : ((ItemType) o).isOfType(block);
+						Relation compare = DefaultComparators.entityItemComparator.compare(EntityData.fromEntity(entity), (ItemType) object);
+						return Relation.EQUAL.isImpliedBy(compare);
 					}
+				} else if (object instanceof ItemType itemType) {
+					return itemType.isOfType(block);
+				} else if (blockDataCheck != null && object instanceof BlockData blockData)  {
+					return blockDataCheck.matches(blockData);
 				}
+				return false;
 			});
 		}
 		return true;
 	}
 
 	@Override
-	public String toString(@Nullable Event e, boolean debug) {
-		return (click == LEFT ? "left" : click == RIGHT ? "right" : "") + "click" + (type != null ? " on " + type.toString(e, debug) : "") + (tools != null ? " holding " + tools.toString(e, debug) : "");
+	public String toString(@Nullable Event event, boolean debug) {
+		return switch (click) {
+			case LEFT -> "left";
+			case RIGHT -> "right";
+			default -> "";
+		} + "click" + (type != null ? " on " + type.toString(event, debug) : "") +
+			(tools != null ? " holding " + tools.toString(event, debug) : "");
 	}
 
 }
diff --git a/src/main/java/ch/njol/skript/events/EvtCommand.java b/src/main/java/ch/njol/skript/events/EvtCommand.java
index 5a62df6d0d6..d5425403e6b 100644
--- a/src/main/java/ch/njol/skript/events/EvtCommand.java
+++ b/src/main/java/ch/njol/skript/events/EvtCommand.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.events;
 
 import org.bukkit.event.Event;
@@ -30,54 +12,63 @@
 import ch.njol.util.StringUtils;
 import ch.njol.util.coll.CollectionUtils;
 
-/**
- * @author Peter Güttinger
- */
-@SuppressWarnings("unchecked")
+import java.util.Arrays;
+
 public class EvtCommand extends SkriptEvent { // TODO condition to check whether a given command exists, & a conditon to check whether it's a custom skript command
 	static {
-		Skript.registerEvent("Command", EvtCommand.class, CollectionUtils.array(PlayerCommandPreprocessEvent.class, ServerCommandEvent.class), "command [%-string%]")
+		Skript.registerEvent("Command", EvtCommand.class, CollectionUtils.array(PlayerCommandPreprocessEvent.class, ServerCommandEvent.class), "command [%-strings%]")
 				.description("Called when a player enters a command (not necessarily a Skript command) but you can check if command is a skript command, see <a href='conditions.html#CondIsSkriptCommand'>Is a Skript command condition</a>.")
 				.examples("on command:", "on command \"/stop\":", "on command \"pm Njol \":")
 				.since("2.0");
 	}
 	
-	@Nullable
-	private String command = null;
+	private String @Nullable [] commands = null;
+	private Literal<String> commandsLit;
 
 	@Override
 	@SuppressWarnings("null")
 	public boolean init(final Literal<?>[] args, final int matchedPattern, final ParseResult parser) {
 		if (args[0] != null) {
-			command = ((Literal<String>) args[0]).getSingle();
-			if (command.startsWith("/"))
-				command = command.substring(1);
+			//noinspection unchecked
+			commandsLit = ((Literal<String>) args[0]);
+			commands = commandsLit.getAll();
+			for (int i = 0; i < commands.length; i++) {
+				if (commands[i].startsWith("/"))
+					commands[i] = commands[i].substring(1);
+			}
 		}
 		return true;
 	}
 
 	@Override
 	@SuppressWarnings("null")
-	public boolean check(final Event e) {
-		if (e instanceof ServerCommandEvent && ((ServerCommandEvent) e).getCommand().isEmpty())
+	public boolean check(Event event) {
+		if (event instanceof ServerCommandEvent serverCommandEvent && serverCommandEvent.getCommand().isEmpty())
 			return false;
 
-		if (command == null)
+		if (commands == null)
 			return true;
-		final String message;
-		if (e instanceof PlayerCommandPreprocessEvent) {
-			assert ((PlayerCommandPreprocessEvent) e).getMessage().startsWith("/");
-			message = ((PlayerCommandPreprocessEvent) e).getMessage().substring(1);
+
+		String message;
+		if (event instanceof PlayerCommandPreprocessEvent playerCommandPreprocessEvent) {
+			assert playerCommandPreprocessEvent.getMessage().startsWith("/");
+			message = playerCommandPreprocessEvent.getMessage().substring(1);
 		} else {
-			message = ((ServerCommandEvent) e).getCommand();
+			assert event instanceof ServerCommandEvent;
+			message = ((ServerCommandEvent) event).getCommand();
 		}
-		return StringUtils.startsWithIgnoreCase(message, command)
-				&& (command.contains(" ") || message.length() == command.length() || Character.isWhitespace(message.charAt(command.length()))); // if only the command is given, match that command only
+
+		return Arrays.stream(commands).anyMatch(candidateCommand ->
+				StringUtils.startsWithIgnoreCase(message, candidateCommand) // matches the command label
+				&& (candidateCommand.contains(" ") // if candidate contains arguments, then any command that starts with the candidate is a match
+					|| message.length() == candidateCommand.length() // exact match
+					|| Character.isWhitespace(message.charAt(candidateCommand.length()) // matches label with space after
+				)));
 	}
 	
 	@Override
-	public String toString(final @Nullable Event e, final boolean debug) {
-		return "command" + (command != null ? " /" + command : "");
+	public String toString(@Nullable Event event, boolean debug) {
+		return "command" + (commandsLit != null ? " " + commandsLit.toString(event, debug) : "");
 	}
 	
 }
diff --git a/src/main/java/ch/njol/skript/events/EvtDamage.java b/src/main/java/ch/njol/skript/events/EvtDamage.java
index ef849c5478c..60fafa120fb 100644
--- a/src/main/java/ch/njol/skript/events/EvtDamage.java
+++ b/src/main/java/ch/njol/skript/events/EvtDamage.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.events;
 
 import org.bukkit.entity.EnderDragon;
diff --git a/src/main/java/ch/njol/skript/events/EvtEntity.java b/src/main/java/ch/njol/skript/events/EvtEntity.java
index fc8110b7a23..bfbef66a66c 100644
--- a/src/main/java/ch/njol/skript/events/EvtEntity.java
+++ b/src/main/java/ch/njol/skript/events/EvtEntity.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.events;
 
 import org.bukkit.entity.Entity;
diff --git a/src/main/java/ch/njol/skript/events/EvtEntityBlockChange.java b/src/main/java/ch/njol/skript/events/EvtEntityBlockChange.java
index 9854057db03..42253f5ab53 100644
--- a/src/main/java/ch/njol/skript/events/EvtEntityBlockChange.java
+++ b/src/main/java/ch/njol/skript/events/EvtEntityBlockChange.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.events;
 
 import ch.njol.skript.Skript;
@@ -24,7 +6,6 @@
 import ch.njol.skript.lang.Literal;
 import ch.njol.skript.lang.SkriptEvent;
 import ch.njol.skript.lang.SkriptParser.ParseResult;
-import ch.njol.util.Checker;
 
 import org.bukkit.entity.Enderman;
 import org.bukkit.entity.FallingBlock;
@@ -35,6 +16,7 @@
 import org.jetbrains.annotations.Nullable;
 
 import java.util.Locale;
+import java.util.function.Predicate;
 
 public class EvtEntityBlockChange extends SkriptEvent {
 
@@ -74,14 +56,14 @@ private enum ChangeEvent {
 		GENERIC("(entity|%*-entitydatas%) chang(e|ing) block[s]");
 
 		@Nullable
-		private final Checker<EntityChangeBlockEvent> checker;
+		private final Predicate<EntityChangeBlockEvent> checker;
 		private final String pattern;
 
 		ChangeEvent(String pattern) {
 			this(pattern, null);
 		}
 
-		ChangeEvent(String pattern, @Nullable Checker<EntityChangeBlockEvent> checker) {
+		ChangeEvent(String pattern, @Nullable Predicate<EntityChangeBlockEvent> checker) {
 			this.pattern = pattern;
 			this.checker = checker;
 		}
@@ -116,7 +98,7 @@ public boolean check(Event event) {
 			return false;
 		if (this.event.checker == null)
 			return true;
-		return this.event.checker.check((EntityChangeBlockEvent) event);
+		return this.event.checker.test((EntityChangeBlockEvent) event);
 	}
 
 	@Override
diff --git a/src/main/java/ch/njol/skript/events/EvtEntityPotion.java b/src/main/java/ch/njol/skript/events/EvtEntityPotion.java
new file mode 100644
index 00000000000..c2c8800bf52
--- /dev/null
+++ b/src/main/java/ch/njol/skript/events/EvtEntityPotion.java
@@ -0,0 +1,56 @@
+package ch.njol.skript.events;
+
+import ch.njol.skript.Skript;
+import ch.njol.skript.lang.Expression;
+import ch.njol.skript.lang.Literal;
+import ch.njol.skript.lang.SkriptEvent;
+import ch.njol.skript.lang.SkriptParser.ParseResult;
+import org.bukkit.event.Event;
+import org.bukkit.event.entity.EntityPotionEffectEvent;
+import org.bukkit.potion.PotionEffectType;
+
+import javax.annotation.Nullable;
+
+public class EvtEntityPotion extends SkriptEvent {
+
+	static {
+		Skript.registerEvent("Entity Potion Effect", EvtEntityPotion.class, EntityPotionEffectEvent.class,
+				"entity potion effect [modif[y|ication]] [[of] %-potioneffecttypes%] [due to %-entitypotioncause%]")
+			.description("Called when an entity's potion effect is modified.", "This modification can include adding, removing or changing their potion effect.")
+			.examples(
+				"on entity potion effect modification:",
+					"\t\tbroadcast \"A potion effect was added to %event-entity%!\" ",
+				"",
+				"on entity potion effect modification of night vision:")
+			.since("2.10");
+	}
+
+	@SuppressWarnings("unchecked")
+	private Expression<PotionEffectType> potionEffects;
+	private Expression<EntityPotionEffectEvent.Cause> cause;
+
+	@Override
+	public boolean init(Literal<?>[] args, int matchedPattern, ParseResult parseResult) {
+		potionEffects = (Expression<PotionEffectType>) args[0];
+		cause = (Expression<EntityPotionEffectEvent.Cause>) args[1];
+		return true;
+	}
+
+	@Override
+	public boolean check(Event event) {
+		EntityPotionEffectEvent potionEvent = (EntityPotionEffectEvent) event;
+		boolean effectMatches = potionEffects == null ||
+			(potionEvent.getOldEffect() != null && potionEffects.check(event, effectType -> effectType.equals(potionEvent.getOldEffect().getType()))) ||
+			(potionEvent.getNewEffect() != null && potionEffects.check(event, effectType -> effectType.equals(potionEvent.getNewEffect().getType())));
+
+		boolean causeMatches = cause == null || cause.check(event, cause -> cause.equals(potionEvent.getCause()));
+
+		return effectMatches && causeMatches;
+	}
+
+
+	@Override
+	public String toString(@Nullable Event event, boolean debug) {
+		return "on entity potion effect modification";
+	}
+}
diff --git a/src/main/java/ch/njol/skript/events/EvtEntityTarget.java b/src/main/java/ch/njol/skript/events/EvtEntityTarget.java
index b1b5ec31598..10fb2ddfdba 100644
--- a/src/main/java/ch/njol/skript/events/EvtEntityTarget.java
+++ b/src/main/java/ch/njol/skript/events/EvtEntityTarget.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.events;
 
 import org.bukkit.event.Event;
diff --git a/src/main/java/ch/njol/skript/events/EvtEntityTransform.java b/src/main/java/ch/njol/skript/events/EvtEntityTransform.java
index 4cd709e89a2..18a8b137eba 100644
--- a/src/main/java/ch/njol/skript/events/EvtEntityTransform.java
+++ b/src/main/java/ch/njol/skript/events/EvtEntityTransform.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.events;
 
 import org.bukkit.event.Event;
diff --git a/src/main/java/ch/njol/skript/events/EvtExperienceChange.java b/src/main/java/ch/njol/skript/events/EvtExperienceChange.java
index ed48015101f..3d1f3047819 100644
--- a/src/main/java/ch/njol/skript/events/EvtExperienceChange.java
+++ b/src/main/java/ch/njol/skript/events/EvtExperienceChange.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.events;
 
 import ch.njol.skript.Skript;
@@ -24,10 +6,10 @@
 import ch.njol.skript.lang.SkriptParser.ParseResult;
 import ch.njol.skript.registrations.EventValues;
 import ch.njol.skript.util.Experience;
-import ch.njol.skript.util.Getter;
 import org.bukkit.event.Event;
 import org.bukkit.event.player.PlayerExpChangeEvent;
 import org.jetbrains.annotations.Nullable;
+import org.skriptlang.skript.lang.converter.Converter;
 
 public class EvtExperienceChange extends SkriptEvent {
 
@@ -40,13 +22,7 @@ public class EvtExperienceChange extends SkriptEvent {
 						"\tbroadcast \"%{_xp}%\""
 				)
 				.since("2.7");
-		EventValues.registerEventValue(PlayerExpChangeEvent.class, Experience.class, new Getter<Experience, PlayerExpChangeEvent>() {
-			@Override
-			@Nullable
-			public Experience get(PlayerExpChangeEvent event) {
-				return new Experience(event.getAmount());
-			}
-		}, EventValues.TIME_NOW);
+		EventValues.registerEventValue(PlayerExpChangeEvent.class, Experience.class, event -> new Experience(event.getAmount()));
 	}
 
 	private static final int ANY = 0, UP = 1, DOWN = 2;
diff --git a/src/main/java/ch/njol/skript/events/EvtExperienceSpawn.java b/src/main/java/ch/njol/skript/events/EvtExperienceSpawn.java
index a40b10fcec3..4aad0cfeab6 100644
--- a/src/main/java/ch/njol/skript/events/EvtExperienceSpawn.java
+++ b/src/main/java/ch/njol/skript/events/EvtExperienceSpawn.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.events;
 
 import ch.njol.skript.Skript;
@@ -28,7 +10,6 @@
 import ch.njol.skript.lang.Trigger;
 import ch.njol.skript.registrations.EventValues;
 import ch.njol.skript.util.Experience;
-import ch.njol.skript.util.Getter;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.event.Event;
@@ -60,18 +41,8 @@ public class EvtExperienceSpawn extends SkriptEvent {
 				"\tworld is \"minigame_world\"",
 				"\tcancel event"
 			).since("2.0");
-		EventValues.registerEventValue(ExperienceSpawnEvent.class, Location.class, new Getter<Location, ExperienceSpawnEvent>() {
-			@Override
-			public Location get(ExperienceSpawnEvent event) {
-				return event.getLocation();
-			}
-		}, EventValues.TIME_NOW);
-		EventValues.registerEventValue(ExperienceSpawnEvent.class, Experience.class, new Getter<Experience, ExperienceSpawnEvent>() {
-			@Override
-			public Experience get(ExperienceSpawnEvent event) {
-				return new Experience(event.getSpawnedXP());
-			}
-		}, EventValues.TIME_NOW);
+		EventValues.registerEventValue(ExperienceSpawnEvent.class, Location.class, ExperienceSpawnEvent::getLocation);
+		EventValues.registerEventValue(ExperienceSpawnEvent.class, Experience.class, event -> new Experience(event.getSpawnedXP()));
 	}
 
 	private static final List<Trigger> TRIGGERS = Collections.synchronizedList(new ArrayList<>());
diff --git a/src/main/java/ch/njol/skript/events/EvtFirework.java b/src/main/java/ch/njol/skript/events/EvtFirework.java
index e3f18a31527..412f2b246e2 100644
--- a/src/main/java/ch/njol/skript/events/EvtFirework.java
+++ b/src/main/java/ch/njol/skript/events/EvtFirework.java
@@ -1,73 +1,66 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.events;
 
 import ch.njol.skript.Skript;
 import ch.njol.skript.lang.Literal;
 import ch.njol.skript.lang.SkriptEvent;
 import ch.njol.skript.lang.SkriptParser.ParseResult;
+import ch.njol.skript.lang.SyntaxStringBuilder;
 import ch.njol.skript.util.Color;
-import java.util.Arrays;
-import java.util.List;
-import java.util.stream.Collectors;
-
+import ch.njol.skript.util.ColorRGB;
 import org.bukkit.FireworkEffect;
 import org.bukkit.event.Event;
 import org.bukkit.event.entity.FireworkExplodeEvent;
 import org.bukkit.inventory.meta.FireworkMeta;
 import org.jetbrains.annotations.Nullable;
 
+import java.util.Set;
+import java.util.stream.Collectors;
 
 public class EvtFirework extends SkriptEvent {
 	
 	static {
 		if (Skript.classExists("org.bukkit.event.entity.FireworkExplodeEvent"))
 			//Making the event argument type fireworkeffects, led to Skript having troubles parsing for some reason.
-			Skript.registerEvent("Firework Explode", EvtFirework.class, FireworkExplodeEvent.class, "[a] firework explo(d(e|ing)|sion) [colo[u]red %-colors%]")
+			Skript.registerEvent("Firework Explode", EvtFirework.class, FireworkExplodeEvent.class,
+					"[a] firework explo(d(e|ing)|sion) [colo[u]red %-colors%]")
 					.description("Called when a firework explodes.")
-					.examples("on firework explode",
-							"on firework exploding colored red, light green and black",
-							"on firework explosion colored light green:",
-							"	broadcast \"A firework colored %colors% was exploded at %location%!\"")//TODO fix 
+					.examples(
+						"on firework explode:",
+							"\tif event-colors contains red:",
+						"on firework exploding colored red, light green and black:",
+						"on firework explosion colored rgb 0, 255, 0:",
+							"\tbroadcast \"A firework colored %colors% was exploded at %location%!\""
+					)
 					.since("2.4");
 	}
-	
-	@Nullable
-	private Literal<Color> colors;
-	
-	@SuppressWarnings("unchecked")
+
+	private @Nullable Literal<Color> colors;
+
 	@Override
 	public boolean init(Literal<?>[] args, int matchedPattern, ParseResult parseResult) {
 		if (args[0] != null)
+			//noinspection unchecked
 			colors = (Literal<Color>) args[0];
 		return true;
 	}
-	
-	@SuppressWarnings("null")
+
 	@Override
-	public boolean check(Event e) {
+	public boolean check(Event event) {
+		if (!(event instanceof FireworkExplodeEvent fireworkExplodeEvent))
+			return false;
+
 		if (colors == null)
 			return true;
-		List<org.bukkit.Color> colours = Arrays.stream(colors.getArray(e))
-				.map(color -> color.asBukkitColor())
-				.collect(Collectors.toList());
-		FireworkMeta meta = ((FireworkExplodeEvent)e).getEntity().getFireworkMeta();
+
+		Set<org.bukkit.Color> colours = colors.stream(event)
+			.map(color -> {
+				if (color instanceof ColorRGB)
+					return color.asBukkitColor();
+				return color.asDyeColor().getFireworkColor();
+			})
+			.collect(Collectors.toSet());
+
+		FireworkMeta meta = fireworkExplodeEvent.getEntity().getFireworkMeta();
 		for (FireworkEffect effect : meta.getEffects()) {
 			if (colours.containsAll(effect.getColors()))
 				return true;
@@ -76,8 +69,14 @@ public boolean check(Event e) {
 	}
 	
 	@Override
-	public String toString(@Nullable Event e, boolean debug) {
-		return "Firework explode " + (colors != null ? " with colors " + colors.toString(e, debug) : "");
+	public String toString(@Nullable Event event, boolean debug) {
+		SyntaxStringBuilder builder = new SyntaxStringBuilder(event, debug);
+
+		builder.append("firework explode");
+		if (colors != null)
+			builder.append("with colors").append(colors);
+
+		return builder.toString();
 	}
 
 }
diff --git a/src/main/java/ch/njol/skript/events/EvtFirstJoin.java b/src/main/java/ch/njol/skript/events/EvtFirstJoin.java
index 2fd7a2cfea1..ef5e6e68c15 100644
--- a/src/main/java/ch/njol/skript/events/EvtFirstJoin.java
+++ b/src/main/java/ch/njol/skript/events/EvtFirstJoin.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.events;
 
 import org.bukkit.event.Event;
diff --git a/src/main/java/ch/njol/skript/events/EvtGameMode.java b/src/main/java/ch/njol/skript/events/EvtGameMode.java
index 2437384198b..d776fa0be79 100644
--- a/src/main/java/ch/njol/skript/events/EvtGameMode.java
+++ b/src/main/java/ch/njol/skript/events/EvtGameMode.java
@@ -1,24 +1,7 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.events;
 
 import java.util.Locale;
+import java.util.function.Predicate;
 
 import org.bukkit.GameMode;
 import org.bukkit.event.Event;
@@ -29,7 +12,6 @@
 import ch.njol.skript.lang.Literal;
 import ch.njol.skript.lang.SkriptEvent;
 import ch.njol.skript.lang.SkriptParser.ParseResult;
-import ch.njol.util.Checker;
 
 /**
  * @author Peter Güttinger
@@ -41,33 +23,28 @@ public final class EvtGameMode extends SkriptEvent {
 				.examples("on gamemode change:", "on gamemode change to adventure:")
 				.since("1.0");
 	}
-	
+
 	@Nullable
 	private Literal<GameMode> mode;
-	
+
 	@SuppressWarnings("unchecked")
 	@Override
 	public boolean init(final Literal<?>[] args, final int matchedPattern, final ParseResult parser) {
 		mode = (Literal<GameMode>) args[0];
 		return true;
 	}
-	
+
 	@Override
 	public boolean check(final Event e) {
 		if (mode != null) {
-			return mode.check(e, new Checker<GameMode>() {
-				@Override
-				public boolean check(final GameMode m) {
-					return ((PlayerGameModeChangeEvent) e).getNewGameMode().equals(m);
-				}
-			});
+			return mode.check(e, m -> ((PlayerGameModeChangeEvent) e).getNewGameMode().equals(m));
 		}
 		return true;
 	}
-	
+
 	@Override
 	public String toString(final @Nullable Event e, final boolean debug) {
 		return "gamemode change" + (mode != null ? " to " + mode.toString().toLowerCase(Locale.ENGLISH) : "");
 	}
-	
+
 }
diff --git a/src/main/java/ch/njol/skript/events/EvtGrow.java b/src/main/java/ch/njol/skript/events/EvtGrow.java
index d022e020b61..f5bdc5a6629 100644
--- a/src/main/java/ch/njol/skript/events/EvtGrow.java
+++ b/src/main/java/ch/njol/skript/events/EvtGrow.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.events;
 
 import ch.njol.skript.Skript;
diff --git a/src/main/java/ch/njol/skript/events/EvtHealing.java b/src/main/java/ch/njol/skript/events/EvtHealing.java
index c40f4d31b37..95c530adaaf 100644
--- a/src/main/java/ch/njol/skript/events/EvtHealing.java
+++ b/src/main/java/ch/njol/skript/events/EvtHealing.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.events;
 
 import org.bukkit.entity.Entity;
diff --git a/src/main/java/ch/njol/skript/events/EvtItem.java b/src/main/java/ch/njol/skript/events/EvtItem.java
index 5dd9b8014ae..c648674173b 100644
--- a/src/main/java/ch/njol/skript/events/EvtItem.java
+++ b/src/main/java/ch/njol/skript/events/EvtItem.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.events;
 
 import io.papermc.paper.event.player.PlayerStonecutterRecipeSelectEvent;
diff --git a/src/main/java/ch/njol/skript/events/EvtLeash.java b/src/main/java/ch/njol/skript/events/EvtLeash.java
new file mode 100644
index 00000000000..ddce3535e08
--- /dev/null
+++ b/src/main/java/ch/njol/skript/events/EvtLeash.java
@@ -0,0 +1,126 @@
+package ch.njol.skript.events;
+
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.Player;
+import org.bukkit.event.Event;
+import org.bukkit.event.entity.EntityUnleashEvent;
+import org.bukkit.event.entity.PlayerLeashEntityEvent;
+import org.bukkit.event.player.PlayerUnleashEntityEvent;
+import org.jetbrains.annotations.Nullable;
+
+import ch.njol.skript.Skript;
+import ch.njol.skript.entity.EntityData;
+import ch.njol.skript.lang.Literal;
+import ch.njol.skript.lang.SkriptEvent;
+import ch.njol.skript.lang.SkriptParser.ParseResult;
+import ch.njol.skript.registrations.Classes;
+import ch.njol.skript.registrations.EventValues;
+import ch.njol.util.coll.CollectionUtils;
+
+public class EvtLeash extends SkriptEvent {
+
+	static {
+		Skript.registerEvent("Leash / Unleash", EvtLeash.class, CollectionUtils.array(PlayerLeashEntityEvent.class, EntityUnleashEvent.class), "[:player] [:un]leash[ing] [of %-entitydatas%]")
+			.description("Called when an entity is leashed or unleashed. Cancelling these events will prevent the leashing or unleashing from occurring.")
+			.examples(
+					"on player leash of a sheep:",
+						"\tsend \"Baaaaa--\" to player",
+					"",
+					"on player leash:",
+						"\tsend \"<%event-entity%> Let me go!\" to player",
+					"",
+					"on unleash:",
+						"\tbroadcast \"<%event-entity%> I'm free\"",
+					"",
+					"on player unleash:",
+						"\tsend \"<%event-entity%> Thanks for freeing me!\" to player"
+			)
+			.since("2.10");
+
+		// PlayerLeashEntityEvent
+		// event-player is explicitly registered due to event does not extend PlayerEvent
+		EventValues.registerEventValue(PlayerLeashEntityEvent.class, Player.class, PlayerLeashEntityEvent::getPlayer);
+		EventValues.registerEventValue(PlayerLeashEntityEvent.class, Entity.class, PlayerLeashEntityEvent::getEntity);
+
+		// EntityUnleashEvent
+		EventValues.registerEventValue(EntityUnleashEvent.class, EntityUnleashEvent.UnleashReason.class, EntityUnleashEvent::getReason);
+
+		// PlayerUnleashEntityEvent
+		EventValues.registerEventValue(PlayerUnleashEntityEvent.class, Player.class, PlayerUnleashEntityEvent::getPlayer);
+	}
+
+	private enum EventType {
+
+		LEASH("leash"),
+		UNLEASH("unleash"),
+		UNLEASH_BY_PLAYER("player unleash");
+
+		private final String name;
+
+		EventType(String name) {
+			this.name = name;
+		}
+
+
+		@Override
+		public String toString() {
+			return name;
+		}
+
+	}
+
+	private @Nullable EntityData<?>[] types;
+	private EventType eventType;
+
+	@Override
+	public boolean init(Literal<?>[] args, int matchedPattern, ParseResult parseResult) {
+		//noinspection unchecked
+		types = args[0] == null ? null : ((Literal<EntityData<?>>) args[0]).getAll();
+		eventType = EventType.LEASH;
+		if (parseResult.hasTag("un")) {
+			eventType = EventType.UNLEASH;
+			if (parseResult.hasTag("player")) {
+				eventType = EventType.UNLEASH_BY_PLAYER;
+			}
+		}
+		return true;
+	}
+
+	@Override
+	public boolean check(Event event) {
+		Entity leashedEntity;
+		switch (eventType) {
+            case LEASH -> {
+				if (!(event instanceof PlayerLeashEntityEvent playerLeash))
+					return false;
+				leashedEntity = playerLeash.getEntity();
+			}
+            case UNLEASH -> {
+				if (!(event instanceof EntityUnleashEvent entityUnleash))
+					return false;
+				leashedEntity = entityUnleash.getEntity();
+			}
+            case UNLEASH_BY_PLAYER -> {
+				if (!(event instanceof PlayerUnleashEntityEvent playerUnleash))
+					return false;
+				leashedEntity = playerUnleash.getEntity();
+			}
+            default -> {
+                return false;
+            }
+        }
+		if (types == null)
+			return true;
+		for (EntityData<?> entityData : types) {
+			if (entityData.isInstance(leashedEntity))
+				return true;
+		}
+		return false;
+	}
+
+	@Override
+	public String toString(@Nullable Event event, boolean debug) {
+		return eventType + (types != null ? " of " + Classes.toString(types, false) : "");
+	}
+
+}
diff --git a/src/main/java/ch/njol/skript/events/EvtLevel.java b/src/main/java/ch/njol/skript/events/EvtLevel.java
index cbfbd42014f..3a4ac483f70 100644
--- a/src/main/java/ch/njol/skript/events/EvtLevel.java
+++ b/src/main/java/ch/njol/skript/events/EvtLevel.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.events;
 
 import org.bukkit.event.Event;
diff --git a/src/main/java/ch/njol/skript/events/EvtMove.java b/src/main/java/ch/njol/skript/events/EvtMove.java
index 0eec1d9aa1c..9c832abe183 100644
--- a/src/main/java/ch/njol/skript/events/EvtMove.java
+++ b/src/main/java/ch/njol/skript/events/EvtMove.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.events;
 
 import ch.njol.skript.Skript;
diff --git a/src/main/java/ch/njol/skript/events/EvtMoveOn.java b/src/main/java/ch/njol/skript/events/EvtMoveOn.java
index efa84ad3db6..49304a4da0b 100644
--- a/src/main/java/ch/njol/skript/events/EvtMoveOn.java
+++ b/src/main/java/ch/njol/skript/events/EvtMoveOn.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.events;
 
 import ch.njol.skript.Skript;
diff --git a/src/main/java/ch/njol/skript/events/EvtPeriodical.java b/src/main/java/ch/njol/skript/events/EvtPeriodical.java
index b5ff9f2c60d..82dc65756da 100644
--- a/src/main/java/ch/njol/skript/events/EvtPeriodical.java
+++ b/src/main/java/ch/njol/skript/events/EvtPeriodical.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.events;
 
 import ch.njol.skript.Skript;
@@ -72,7 +54,7 @@ public boolean init(Literal<?>[] args, int matchedPattern, ParseResult parseResu
 
 	@Override
 	public boolean postLoad() {
-		long ticks = period.getTicks();
+		long ticks = period.getAs(Timespan.TimePeriod.TICK);
 
 		if (worlds == null) {
 			taskIDs = new int[]{
diff --git a/src/main/java/ch/njol/skript/events/EvtPlantGrowth.java b/src/main/java/ch/njol/skript/events/EvtPlantGrowth.java
index 7e9df973c5a..c000ab081df 100644
--- a/src/main/java/ch/njol/skript/events/EvtPlantGrowth.java
+++ b/src/main/java/ch/njol/skript/events/EvtPlantGrowth.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.events;
 
 import org.bukkit.event.Event;
diff --git a/src/main/java/ch/njol/skript/events/EvtPlayerChunkEnter.java b/src/main/java/ch/njol/skript/events/EvtPlayerChunkEnter.java
index 0507cefeb35..13c6f53b164 100644
--- a/src/main/java/ch/njol/skript/events/EvtPlayerChunkEnter.java
+++ b/src/main/java/ch/njol/skript/events/EvtPlayerChunkEnter.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.events;
 
 import ch.njol.skript.Skript;
diff --git a/src/main/java/ch/njol/skript/events/EvtPlayerCommandSend.java b/src/main/java/ch/njol/skript/events/EvtPlayerCommandSend.java
index b2d094ba8b1..10d09e1b20c 100644
--- a/src/main/java/ch/njol/skript/events/EvtPlayerCommandSend.java
+++ b/src/main/java/ch/njol/skript/events/EvtPlayerCommandSend.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.events;
 
 import ch.njol.skript.Skript;
diff --git a/src/main/java/ch/njol/skript/events/EvtPressurePlate.java b/src/main/java/ch/njol/skript/events/EvtPressurePlate.java
index 5995f2dd167..a68d9252680 100644
--- a/src/main/java/ch/njol/skript/events/EvtPressurePlate.java
+++ b/src/main/java/ch/njol/skript/events/EvtPressurePlate.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.events;
 
 import org.bukkit.Material;
diff --git a/src/main/java/ch/njol/skript/events/EvtResourcePackResponse.java b/src/main/java/ch/njol/skript/events/EvtResourcePackResponse.java
index 3a5c7fa6bd5..1cc504740b5 100644
--- a/src/main/java/ch/njol/skript/events/EvtResourcePackResponse.java
+++ b/src/main/java/ch/njol/skript/events/EvtResourcePackResponse.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.events;
 
 import org.bukkit.event.Event;
diff --git a/src/main/java/ch/njol/skript/events/EvtScript.java b/src/main/java/ch/njol/skript/events/EvtScript.java
index d966c894479..347e7ee1d44 100644
--- a/src/main/java/ch/njol/skript/events/EvtScript.java
+++ b/src/main/java/ch/njol/skript/events/EvtScript.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.events;
 
 import ch.njol.skript.Skript;
diff --git a/src/main/java/ch/njol/skript/events/EvtSkript.java b/src/main/java/ch/njol/skript/events/EvtSkript.java
index 258ca71b192..a04a16ca7a5 100644
--- a/src/main/java/ch/njol/skript/events/EvtSkript.java
+++ b/src/main/java/ch/njol/skript/events/EvtSkript.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.events;
 
 import ch.njol.skript.Skript;
diff --git a/src/main/java/ch/njol/skript/events/EvtSpectate.java b/src/main/java/ch/njol/skript/events/EvtSpectate.java
index b3c1d9c1191..5d778f557bb 100644
--- a/src/main/java/ch/njol/skript/events/EvtSpectate.java
+++ b/src/main/java/ch/njol/skript/events/EvtSpectate.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.events;
 
 import org.bukkit.entity.Entity;
diff --git a/src/main/java/ch/njol/skript/events/EvtTeleport.java b/src/main/java/ch/njol/skript/events/EvtTeleport.java
index 6ff92b6d642..1855182c8e3 100644
--- a/src/main/java/ch/njol/skript/events/EvtTeleport.java
+++ b/src/main/java/ch/njol/skript/events/EvtTeleport.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.events;
 
 import ch.njol.skript.Skript;
diff --git a/src/main/java/ch/njol/skript/events/EvtVehicleCollision.java b/src/main/java/ch/njol/skript/events/EvtVehicleCollision.java
new file mode 100644
index 00000000000..7b709d6e9fc
--- /dev/null
+++ b/src/main/java/ch/njol/skript/events/EvtVehicleCollision.java
@@ -0,0 +1,118 @@
+package ch.njol.skript.events;
+
+import ch.njol.skript.Skript;
+import ch.njol.skript.aliases.ItemType;
+import ch.njol.skript.entity.EntityData;
+import ch.njol.skript.lang.Literal;
+import ch.njol.skript.lang.SkriptEvent;
+import ch.njol.skript.lang.SkriptParser.ParseResult;
+import ch.njol.skript.lang.SyntaxStringBuilder;
+import ch.njol.skript.registrations.EventValues;
+import org.bukkit.block.Block;
+import org.bukkit.block.data.BlockData;
+import org.bukkit.entity.Entity;
+import org.bukkit.event.Event;
+import org.bukkit.event.vehicle.VehicleBlockCollisionEvent;
+import org.bukkit.event.vehicle.VehicleCollisionEvent;
+import org.bukkit.event.vehicle.VehicleEntityCollisionEvent;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class EvtVehicleCollision extends SkriptEvent {
+
+	static {
+		Skript.registerEvent("Vehicle Collision", EvtVehicleCollision.class, new Class[]{VehicleBlockCollisionEvent.class, VehicleEntityCollisionEvent.class},
+				"vehicle collision [(with|of) [a[n]] %-itemtypes/blockdatas/entitydatas%]",
+				"vehicle block collision [(with|of) [a[n]] %-itemtypes/blockdatas%]",
+				"vehicle entity collision [(with|of) [a[n]] %-entitydatas%]")
+				.description("Called when a vehicle collides with a block or entity.")
+				.examples("on vehicle collision:", "on vehicle collision with obsidian:", "on vehicle collision with a zombie:")
+				.since("2.10");
+
+		// VehicleBlockCollisionEvent
+		EventValues.registerEventValue(VehicleBlockCollisionEvent.class, Block.class, VehicleBlockCollisionEvent::getBlock);
+
+		// VehicleEntityCollisionEvent
+		EventValues.registerEventValue(VehicleEntityCollisionEvent.class, Entity.class, VehicleEntityCollisionEvent::getEntity);
+	}
+
+	private Literal<?> expr;
+	private boolean blockCollision;
+	private boolean entityCollision;
+	private final List<ItemType> itemTypes = new ArrayList<>();
+	private final List<BlockData> blockDatas = new ArrayList<>();
+	private final List<EntityData<?>> entityDatas = new ArrayList<>();
+
+	@Override
+	public boolean init(Literal<?>[] args, int matchedPattern, ParseResult parseResult) {
+		if (args[0] != null) {
+			expr = args[0];
+			for (Object object : expr.getAll()) {
+				if (object instanceof ItemType itemType) {
+					itemTypes.add(itemType);
+				} else if (object instanceof BlockData blockData) {
+					blockDatas.add(blockData);
+				} else if (object instanceof EntityData<?> entityData) {
+					entityDatas.add(entityData);
+				}
+			}
+		}
+		blockCollision = matchedPattern == 1;
+		entityCollision = matchedPattern == 2;
+		return true;
+	}
+
+	@Override
+	public boolean check(Event event) {
+		if (!(event instanceof VehicleCollisionEvent collisionEvent))
+			return false;
+
+		if (expr == null) {
+			if (blockCollision && !(event instanceof VehicleBlockCollisionEvent)) {
+				return false;
+			} else if (entityCollision && !(event instanceof VehicleEntityCollisionEvent)) {
+				return false;
+			}
+			return true;
+		}
+
+		if (collisionEvent instanceof VehicleBlockCollisionEvent blockCollisionEvent && (!itemTypes.isEmpty() || !blockDatas.isEmpty())) {
+			Block eventBlock = blockCollisionEvent.getBlock();
+			ItemType eventItemType = new ItemType(eventBlock.getType());
+			BlockData eventBlockData = eventBlock.getBlockData();
+			for (ItemType itemType : itemTypes) {
+				if (itemType.isSupertypeOf(eventItemType))
+					return true;
+			}
+			for (BlockData blockData : blockDatas) {
+				if (blockData.matches(eventBlockData))
+					return true;
+			}
+		} else if (collisionEvent instanceof VehicleEntityCollisionEvent entityCollisionEvent && !entityDatas.isEmpty()) {
+			EntityData<?> eventEntityData = EntityData.fromEntity(entityCollisionEvent.getEntity());
+			for (EntityData<?> entityData : entityDatas) {
+				if (entityData.isSupertypeOf(eventEntityData))
+					return true;
+			}
+		}
+		return false;
+	}
+
+	@Override
+	public String toString(@Nullable Event event, boolean debug) {
+		SyntaxStringBuilder builder = new SyntaxStringBuilder(event, debug);
+		builder.append("vehicle");
+		if (blockCollision) {
+			builder.append("block");
+		} else if (entityCollision) {
+			builder.append("entity");
+		}
+		builder.append("collision");
+		if (expr != null)
+			builder.append("of", expr);
+		return builder.toString();
+	}
+
+}
diff --git a/src/main/java/ch/njol/skript/events/EvtWeatherChange.java b/src/main/java/ch/njol/skript/events/EvtWeatherChange.java
index 26e1442f003..e01ac20c1c3 100644
--- a/src/main/java/ch/njol/skript/events/EvtWeatherChange.java
+++ b/src/main/java/ch/njol/skript/events/EvtWeatherChange.java
@@ -1,35 +1,17 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.events;
 
-import org.bukkit.event.Event;
-import org.bukkit.event.weather.ThunderChangeEvent;
-import org.bukkit.event.weather.WeatherChangeEvent;
-import org.jetbrains.annotations.Nullable;
-
 import ch.njol.skript.Skript;
 import ch.njol.skript.lang.Literal;
 import ch.njol.skript.lang.SkriptEvent;
 import ch.njol.skript.lang.SkriptParser.ParseResult;
 import ch.njol.skript.util.WeatherType;
-import ch.njol.util.Checker;
 import ch.njol.util.coll.CollectionUtils;
+import org.bukkit.event.Event;
+import org.bukkit.event.weather.ThunderChangeEvent;
+import org.bukkit.event.weather.WeatherChangeEvent;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.function.Predicate;
 
 /**
  * @author Peter Güttinger
@@ -42,16 +24,16 @@ public class EvtWeatherChange extends SkriptEvent {
 				.examples("on weather change:", "on weather change to sunny:")
 				.since("1.0");
 	}
-	
+
 	@Nullable
 	private Literal<WeatherType> types;
-	
+
 	@Override
 	public boolean init(final Literal<?>[] args, final int matchedPattern, final ParseResult parser) {
 		types = (Literal<WeatherType>) args[0];
 		return true;
 	}
-	
+
 	@SuppressWarnings("null")
 	@Override
 	public boolean check(final Event e) {
@@ -61,17 +43,12 @@ public boolean check(final Event e) {
 			return false;
 		final boolean rain = e instanceof WeatherChangeEvent ? ((WeatherChangeEvent) e).toWeatherState() : ((ThunderChangeEvent) e).getWorld().hasStorm();
 		final boolean thunder = e instanceof ThunderChangeEvent ? ((ThunderChangeEvent) e).toThunderState() : ((WeatherChangeEvent) e).getWorld().isThundering();
-		return types.check(e, new Checker<WeatherType>() {
-			@Override
-			public boolean check(final WeatherType t) {
-				return t.isWeather(rain, thunder);
-			}
-		});
+		return types.check(e, t -> t.isWeather(rain, thunder));
 	}
-	
+
 	@Override
 	public String toString(final @Nullable Event e, final boolean debug) {
 		return "weather change" + (types == null ? "" : " to " + types);
 	}
-	
+
 }
diff --git a/src/main/java/ch/njol/skript/events/EvtWorld.java b/src/main/java/ch/njol/skript/events/EvtWorld.java
index 1bbe0a21802..82d8bc9a12e 100644
--- a/src/main/java/ch/njol/skript/events/EvtWorld.java
+++ b/src/main/java/ch/njol/skript/events/EvtWorld.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.events;
 
 import ch.njol.skript.Skript;
diff --git a/src/main/java/ch/njol/skript/events/SimpleEvents.java b/src/main/java/ch/njol/skript/events/SimpleEvents.java
index 4b69a3ae884..4a105833d70 100644
--- a/src/main/java/ch/njol/skript/events/SimpleEvents.java
+++ b/src/main/java/ch/njol/skript/events/SimpleEvents.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.events;
 
 import ch.njol.skript.Skript;
@@ -25,97 +7,27 @@
 import com.destroystokyo.paper.event.entity.EntityJumpEvent;
 import com.destroystokyo.paper.event.entity.ProjectileCollideEvent;
 import com.destroystokyo.paper.event.player.PlayerArmorChangeEvent;
+import com.destroystokyo.paper.event.player.PlayerElytraBoostEvent;
 import com.destroystokyo.paper.event.player.PlayerJumpEvent;
-import com.destroystokyo.paper.event.server.PaperServerListPingEvent;
 import com.destroystokyo.paper.event.player.PlayerReadyArrowEvent;
-import io.papermc.paper.event.player.PlayerStopUsingItemEvent;
+import com.destroystokyo.paper.event.server.PaperServerListPingEvent;
 import io.papermc.paper.event.player.PlayerDeepSleepEvent;
 import io.papermc.paper.event.player.PlayerInventorySlotChangeEvent;
+import io.papermc.paper.event.player.PlayerStopUsingItemEvent;
 import io.papermc.paper.event.player.PlayerTradeEvent;
 import org.bukkit.event.Event;
-import org.bukkit.event.block.BlockCanBuildEvent;
-import org.bukkit.event.block.BlockDamageEvent;
-import org.bukkit.event.block.BlockFertilizeEvent;
-import org.bukkit.event.block.BlockFromToEvent;
-import org.bukkit.event.block.BlockIgniteEvent;
-import org.bukkit.event.block.BlockPhysicsEvent;
-import org.bukkit.event.block.BlockPistonExtendEvent;
-import org.bukkit.event.block.BlockPistonRetractEvent;
-import org.bukkit.event.block.BlockRedstoneEvent;
-import org.bukkit.event.block.BlockSpreadEvent;
-import org.bukkit.event.block.LeavesDecayEvent;
-import org.bukkit.event.block.SignChangeEvent;
-import org.bukkit.event.block.SpongeAbsorbEvent;
+import org.bukkit.event.block.*;
 import org.bukkit.event.enchantment.EnchantItemEvent;
 import org.bukkit.event.enchantment.PrepareItemEnchantEvent;
-import org.bukkit.event.entity.AreaEffectCloudApplyEvent;
-import org.bukkit.event.entity.CreeperPowerEvent;
-import org.bukkit.event.entity.EntityBreakDoorEvent;
-import org.bukkit.event.entity.EntityCombustEvent;
-import org.bukkit.event.entity.EntityDismountEvent;
-import org.bukkit.event.entity.EntityExplodeEvent;
-import org.bukkit.event.entity.EntityMountEvent;
-import org.bukkit.event.entity.EntityPortalEnterEvent;
-import org.bukkit.event.entity.EntityPortalEvent;
-import org.bukkit.event.entity.EntityResurrectEvent;
-import org.bukkit.event.entity.EntityTameEvent;
-import org.bukkit.event.entity.EntityToggleGlideEvent;
-import org.bukkit.event.entity.EntityToggleSwimEvent;
-import org.bukkit.event.entity.ExplosionPrimeEvent;
-import org.bukkit.event.entity.FoodLevelChangeEvent;
-import org.bukkit.event.entity.HorseJumpEvent;
-import org.bukkit.event.entity.PigZapEvent;
-import org.bukkit.event.entity.ProjectileHitEvent;
-import org.bukkit.event.entity.ProjectileLaunchEvent;
-import org.bukkit.event.entity.SheepRegrowWoolEvent;
-import org.bukkit.event.entity.SlimeSplitEvent;
-import org.bukkit.event.inventory.FurnaceBurnEvent;
-import org.bukkit.event.inventory.FurnaceSmeltEvent;
-import org.bukkit.event.inventory.InventoryCloseEvent;
-import org.bukkit.event.inventory.InventoryDragEvent;
-import org.bukkit.event.inventory.InventoryOpenEvent;
-import org.bukkit.event.inventory.InventoryPickupItemEvent;
-import org.bukkit.event.inventory.PrepareAnvilEvent;
-import org.bukkit.event.player.AsyncPlayerChatEvent;
-import org.bukkit.event.player.PlayerAnimationEvent;
-import org.bukkit.event.player.PlayerBedEnterEvent;
-import org.bukkit.event.player.PlayerBedLeaveEvent;
-import org.bukkit.event.player.PlayerBucketEmptyEvent;
-import org.bukkit.event.player.PlayerBucketFillEvent;
-import org.bukkit.event.player.PlayerChangedWorldEvent;
-import org.bukkit.event.player.PlayerEggThrowEvent;
-import org.bukkit.event.player.PlayerFishEvent;
-import org.bukkit.event.player.PlayerItemBreakEvent;
-import org.bukkit.event.player.PlayerItemDamageEvent;
-import org.bukkit.event.player.PlayerItemHeldEvent;
-import org.bukkit.event.player.PlayerItemMendEvent;
-import org.bukkit.event.player.PlayerJoinEvent;
-import org.bukkit.event.player.PlayerKickEvent;
-import org.bukkit.event.player.PlayerLocaleChangeEvent;
-import org.bukkit.event.player.PlayerLoginEvent;
-import org.bukkit.event.player.PlayerPickupArrowEvent;
-import org.bukkit.event.player.PlayerPortalEvent;
-import org.bukkit.event.player.PlayerQuitEvent;
-import org.bukkit.event.player.PlayerRespawnEvent;
-import org.bukkit.event.player.PlayerRiptideEvent;
-import org.bukkit.event.player.PlayerSwapHandItemsEvent;
-import org.bukkit.event.player.PlayerTeleportEvent;
-import org.bukkit.event.player.PlayerToggleFlightEvent;
-import org.bukkit.event.player.PlayerToggleSneakEvent;
-import org.bukkit.event.player.PlayerToggleSprintEvent;
+import org.bukkit.event.entity.*;
+import org.bukkit.event.inventory.*;
+import org.bukkit.event.player.*;
+import org.bukkit.event.server.BroadcastMessageEvent;
 import org.bukkit.event.server.ServerListPingEvent;
-import org.bukkit.event.vehicle.VehicleCreateEvent;
-import org.bukkit.event.vehicle.VehicleDamageEvent;
-import org.bukkit.event.vehicle.VehicleDestroyEvent;
-import org.bukkit.event.vehicle.VehicleEnterEvent;
-import org.bukkit.event.vehicle.VehicleExitEvent;
+import org.bukkit.event.vehicle.*;
 import org.bukkit.event.weather.LightningStrikeEvent;
-import org.bukkit.event.world.ChunkLoadEvent;
-import org.bukkit.event.world.ChunkPopulateEvent;
-import org.bukkit.event.world.ChunkUnloadEvent;
-import org.bukkit.event.world.LootGenerateEvent;
-import org.bukkit.event.world.PortalCreateEvent;
-import org.bukkit.event.world.SpawnChangeEvent;
+import org.bukkit.event.world.*;
+import io.papermc.paper.event.player.PlayerChangeBeaconEffectEvent;
 
 /**
  * @author Peter Güttinger
@@ -221,14 +133,6 @@ public class SimpleEvents {
 				.description("Called when the hunger bar of a player changes, i.e. either increases by eating or decreases over time.")
 				.examples("on food bar change:")
 				.since("1.4.4");
-		Skript.registerEvent("Fuel Burn", SimpleEvent.class, FurnaceBurnEvent.class, "fuel burn[ing]")
-				.description("Called when a furnace burns an item from its <a href='expressions.html#ExprFurnaceSlot'>fuel slot</a>.")
-				.examples("on fuel burning:")
-				.since("1.0");
-		Skript.registerEvent("Smelt", SimpleEvent.class, FurnaceSmeltEvent.class, "[ore] smelt[ing]", "smelt[ing] of ore") //TODO SkriptEvent for "smelt[ing] of %itemtype%"
-		.description("Called when a furnace smelts an item in its <a href='expressions.html#ExprFurnaceSlot'>ore slot</a>.")
-				.examples("on smelt:")
-				.since("1.0");
 		Skript.registerEvent("Leaves Decay", SimpleEvent.class, LeavesDecayEvent.class, "leaves decay[ing]")
 				.description("Called when a leaf block decays due to not being connected to a tree.")
 				.examples("on leaves decay:")
@@ -264,12 +168,6 @@ public class SimpleEvents {
 				)
 				.examples("on throw of an egg:")
 				.since("1.0");
-		// TODO improve - on fish [of %entitydata%] (and/or itemtype), on reel, etc.
-		// Maybe something like RandomSK "[on] fishing state of %fishingstate%"
-		Skript.registerEvent("Fishing", SimpleEvent.class, PlayerFishEvent.class, "[player] fish[ing]")
-				.description("Called when a player fishes something. This is not of much use yet.")
-				.examples("on fish:")
-				.since("1.0");
 		if (Skript.classExists("org.bukkit.event.player.PlayerItemBreakEvent")) {
 			Skript.registerEvent("Item Break", SimpleEvent.class, PlayerItemBreakEvent.class, "[player] tool break[ing]", "[player] break[ing] (a|the|) tool")
 					.description("Called when a player breaks their tool because its damage reached the maximum value.",
@@ -469,7 +367,7 @@ public class SimpleEvents {
 				.description("Called when a player enters a world. Does not work with other entities!")
 				.examples("on player world change:",
 						"	world is \"city\"",
-					 	"	send \"Welcome to the City!\"")
+						"	send \"Welcome to the City!\"")
 				.since("2.2-dev28");
 		Skript.registerEvent("Flight Toggle", SimpleEvent.class, PlayerToggleFlightEvent.class, "[player] flight toggl(e|ing)", "[player] toggl(e|ing) flight")
 				.description("Called when a players stops/starts flying.")
@@ -498,11 +396,11 @@ public class SimpleEvents {
 		if (Skript.classExists("org.bukkit.event.player.PlayerSwapHandItemsEvent")) {
 			Skript.registerEvent("Hand Item Swap", SimpleEvent.class, PlayerSwapHandItemsEvent.class, "swap[ping of] [(hand|held)] item[s]")
 					.description("Called whenever a player swaps the items in their main- and offhand slots.",
-						     "Works also when one or both of the slots are empty.",
-						     "The event is called before the items are actually swapped,",
-						     "so when you use the player's tool or player's offtool expressions,",
-						     "they will return the values before the swap -",
-						     "this enables you to cancel the event before anything happens.")
+							 "Works also when one or both of the slots are empty.",
+							 "The event is called before the items are actually swapped,",
+							 "so when you use the player's tool or player's offtool expressions,",
+							 "they will return the values before the swap -",
+							 "this enables you to cancel the event before anything happens.")
 					.examples("on swap hand items:",
 							"	event-player's tool is a diamond sword",
 							"	cancel event")
@@ -633,7 +531,7 @@ public class SimpleEvents {
 		if (Skript.classExists("com.destroystokyo.paper.event.block.AnvilDamagedEvent")) {
 			Skript.registerEvent("Anvil Damage", SimpleEvent.class, AnvilDamagedEvent.class, "anvil damag(e|ing)")
 				.description("Called when an anvil is damaged/broken from being used to repair/rename items.",
-					 		 "Note: this does not include anvil damage from falling.")
+							 "Note: this does not include anvil damage from falling.")
 				.requiredPlugins("Paper")
 				.examples("on anvil damage:",
 					"\tcancel the event")
@@ -679,7 +577,7 @@ public class SimpleEvents {
 					)
 					.since("2.7");
 		}
-    
+
 		//noinspection deprecation
 		Skript.registerEvent("Chat", SimpleEvent.class, AsyncPlayerChatEvent.class, "chat")
 			.description(
@@ -697,21 +595,7 @@ public class SimpleEvents {
 				"\t\tset chat format to \"&lt;orange&gt;[player]&lt;light gray&gt;: &lt;white&gt;[message]\""
 			)
 			.since("1.4.1");
-		if (Skript.classExists("org.bukkit.event.world.LootGenerateEvent")) {
-			Skript.registerEvent("Loot Generate", SimpleEvent.class, LootGenerateEvent.class, "loot generat(e|ing)")
-					.description(
-						"Called when a loot table of an inventory is generated in the world.",
-						"For example, when opening a shipwreck chest."
-					)
-					.examples(
-						"on loot generate:",
-						"\tchance of 10%",
-						"\tadd 64 diamonds to the loot",
-						"\tsend \"You hit the jackpot at %event-location%!\""
-					)
-					.since("2.7")
-					.requiredPlugins("MC 1.16+");
-		}
+
 		if (Skript.classExists("io.papermc.paper.event.player.PlayerDeepSleepEvent")) {
 			Skript.registerEvent("Player Deep Sleep", SimpleEvent.class, PlayerDeepSleepEvent.class, "[player] deep sleep[ing]")
 					.description(
@@ -746,6 +630,20 @@ public class SimpleEvents {
 				)
 				.since("2.7");
 
+		if (Skript.classExists("org.bukkit.event.entity.PiglinBarterEvent")) {
+			Skript.registerEvent("Piglin Barter", SimpleEvent.class, PiglinBarterEvent.class, "piglin (barter[ing]|trad(e|ing))")
+				.requiredPlugins("Minecraft 1.16+")
+				.description(
+					"Called when a piglin finishes bartering. A piglin may start bartering after picking up an item on its bartering list.",
+					"Cancelling will prevent piglins from dropping items, but will still make them pick up the input.")
+				.examples(
+					"on piglin barter:",
+					"\tif barter drops contain diamond:",
+					"\t\tsend \"Diamonds belong in the money pit!\" to player",
+					"\t\tcancel event"
+				)
+				.since("2.10");
+		}
 		{
 			final Class<? extends Event> eventClass;
 			if (Skript.classExists("org.bukkit.event.block.BellRingEvent")) {
@@ -784,6 +682,7 @@ public class SimpleEvents {
 					)
 					.since("2.9.0")
 					.requiredPlugins("Spigot 1.19.4+");
+
 		}
 
 		if (Skript.classExists("com.destroystokyo.paper.event.entity.EndermanAttackPlayerEvent")) {
@@ -801,6 +700,69 @@ public class SimpleEvents {
 					.since("2.9.0")
 					.requiredPlugins("Paper");
 		}
+
+		if (Skript.classExists("io.papermc.paper.event.player.PlayerChangeBeaconEffectEvent")) {
+			Skript.registerEvent("Beacon Change Effect", SimpleEvent.class, PlayerChangeBeaconEffectEvent.class,
+					"beacon change effect", "beacon effect change", "player chang(e[s]|ing) [of] beacon effect")
+				.description("Called when a player changes the effects of a beacon.")
+				.examples(
+					"on beacon effect change:",
+						"\tbroadcast event-player",
+						"\tbroadcast event-block",
+						"\tbroadcast primary beacon effect",
+						"\tbroadcast secondary beacon effect",
+					"on beacon change effect:",
+					"on player change beacon effect:"
+				)
+				.since("2.10")
+				.requiredPlugins("Paper");
+		}
+
+		Skript.registerEvent("Broadcast", SimpleEvent.class, BroadcastMessageEvent.class, "broadcast")
+			.description("Called when a message is broadcasted.")
+			.examples(
+				"on broadcast:",
+					"\tset broadcast-message to \"&c[BROADCAST] %broadcasted message%\""
+			)
+			.since("2.10");
+
+		Skript.registerEvent("Experience Cooldown Change", SimpleEvent.class, PlayerExpCooldownChangeEvent.class, "player (experience|[e]xp) cooldown change")
+			.description(
+				"Called when a player's experience cooldown changes.",
+				"Experience cooldown is how long until a player can pick up another orb of experience."
+			)
+			.examples(
+				"on player experience cooldown change:",
+					"\tbroadcast event-player",
+					"\tbroadcast event-timespan",
+					"\tbroadcast past event-timespan",
+					"\tbroadcast xp cooldown change reason"
+			)
+			.since("2.10");
+
+		Skript.registerEvent("Vehicle Move", SimpleEvent.class, VehicleMoveEvent.class, "vehicle move")
+			.description(
+				"Called when a vehicle moves.",
+				"Please note that using this event can cause lag if there are multiple vehicle entities, i.e. Horse, Pig, Boat, Minecart")
+			.examples(
+				"on vehicle move:",
+					"\tbroadcast past event-location",
+					"\tbroadcast event-location"
+			)
+			.since("2.10");
+
+		if (Skript.classExists("com.destroystokyo.paper.event.player.PlayerElytraBoostEvent")) {
+			Skript.registerEvent("Elytra Boost", SimpleEvent.class, PlayerElytraBoostEvent.class, "elytra boost")
+				.description("Called when a player uses a firework to boost their fly speed when flying with an elytra.")
+				.examples(
+					"on elytra boost:",
+						"\tif the used firework will be consumed:",
+							"\t\tprevent the used firework from being consume"
+				)
+				.requiredPlugins("Paper")
+				.since("2.10");
+		}
+
 	}
 
 }
diff --git a/src/main/java/ch/njol/skript/events/bukkit/ExperienceSpawnEvent.java b/src/main/java/ch/njol/skript/events/bukkit/ExperienceSpawnEvent.java
index 2b357bedf75..e4a4e315f87 100644
--- a/src/main/java/ch/njol/skript/events/bukkit/ExperienceSpawnEvent.java
+++ b/src/main/java/ch/njol/skript/events/bukkit/ExperienceSpawnEvent.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.events.bukkit;
 
 import org.bukkit.Location;
diff --git a/src/main/java/ch/njol/skript/events/bukkit/PreScriptLoadEvent.java b/src/main/java/ch/njol/skript/events/bukkit/PreScriptLoadEvent.java
index 95fe6fc0881..185ef328743 100644
--- a/src/main/java/ch/njol/skript/events/bukkit/PreScriptLoadEvent.java
+++ b/src/main/java/ch/njol/skript/events/bukkit/PreScriptLoadEvent.java
@@ -1,44 +1,27 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.events.bukkit;
 
-import java.util.List;
-
+import ch.njol.skript.ScriptLoader;
+import ch.njol.skript.config.Config;
+import com.google.common.base.Preconditions;
 import org.bukkit.Bukkit;
 import org.bukkit.event.Event;
 import org.bukkit.event.HandlerList;
 
-import ch.njol.skript.config.Config;
-import ch.njol.util.Validate;
+import java.util.List;
 
 /**
  * This event has no guarantee of being on the main thread.
  * Please do not use bukkit api before checking {@link Bukkit#isPrimaryThread()}
+ * @deprecated Use {@link ScriptLoader.ScriptPreInitEvent}.
  */
-
+@Deprecated(forRemoval = true)
 public class PreScriptLoadEvent extends Event {
 
     private final List<Config> scripts;
 
     public PreScriptLoadEvent(List<Config> scripts) {
         super(!Bukkit.isPrimaryThread());
-        Validate.notNull(scripts);
+        Preconditions.checkNotNull(scripts);
         this.scripts = scripts;
     }
 
diff --git a/src/main/java/ch/njol/skript/events/bukkit/ScheduledEvent.java b/src/main/java/ch/njol/skript/events/bukkit/ScheduledEvent.java
index bfc1346357d..a4c0fb21ac7 100644
--- a/src/main/java/ch/njol/skript/events/bukkit/ScheduledEvent.java
+++ b/src/main/java/ch/njol/skript/events/bukkit/ScheduledEvent.java
@@ -1,43 +1,20 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.events.bukkit;
 
+import ch.njol.skript.registrations.EventValues;
 import org.bukkit.World;
 import org.bukkit.event.Event;
 import org.bukkit.event.HandlerList;
 import org.jetbrains.annotations.Nullable;
 
-import ch.njol.skript.registrations.EventValues;
-import ch.njol.skript.util.Getter;
-
 /**
  * @author Peter Güttinger
  */
 public class ScheduledEvent extends Event {
+
 	static {
-		EventValues.registerEventValue(ScheduledEvent.class, World.class, new Getter<World, ScheduledEvent>() {
-			@Override
-			@Nullable
-			public World get(final ScheduledEvent e) {
-				return e.getWorld();
-			}
-		}, 0, "There's no world in a periodic event if no world is given in the event (e.g. like 'every hour in \"world\"')", ScheduledNoWorldEvent.class);
+		EventValues.registerEventValue(ScheduledEvent.class, World.class, ScheduledEvent::getWorld, EventValues.TIME_NOW,
+			"There's no world in a periodic event if no world is given in the event (e.g. like 'every hour in \"world\"')",
+			ScheduledNoWorldEvent.class);
 	}
 	
 	@Nullable
diff --git a/src/main/java/ch/njol/skript/events/bukkit/ScheduledNoWorldEvent.java b/src/main/java/ch/njol/skript/events/bukkit/ScheduledNoWorldEvent.java
index b27fa0de11f..204907f0fe7 100644
--- a/src/main/java/ch/njol/skript/events/bukkit/ScheduledNoWorldEvent.java
+++ b/src/main/java/ch/njol/skript/events/bukkit/ScheduledNoWorldEvent.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.events.bukkit;
 
 import org.bukkit.event.HandlerList;
diff --git a/src/main/java/ch/njol/skript/events/bukkit/ScriptEvent.java b/src/main/java/ch/njol/skript/events/bukkit/ScriptEvent.java
index 31947ee2f51..7222af52693 100644
--- a/src/main/java/ch/njol/skript/events/bukkit/ScriptEvent.java
+++ b/src/main/java/ch/njol/skript/events/bukkit/ScriptEvent.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.events.bukkit;
 
 import org.bukkit.event.Event;
diff --git a/src/main/java/ch/njol/skript/events/bukkit/SkriptStartEvent.java b/src/main/java/ch/njol/skript/events/bukkit/SkriptStartEvent.java
index a36ba3d32c4..b12c7ed1008 100644
--- a/src/main/java/ch/njol/skript/events/bukkit/SkriptStartEvent.java
+++ b/src/main/java/ch/njol/skript/events/bukkit/SkriptStartEvent.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.events.bukkit;
 
 import org.bukkit.event.Event;
diff --git a/src/main/java/ch/njol/skript/events/bukkit/SkriptStopEvent.java b/src/main/java/ch/njol/skript/events/bukkit/SkriptStopEvent.java
index 0536891da09..bdaad4f9c97 100644
--- a/src/main/java/ch/njol/skript/events/bukkit/SkriptStopEvent.java
+++ b/src/main/java/ch/njol/skript/events/bukkit/SkriptStopEvent.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.events.bukkit;
 
 import org.bukkit.event.Event;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprAI.java b/src/main/java/ch/njol/skript/expressions/ExprAI.java
index 379337054bd..ae3ad17dc9c 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprAI.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprAI.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import org.bukkit.entity.LivingEntity;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprARGB.java b/src/main/java/ch/njol/skript/expressions/ExprARGB.java
new file mode 100644
index 00000000000..72fd036380e
--- /dev/null
+++ b/src/main/java/ch/njol/skript/expressions/ExprARGB.java
@@ -0,0 +1,78 @@
+package ch.njol.skript.expressions;
+
+import ch.njol.skript.doc.Description;
+import ch.njol.skript.doc.Examples;
+import ch.njol.skript.doc.Keywords;
+import ch.njol.skript.doc.Name;
+import ch.njol.skript.doc.Since;
+import ch.njol.skript.expressions.base.SimplePropertyExpression;
+import ch.njol.skript.lang.Expression;
+import ch.njol.skript.lang.SkriptParser.ParseResult;
+import ch.njol.skript.util.Color;
+import ch.njol.util.Kleenean;
+
+import java.util.Locale;
+import java.util.function.Function;
+
+@Name("Alpha/Red/Green/Blue Color Value")
+@Description({
+	"The alpha, red, green, or blue value of colors. Ranges from 0 to 255.",
+	"Alpha represents opacity."
+})
+@Examples({
+	"broadcast red value of rgb(100, 0, 50) # sends '100'",
+	"set {_red} to red's red value + 10"
+})
+@Keywords({"ARGB", "RGB", "color", "colour"})
+@Since("2.10")
+public class ExprARGB extends SimplePropertyExpression<Color, Integer> {
+
+	static {
+		register(ExprARGB.class, Integer.class, "(:alpha|:red|:green|:blue) (value|component)", "colors");
+	}
+
+	private RGB color;
+
+	@Override
+	public boolean init(Expression<?>[] expressions, int matchedPattern, Kleenean isDelayed, ParseResult parseResult) {
+		color = RGB.valueOf(parseResult.tags.get(0).toUpperCase(Locale.ENGLISH));
+		return super.init(expressions, matchedPattern, isDelayed, parseResult);
+	}
+
+	@Override
+	public Integer convert(Color from) {
+		return color.getValue(from);
+	}
+
+	@Override
+	public Class<? extends Integer> getReturnType() {
+		return Integer.class;
+	}
+
+	@Override
+	protected String getPropertyName() {
+		return color.name().toLowerCase(Locale.ENGLISH);
+	}
+
+	/**
+	 * helper enum for getting argb values of {@link Color}s.
+	 */
+	private enum RGB {
+		ALPHA(Color::getAlpha),
+		RED(Color::getRed),
+		GREEN(Color::getGreen),
+		BLUE(Color::getBlue);
+
+		private final Function<Color, Integer> get;
+
+		RGB(Function<Color, Integer> get) {
+			this.get = get;
+		}
+
+		public int getValue(Color from) {
+			return get.apply(from);
+		}
+
+	}
+
+}
diff --git a/src/main/java/ch/njol/skript/expressions/ExprAbsorbedBlocks.java b/src/main/java/ch/njol/skript/expressions/ExprAbsorbedBlocks.java
index 1becb4a8283..c436a0474c6 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprAbsorbedBlocks.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprAbsorbedBlocks.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import java.util.Iterator;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprActiveItem.java b/src/main/java/ch/njol/skript/expressions/ExprActiveItem.java
index 0e9f6cd2098..197db86faca 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprActiveItem.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprActiveItem.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import ch.njol.skript.Skript;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprAffectedEntities.java b/src/main/java/ch/njol/skript/expressions/ExprAffectedEntities.java
index 677a2e95cbb..66393d7ead4 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprAffectedEntities.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprAffectedEntities.java
@@ -1,25 +1,10 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import java.util.Iterator;
+import java.util.Objects;
 
+import ch.njol.skript.classes.Changer.ChangeMode;
+import ch.njol.util.coll.CollectionUtils;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.event.Event;
 import org.bukkit.event.entity.AreaEffectCloudApplyEvent;
@@ -58,20 +43,52 @@ public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelaye
 		return true;
 	}
 
-	@Nullable
 	@Override
-	protected LivingEntity[] get(Event e) {
-		if (e instanceof AreaEffectCloudApplyEvent)
-			return ((AreaEffectCloudApplyEvent) e).getAffectedEntities().toArray(new LivingEntity[0]);
+	protected LivingEntity @Nullable [] get(Event event) {
+		if (event instanceof AreaEffectCloudApplyEvent areaEvent)
+			return areaEvent.getAffectedEntities().toArray(new LivingEntity[0]);
 		return null;
 	}
 
-	@Nullable
 	@Override
-	public Iterator<? extends LivingEntity> iterator(Event e) {
-		if (e instanceof AreaEffectCloudApplyEvent)
-			return ((AreaEffectCloudApplyEvent) e).getAffectedEntities().iterator();
-		return super.iterator(e);
+	public @Nullable Iterator<? extends LivingEntity> iterator(Event event) {
+		if (event instanceof AreaEffectCloudApplyEvent areaEvent)
+			return areaEvent.getAffectedEntities().iterator();
+		return super.iterator(event);
+	}
+
+	@Override
+	public Class<?> @Nullable [] acceptChange(ChangeMode mode) {
+		return switch (mode) {
+			case ADD, SET, DELETE, REMOVE -> CollectionUtils.array(LivingEntity[].class);
+			default -> null;
+		};
+	}
+
+	@Override
+	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);
+				}
+				break;
+			case SET:
+				areaEvent.getAffectedEntities().clear();
+				// FALLTHROUGH
+			case ADD:
+				for (LivingEntity entity : entities) {
+					areaEvent.getAffectedEntities().add(entity);
+				}
+				break;
+			case RESET, DELETE:
+				areaEvent.getAffectedEntities().clear();
+				break;
+		}
 	}
 
 	@Override
@@ -90,7 +107,7 @@ public Class<? extends LivingEntity> getReturnType() {
 	}
 
 	@Override
-	public String toString(@Nullable Event e, boolean debug) {
+	public String toString(@Nullable Event event, boolean debug) {
 		return "the affected entities";
 	}
 
diff --git a/src/main/java/ch/njol/skript/expressions/ExprAge.java b/src/main/java/ch/njol/skript/expressions/ExprAge.java
index 8f4c1fa2489..a93f78b97fe 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprAge.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprAge.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import ch.njol.skript.Skript;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprAllBannedEntries.java b/src/main/java/ch/njol/skript/expressions/ExprAllBannedEntries.java
index 77a5e214360..0733cc9cf34 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprAllBannedEntries.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprAllBannedEntries.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import ch.njol.skript.Skript;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprAllCommands.java b/src/main/java/ch/njol/skript/expressions/ExprAllCommands.java
index 19791ae84b3..389c259dbe6 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprAllCommands.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprAllCommands.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import org.bukkit.event.Event;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprAlphabetList.java b/src/main/java/ch/njol/skript/expressions/ExprAlphabetList.java
index f3585c2e123..fa02485b2b7 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprAlphabetList.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprAlphabetList.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import java.util.Arrays;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprAltitude.java b/src/main/java/ch/njol/skript/expressions/ExprAltitude.java
index 0f2ba03f71a..c8f39fc8fd1 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprAltitude.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprAltitude.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import org.bukkit.Location;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprAmount.java b/src/main/java/ch/njol/skript/expressions/ExprAmount.java
index d8c226dc00d..375f01cdb36 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprAmount.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprAmount.java
@@ -1,24 +1,7 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 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;
 import ch.njol.skript.doc.Name;
@@ -30,18 +13,16 @@
 import ch.njol.skript.lang.SkriptParser.ParseResult;
 import ch.njol.skript.lang.Variable;
 import ch.njol.skript.lang.util.SimpleExpression;
+import ch.njol.skript.lang.util.common.AnyAmount;
 import ch.njol.util.Kleenean;
+import ch.njol.util.coll.CollectionUtils;
 import org.bukkit.event.Event;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.Map;
 
-/**
- * 
- * @author Peter Güttinger
- */
 @Name("Amount")
-@Description({"The amount of something.",
+@Description({"The amount or size of something.",
 		"Please note that <code>amount of %items%</code> will not return the number of items, but the number of stacks, e.g. 1 for a stack of 64 torches. To get the amount of items in a stack, see the <a href='#ExprItemAmount'>item amount</a> expression.",
 		"",
 		"Also, you can get the recursive size of a list, which will return the recursive size of the list with sublists included, e.g.",
@@ -60,23 +41,30 @@
 		"Please note that getting a list's recursive size can cause lag if the list is large, so only use this expression if you need to!"})
 @Examples({"message \"There are %number of all players% players online!\""})
 @Since("1.0")
-public class ExprAmount extends SimpleExpression<Long> {
+public class ExprAmount extends SimpleExpression<Number> {
 
 	static {
-		Skript.registerExpression(ExprAmount.class, Long.class, ExpressionType.PROPERTY,
+		Skript.registerExpression(ExprAmount.class, Number.class, ExpressionType.PROPERTY,
+				"[the] (amount|number|size) of %numbered%",
 				"[the] (amount|number|size) of %objects%",
 				"[the] recursive (amount|number|size) of %objects%");
 	}
 
 	@SuppressWarnings("null")
 	private ExpressionList<?> exprs;
+	private @Nullable Expression<AnyAmount> any;
 
 	private boolean recursive;
 
 	@Override
 	public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelayed, ParseResult parseResult) {
+		if (matchedPattern == 0) {
+			//noinspection unchecked
+			this.any = (Expression<AnyAmount>) exprs[0];
+			return true;
+		}
 		this.exprs = exprs[0] instanceof ExpressionList ? (ExpressionList<?>) exprs[0] : new ExpressionList<>(new Expression<?>[]{exprs[0]}, Object.class, false);
-		this.recursive = matchedPattern == 1;
+		this.recursive = matchedPattern == 2;
 		for (Expression<?> expr : this.exprs.getExpressions()) {
 			if (expr instanceof Literal<?>) {
 				return false;
@@ -95,7 +83,9 @@ public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelaye
 
 	@Override
 	@SuppressWarnings("unchecked")
-	protected Long[] get(Event e) {
+	protected Number[] get(Event e) {
+		if (any != null)
+			return new Number[] {any.getOptionalSingle(e).orElse(() -> 0).amount()};
 		if (recursive) {
 			int currentSize = 0;
 			for (Expression<?> expr : exprs.getExpressions()) {
@@ -109,6 +99,45 @@ protected Long[] get(Event e) {
 		return new Long[]{(long) exprs.getArray(e).length};
 	}
 
+	@Override
+	public @Nullable Class<?>[] acceptChange(ChangeMode mode) {
+		if (any != null) {
+			return switch (mode) {
+				case SET, ADD, RESET, DELETE, REMOVE -> CollectionUtils.array(Number.class);
+				default -> null;
+			};
+		}
+		return super.acceptChange(mode);
+	}
+
+	@Override
+	public void change(Event event,  Object @Nullable [] delta, ChangeMode mode) {
+		if (any == null) {
+			super.change(event, delta, mode);
+			return;
+		}
+		double amount = delta != null ? ((Number) delta[0]).doubleValue() : 1;
+		// It's okay to treat it as a double even if it's a whole number because there's no case in
+		// the set of real numbers where (x->double + y->double)->long != (x+y)
+		switch (mode) {
+			case REMOVE:
+				amount = -amount;
+				//$FALL-THROUGH$
+			case ADD:
+				for (AnyAmount obj : any.getArray(event)) {
+					if (obj.supportsAmountChange())
+						obj.setAmount(obj.amount().doubleValue() + amount);
+				}
+				break;
+			case RESET, DELETE, SET:
+				for (AnyAmount any : any.getArray(event)) {
+					if (any.supportsAmountChange())
+						any.setAmount(amount);
+				}
+				break;
+		}
+	}
+
 	@SuppressWarnings("unchecked")
 	private static int getRecursiveSize(Map<String, ?> map) {
 		int count = 0;
@@ -128,13 +157,15 @@ public boolean isSingle() {
 	}
 
 	@Override
-	public Class<? extends Long> getReturnType() {
-		return Long.class;
+	public Class<? extends Number> getReturnType() {
+		return any != null ? Number.class : Long.class;
 	}
 
 	@Override
-	public String toString(@Nullable Event e, boolean debug) {
-		return (recursive ? "recursive size of " : "amount of ") + exprs.toString(e, debug);
+	public String toString(@Nullable Event event, boolean debug) {
+		if (any != null)
+			return "amount of " + any.toString(event, debug);
+		return (recursive ? "recursive size of " : "amount of ") + exprs.toString(event, debug);
 	}
 
 }
diff --git a/src/main/java/ch/njol/skript/expressions/ExprAmountOfItems.java b/src/main/java/ch/njol/skript/expressions/ExprAmountOfItems.java
index 2d43acf4111..c5d378e3a07 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprAmountOfItems.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprAmountOfItems.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import ch.njol.skript.Skript;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprAngle.java b/src/main/java/ch/njol/skript/expressions/ExprAngle.java
new file mode 100644
index 00000000000..208a0ee209e
--- /dev/null
+++ b/src/main/java/ch/njol/skript/expressions/ExprAngle.java
@@ -0,0 +1,77 @@
+package ch.njol.skript.expressions;
+
+import ch.njol.skript.Skript;
+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.SkriptParser.ParseResult;
+import ch.njol.skript.lang.util.SimpleExpression;
+import ch.njol.util.Kleenean;
+import org.bukkit.event.Event;
+import org.jetbrains.annotations.Nullable;
+
+@Name("Angle")
+@Description({
+	"Represents the passed number value in degrees.",
+	"If radians is specified, converts the passed value to degrees. This conversion may not be entirely accurate, " +
+	"due to floating point precision.",
+})
+@Examples({
+	"set {_angle} to 90 degrees",
+	"{_angle} is 90 # true",
+	"180 degrees is pi # true",
+	"pi radians is 180 degrees # true"
+})
+@Since("2.10")
+public class ExprAngle extends SimpleExpression<Number> {
+
+	static {
+		Skript.registerExpression(ExprAngle.class, Number.class, ExpressionType.SIMPLE,
+			"%number% [in] deg[ree][s]",
+			"%number% [in] rad[ian][s]",
+			"%numbers% in deg[ree][s]",
+			"%numbers% in rad[ian][s]");
+	}
+
+	private Expression<Number> angle;
+	private boolean isRadians;
+
+	@Override
+	public boolean init(Expression<?>[] expressions, int matchedPattern,
+						Kleenean isDelayed, ParseResult parseResult) {
+		//noinspection unchecked
+		angle = (Expression<Number>) expressions[0];
+		isRadians = matchedPattern % 2 != 0;
+		return true;
+	}
+
+	@Override
+	protected Number @Nullable [] get(Event event) {
+		Number[] numbers = angle.getArray(event);
+
+		if (isRadians)
+			for (int i = 0; i < numbers.length; i++)
+            	numbers[i] = Math.toDegrees(numbers[i].doubleValue());
+
+		return numbers;
+	}
+
+	@Override
+	public boolean isSingle() {
+		return angle.isSingle();
+	}
+
+	@Override
+	public Class<? extends Number> getReturnType() {
+		return Number.class;
+	}
+
+	@Override
+	public String toString(@Nullable Event event, boolean debug) {
+		return angle.toString(event, debug) + " in " + (isRadians ? "degrees" : "radians");
+	}
+
+}
diff --git a/src/main/java/ch/njol/skript/expressions/ExprAnvilRepairCost.java b/src/main/java/ch/njol/skript/expressions/ExprAnvilRepairCost.java
index 06887b09cb9..5fde7c76d97 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprAnvilRepairCost.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprAnvilRepairCost.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import ch.njol.skript.Skript;
@@ -67,8 +49,8 @@ public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelaye
 	}
 
 	@Override
-	@Nullable
-	public Integer convert(Inventory inventory) {
+	@SuppressWarnings("removal")
+	public @Nullable Integer convert(Inventory inventory) {
 		if (!(inventory instanceof AnvilInventory))
 			return null;
 
@@ -77,19 +59,15 @@ public Integer convert(Inventory inventory) {
 	}
 
 	@Override
-	@Nullable
-	public Class<?>[] acceptChange(ChangeMode mode) {
-		switch (mode) {
-			case ADD:
-			case REMOVE:
-			case SET:
-				return CollectionUtils.array(Number.class);
-			default:
-				return null;
-		}
+	public Class<?> @Nullable [] acceptChange(ChangeMode mode) {
+		return switch (mode) {
+			case ADD, REMOVE, SET -> CollectionUtils.array(Number.class);
+			default -> null;
+		};
 	}
 
 	@Override
+	@SuppressWarnings("removal")
 	public void change(Event event, @Nullable Object[] delta, ChangeMode mode) {
 		int value = ((Number) delta[0]).intValue() * (mode == ChangeMode.REMOVE ? -1 : 1);
 		for (Inventory inventory : getExpr().getArray(event)) {
@@ -115,5 +93,5 @@ public Class<? extends Integer> getReturnType() {
 	public String getPropertyName() {
 		return "anvil item" + (isMax ? " max" : "") + " repair cost";
 	}
-	
+
 }
diff --git a/src/main/java/ch/njol/skript/expressions/ExprAnvilText.java b/src/main/java/ch/njol/skript/expressions/ExprAnvilText.java
index d894368535e..1a7f862dae9 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprAnvilText.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprAnvilText.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import ch.njol.skript.doc.Description;
@@ -23,9 +5,6 @@
 import ch.njol.skript.doc.Name;
 import ch.njol.skript.doc.Since;
 import ch.njol.skript.expressions.base.SimplePropertyExpression;
-import ch.njol.skript.lang.Expression;
-import ch.njol.skript.lang.SkriptParser.ParseResult;
-import ch.njol.util.Kleenean;
 import org.bukkit.inventory.AnvilInventory;
 import org.bukkit.inventory.Inventory;
 import org.jetbrains.annotations.Nullable;
@@ -46,8 +25,8 @@ public class ExprAnvilText extends SimplePropertyExpression<Inventory, String> {
 	}
 
 	@Override
-	@Nullable
-	public String convert(Inventory inv) {
+	@SuppressWarnings("removal")
+	public @Nullable String convert(Inventory inv) {
 		if (!(inv instanceof AnvilInventory))
 			return null;
 		return ((AnvilInventory) inv).getRenameText();
@@ -62,5 +41,5 @@ public Class<? extends String> getReturnType() {
 	public String getPropertyName() {
 		return "anvil text input";
 	}
-	
+
 }
diff --git a/src/main/java/ch/njol/skript/expressions/ExprAppliedEffect.java b/src/main/java/ch/njol/skript/expressions/ExprAppliedEffect.java
new file mode 100644
index 00000000000..02e6a8688a9
--- /dev/null
+++ b/src/main/java/ch/njol/skript/expressions/ExprAppliedEffect.java
@@ -0,0 +1,67 @@
+package ch.njol.skript.expressions;
+
+import ch.njol.skript.Skript;
+import ch.njol.skript.doc.*;
+import ch.njol.skript.lang.Expression;
+import ch.njol.skript.lang.ExpressionType;
+import ch.njol.skript.lang.SkriptParser.ParseResult;
+import ch.njol.skript.lang.util.SimpleExpression;
+import ch.njol.util.Kleenean;
+import com.destroystokyo.paper.event.block.BeaconEffectEvent;
+import org.bukkit.event.Event;
+import org.bukkit.potion.PotionEffectType;
+import org.jetbrains.annotations.Nullable;
+
+@Name("Applied Beacon Effect")
+@Description("The type of effect applied by a beacon.")
+@Examples({
+	"on beacon effect:",
+		"\tif the applied effect is primary beacon effect:",
+			"\t\tbroadcast \"Is Primary\"",
+		"\telse if applied effect = secondary effect:",
+			"\t\tbroadcast \"Is Secondary\""
+})
+@Events("Beacon Effect")
+@RequiredPlugins("Paper")
+@Since("2.10")
+public class ExprAppliedEffect extends SimpleExpression<PotionEffectType> {
+
+	static {
+		if (Skript.classExists("com.destroystokyo.paper.event.block.BeaconEffectEvent")) {
+			Skript.registerExpression(ExprAppliedEffect.class, PotionEffectType.class, ExpressionType.SIMPLE, "[the] applied [beacon] effect");
+		}
+	}
+
+
+	@Override
+	public boolean init(Expression<?>[] expressions, int matchedPattern, Kleenean isDelayed, ParseResult parseResult) {
+		if (!getParser().isCurrentEvent(BeaconEffectEvent.class)) {
+			Skript.error("You can only use 'applied effect' in a beacon effect event.");
+			return false;
+		}
+		return true;
+	}
+
+	@Override
+	protected PotionEffectType @Nullable [] get(Event event) {
+		if (!(event instanceof BeaconEffectEvent effectEvent))
+			return null;
+		return new PotionEffectType[]{effectEvent.getEffect().getType()};
+	}
+
+	@Override
+	public Class<PotionEffectType> getReturnType() {
+		return PotionEffectType.class;
+	}
+
+	@Override
+	public boolean isSingle() {
+		return true;
+	}
+
+	@Override
+	public String toString(@Nullable Event event, boolean debug) {
+		return "applied effect";
+	}
+
+}
diff --git a/src/main/java/ch/njol/skript/expressions/ExprAppliedEnchantments.java b/src/main/java/ch/njol/skript/expressions/ExprAppliedEnchantments.java
index 85970776262..f2b0b79ee11 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprAppliedEnchantments.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprAppliedEnchantments.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import org.bukkit.enchantments.Enchantment;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprArgument.java b/src/main/java/ch/njol/skript/expressions/ExprArgument.java
index 56ef0c1165a..db91407e222 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprArgument.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprArgument.java
@@ -1,26 +1,10 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import java.util.List;
 import java.util.regex.MatchResult;
 
+import ch.njol.skript.lang.EventRestrictedSyntax;
+import ch.njol.util.coll.CollectionUtils;
 import org.bukkit.event.Event;
 import org.bukkit.event.player.PlayerCommandPreprocessEvent;
 import org.bukkit.event.server.ServerCommandEvent;
@@ -61,7 +45,7 @@
 	"heal the last argument"
 })
 @Since("1.0, 2.7 (support for command events)")
-public class ExprArgument extends SimpleExpression<Object> {
+public class ExprArgument extends SimpleExpression<Object> implements EventRestrictedSyntax {
 
 	static {
 		Skript.registerExpression(ExprArgument.class, Object.class, ExpressionType.SIMPLE,
@@ -86,10 +70,6 @@ public class ExprArgument extends SimpleExpression<Object> {
 	@SuppressWarnings("unchecked")
 	public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelayed, ParseResult parseResult) {
 		boolean scriptCommand = getParser().isCurrentEvent(ScriptCommandEvent.class);
-		if (!scriptCommand && !getParser().isCurrentEvent(PlayerCommandPreprocessEvent.class, ServerCommandEvent.class)) {
-			Skript.error("The 'argument' expression can only be used in a script command or command event");
-			return false;
-		}
 
 		switch (matchedPattern) {
 			case 0:
@@ -210,7 +190,13 @@ public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelaye
 
 		return true;
 	}
-	
+
+	@Override
+	public Class<? extends Event>[] supportedEvents() {
+		return CollectionUtils.array(ScriptCommandEvent.class, PlayerCommandPreprocessEvent.class,
+			ServerCommandEvent.class);
+	}
+
 	@Override
 	@Nullable
 	protected Object[] get(final Event e) {
diff --git a/src/main/java/ch/njol/skript/expressions/ExprArmorSlot.java b/src/main/java/ch/njol/skript/expressions/ExprArmorSlot.java
index 15497fa6e0e..1d700b3fb06 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprArmorSlot.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprArmorSlot.java
@@ -1,23 +1,6 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
+import ch.njol.skript.Skript;
 import ch.njol.skript.doc.Description;
 import ch.njol.skript.doc.Examples;
 import ch.njol.skript.doc.Keywords;
@@ -30,39 +13,53 @@
 import ch.njol.skript.util.slot.EquipmentSlot.EquipSlot;
 import ch.njol.skript.util.slot.Slot;
 import ch.njol.util.Kleenean;
-import org.bukkit.entity.LivingEntity;
+import org.bukkit.Material;
+import org.bukkit.entity.*;
 import org.bukkit.event.Event;
 import org.bukkit.inventory.EntityEquipment;
 import org.jetbrains.annotations.Nullable;
 
-import java.util.Arrays;
-import java.util.Locale;
+import java.util.*;
 import java.util.stream.Stream;
 
-@Name("Armour Slot")
-@Description("Equipment of living entities, i.e. the boots, leggings, chestplate or helmet.")
+@Name("Armor Slot")
+@Description({
+	"Equipment of living entities, i.e. the boots, leggings, chestplate or helmet.",
+	"Body armor is a special slot that can only be used for:",
+	"<ul>",
+	"<li>Horses: Horse armour (doesn't work on zombie or skeleton horses)</li>",
+	"<li>Wolves: Wolf Armor</li>",
+	"<li>Llamas (regular or trader): Carpet</li>",
+	"</ul>"
+})
 @Examples({
 	"set chestplate of the player to a diamond chestplate",
 	"helmet of player is neither a helmet nor air # player is wearing a block, e.g. from another plugin"
 })
 @Keywords("armor")
-@Since("1.0, 2.8.0 (Armour)")
+@Since("1.0, 2.8.0 (armor), 2.10 (body armor)")
 public class ExprArmorSlot extends PropertyExpression<LivingEntity, Slot> {
 
+	private static final Set<Class<?>> bodyEntities = new HashSet<>(Arrays.asList(Horse.class, Llama.class, TraderLlama.class));
+
 	static {
-		register(ExprArmorSlot.class, Slot.class, "((boots:(boots|shoes)|leggings:leg[ging]s|chestplate:chestplate[s]|helmet:helmet[s]) [(item|:slot)]|armour:armo[u]r[s])", "livingentities");
+		if (Material.getMaterial("WOLF_ARMOR") != null)
+			bodyEntities.add(Wolf.class);
+
+		register(ExprArmorSlot.class, Slot.class, "((boots:(boots|shoes)|leggings:leg[ging]s|chestplate:chestplate[s]|helmet:helmet[s]) [(item|:slot)]|armour:armo[u]r[s]|bodyarmor:body armo[u]r)", "livingentities");
 	}
 
-	@Nullable
-	private EquipSlot slot;
+	private @Nullable EquipSlot slot;
 	private boolean explicitSlot;
 	private boolean isArmor;
+	private boolean isBody;
 
 	@Override
 	@SuppressWarnings("unchecked")
 	public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelayed, ParseResult parseResult) {
+		isBody = parseResult.hasTag("bodyarmor");
 		isArmor = parseResult.hasTag("armour");
-		slot = isArmor ? null : EquipSlot.valueOf(parseResult.tags.get(0).toUpperCase(Locale.ENGLISH));
+		slot = (isArmor || isBody) ? null : EquipSlot.valueOf(parseResult.tags.get(0).toUpperCase(Locale.ENGLISH));
 		explicitSlot = parseResult.hasTag("slot"); // User explicitly asked for SLOT, not item
 		setExpr((Expression<? extends LivingEntity>) exprs[0]);
 		return true;
@@ -76,6 +73,11 @@ protected Slot[] get(Event event, LivingEntity[] source) {
 					.flatMap(equipment -> {
 						if (equipment == null)
 							return null;
+						if (isBody) {
+							if (!bodyEntities.contains(equipment.getHolder().getType().getEntityClass()))
+								return null;
+							return Stream.of(new EquipmentSlot(equipment, EquipSlot.BODY, explicitSlot));
+						}
 						return Stream.of(
 								new EquipmentSlot(equipment, EquipSlot.HELMET, explicitSlot),
 								new EquipmentSlot(equipment, EquipSlot.CHESTPLATE, explicitSlot),
@@ -96,7 +98,7 @@ protected Slot[] get(Event event, LivingEntity[] source) {
 
 	@Override
 	public boolean isSingle() {
-		return !isArmor && super.isSingle();
+		return isBody || (!isArmor && super.isSingle());
 	}
 
 	@Override
diff --git a/src/main/java/ch/njol/skript/expressions/ExprArrowKnockbackStrength.java b/src/main/java/ch/njol/skript/expressions/ExprArrowKnockbackStrength.java
index 3127327d580..3c72322131b 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprArrowKnockbackStrength.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprArrowKnockbackStrength.java
@@ -1,22 +1,3 @@
-/**
- * This file is part of Skript.
- *
- * Skript is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Skript is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import org.bukkit.entity.AbstractArrow;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprArrowPierceLevel.java b/src/main/java/ch/njol/skript/expressions/ExprArrowPierceLevel.java
index 0f0f777234c..1e6e205dc90 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprArrowPierceLevel.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprArrowPierceLevel.java
@@ -1,22 +1,3 @@
-/**
- * This file is part of Skript.
- *
- * Skript is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Skript is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import org.bukkit.entity.Arrow;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprArrowsStuck.java b/src/main/java/ch/njol/skript/expressions/ExprArrowsStuck.java
index 5154ef23db4..edf02dcd851 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprArrowsStuck.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprArrowsStuck.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import org.bukkit.entity.LivingEntity;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprAttachedBlock.java b/src/main/java/ch/njol/skript/expressions/ExprAttachedBlock.java
index 19ae309cca9..5eab6b5d8a6 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprAttachedBlock.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprAttachedBlock.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import ch.njol.skript.Skript;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprAttackCooldown.java b/src/main/java/ch/njol/skript/expressions/ExprAttackCooldown.java
index 9d58cfe0ebd..a2a7663a137 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprAttackCooldown.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprAttackCooldown.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import ch.njol.skript.doc.Description;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprAttacked.java b/src/main/java/ch/njol/skript/expressions/ExprAttacked.java
index 61e7b6e67d7..5b2ed4e51cb 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprAttacked.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprAttacked.java
@@ -1,25 +1,9 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import java.lang.reflect.Array;
 
+import ch.njol.skript.lang.EventRestrictedSyntax;
+import ch.njol.util.coll.CollectionUtils;
 import org.bukkit.entity.Entity;
 import org.bukkit.event.Event;
 import org.bukkit.event.entity.EntityDamageEvent;
@@ -54,7 +38,7 @@
 	"\tdamage the attacked by 1 heart"})
 @Since("1.3, 2.6.1 (projectile hit event)")
 @Events({"damage", "death", "projectile hit"})
-public class ExprAttacked extends SimpleExpression<Entity> {
+public class ExprAttacked extends SimpleExpression<Entity> implements EventRestrictedSyntax {
 
 	private static final boolean SUPPORT_PROJECTILE_HIT = Skript.methodExists(ProjectileHitEvent.class, "getHitEntity");
 
@@ -67,11 +51,6 @@ public class ExprAttacked extends SimpleExpression<Entity> {
 
 	@Override
 	public boolean init(Expression<?>[] vars, int matchedPattern, Kleenean isDelayed, ParseResult parser) {
-		if (!getParser().isCurrentEvent(EntityDamageEvent.class, EntityDeathEvent.class, VehicleDamageEvent.class, VehicleDestroyEvent.class, ProjectileHitEvent.class)
-			|| !SUPPORT_PROJECTILE_HIT && getParser().isCurrentEvent(ProjectileHitEvent.class)) {
-			Skript.error("The expression 'victim' can only be used in a damage" + (SUPPORT_PROJECTILE_HIT ? ", death, or projectile hit" : " or death") + " event");
-			return false;
-		}
 		String type = parser.regexes.size() == 0 ? null : parser.regexes.get(0).group();
 		if (type == null) {
 			this.type = EntityData.fromClass(Entity.class);
@@ -86,6 +65,12 @@ public boolean init(Expression<?>[] vars, int matchedPattern, Kleenean isDelayed
 		return true;
 	}
 
+	@Override
+	public Class<? extends Event>[] supportedEvents() {
+		return CollectionUtils.array(EntityDamageEvent.class, EntityDeathEvent.class,
+			VehicleDamageEvent.class, VehicleDestroyEvent.class, ProjectileHitEvent.class);
+	}
+
 	@Override
 	@Nullable
 	protected Entity[] get(Event e) {
diff --git a/src/main/java/ch/njol/skript/expressions/ExprAttacker.java b/src/main/java/ch/njol/skript/expressions/ExprAttacker.java
index db2e689f7a1..bf1e6d9f20e 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprAttacker.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprAttacker.java
@@ -1,23 +1,7 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
+import ch.njol.skript.lang.EventRestrictedSyntax;
+import ch.njol.util.coll.CollectionUtils;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Projectile;
 import org.bukkit.event.Event;
@@ -54,7 +38,7 @@
 		"	damage victim by 1 heart"})
 @Since("1.3")
 @Events({"damage", "death", "destroy"})
-public class ExprAttacker extends SimpleExpression<Entity> {
+public class ExprAttacker extends SimpleExpression<Entity> implements EventRestrictedSyntax {
 
 	static {
 		Skript.registerExpression(ExprAttacker.class, Entity.class, ExpressionType.SIMPLE, "[the] (attacker|damager)");
@@ -62,13 +46,15 @@ public class ExprAttacker extends SimpleExpression<Entity> {
 	
 	@Override
 	public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelayed, ParseResult parser) {
-		if (!getParser().isCurrentEvent(EntityDamageEvent.class, EntityDeathEvent.class, VehicleDamageEvent.class, VehicleDestroyEvent.class)) {
-			Skript.error("Cannot use 'attacker' outside of a damage/death/destroy event", ErrorQuality.SEMANTIC_ERROR);
-			return false;
-		}
 		return true;
 	}
-	
+
+	@Override
+	public Class<? extends Event>[] supportedEvents() {
+		return CollectionUtils.array(EntityDamageEvent.class, EntityDeathEvent.class,
+			VehicleDamageEvent.class, VehicleDestroyEvent.class);
+	}
+
 	@Override
 	protected Entity[] get(Event e) {
 		return new Entity[] {getAttacker(e)};
diff --git a/src/main/java/ch/njol/skript/expressions/ExprBannerItem.java b/src/main/java/ch/njol/skript/expressions/ExprBannerItem.java
new file mode 100644
index 00000000000..d078d637e57
--- /dev/null
+++ b/src/main/java/ch/njol/skript/expressions/ExprBannerItem.java
@@ -0,0 +1,146 @@
+package ch.njol.skript.expressions;
+
+import ch.njol.skript.Skript;
+import ch.njol.skript.aliases.ItemType;
+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.Literal;
+import ch.njol.skript.lang.SkriptParser.ParseResult;
+import ch.njol.skript.lang.util.SimpleExpression;
+import ch.njol.util.Kleenean;
+import org.bukkit.Bukkit;
+import org.bukkit.Material;
+import org.bukkit.NamespacedKey;
+import org.bukkit.Registry;
+import org.bukkit.block.banner.PatternType;
+import org.bukkit.event.Event;
+import org.jetbrains.annotations.Nullable;
+
+import java.lang.reflect.InvocationTargetException;
+import java.util.*;
+
+@Name("Banner Pattern Item")
+@Description({
+	"Gets the item from a banner pattern type.",
+	"Note that not all banner pattern types have an item.",
+})
+@Examples({
+	"set {_item} to creeper charged banner pattern item",
+	"set {_item} to snout banner pattern item",
+	"set {_item} to thing banner pattern item"
+})
+@Since("2.10")
+public class ExprBannerItem extends SimpleExpression<ItemType> {
+
+	private static final Map<Object, Material> bannerMaterials = new HashMap<>();
+	private static boolean PATTERN_TYPE_IS_REGISTRY = false;
+
+	static {
+		Registry<PatternType> patternRegistry = Bukkit.getRegistry(PatternType.class);
+		Object[] bannerPatterns;
+		if (patternRegistry != null) {
+			bannerPatterns = patternRegistry.stream().toArray();
+			PATTERN_TYPE_IS_REGISTRY = true;
+		} else {
+			try {
+				Class<?> patternClass = Class.forName("org.bukkit.block.banner.PatternType");
+				if (patternClass.isEnum()) {
+					//noinspection unchecked,rawtypes
+					Class<? extends Enum> enumClass = (Class<? extends Enum>) patternClass;
+					bannerPatterns = enumClass.getEnumConstants();
+				} else {
+					throw new IllegalStateException("PatternType is neither an enum nor a valid registry.");
+				}
+			} catch (ClassNotFoundException e) {
+				throw new RuntimeException(e);
+			}
+		}
+		if (bannerPatterns != null) {
+			for (Object object : bannerPatterns) {
+				Material material = getMaterial(object);
+				if (material != null)
+					bannerMaterials.put(object, material);
+			}
+			Skript.registerExpression(ExprBannerItem.class, ItemType.class, ExpressionType.COMBINED,
+				"[a[n]] %*bannerpatterntypes% item[s]");
+		}
+	}
+
+	private PatternType[] patternTypes;
+	private Literal<PatternType> literalPattern;
+
+	@Override
+	public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelayed, ParseResult parseResult) {
+		//noinspection unchecked
+		literalPattern = (Literal<PatternType>) exprs[0];
+		patternTypes = literalPattern.getArray();
+		for (PatternType type : patternTypes) {
+			if (!bannerMaterials.containsKey(type)) {
+				Skript.error("There is no item for the banner pattern type '" + type + "'.");
+				return false;
+			}
+		}
+		return true;
+	}
+
+	@Override
+	protected ItemType @Nullable [] get(Event event) {
+		List<ItemType> itemTypes = new ArrayList<>();
+		for (PatternType type : patternTypes) {
+			Material material = bannerMaterials.get(type);
+			ItemType itemType = new ItemType(material);
+			itemTypes.add(itemType);
+		}
+		return itemTypes.toArray(new ItemType[0]);
+	}
+
+	@Override
+	public boolean isSingle() {
+		return literalPattern.isSingle();
+	}
+
+	@Override
+	public Class<ItemType> getReturnType() {
+		return ItemType.class;
+	}
+
+	@Override
+	public String toString(@Nullable Event event, boolean debug) {
+		return literalPattern.toString(event, debug) + " items";
+	}
+
+	private static @Nullable Material getMaterial(Object object) {
+		if (!(object instanceof PatternType patternType))
+			return null;
+		String key = null;
+		try {
+			if (PATTERN_TYPE_IS_REGISTRY) {
+				NamespacedKey namespacedKey = (NamespacedKey) PatternType.class.getMethod("getKey").invoke(patternType);
+				if (namespacedKey != null)
+					key = namespacedKey.getKey().toUpperCase(Locale.ENGLISH);
+			} else {
+				key = (String) PatternType.class.getMethod("toString").invoke(patternType);
+			}
+		} catch (InvocationTargetException | NoSuchMethodException | IllegalAccessException e) {
+			throw new RuntimeException(e);
+		}
+		if (key == null)
+			return null;
+		Material material = Material.getMaterial(key +  "_BANNER_PATTERN");
+		return material != null ? material : checkAlias(patternType);
+	}
+
+	private static @Nullable Material checkAlias(PatternType patternType) {
+		if (patternType == PatternType.BRICKS && Material.getMaterial("FIELD_MASONED_BANNER_PATTERN") != null) {
+			return Material.FIELD_MASONED_BANNER_PATTERN;
+		} else if (patternType == PatternType.BORDER && Material.getMaterial("BORDURE_INDENTED_BANNER_PATTER") != null) {
+			return Material.BORDURE_INDENTED_BANNER_PATTERN;
+		}
+		return null;
+	}
+
+}
diff --git a/src/main/java/ch/njol/skript/expressions/ExprBannerPatterns.java b/src/main/java/ch/njol/skript/expressions/ExprBannerPatterns.java
new file mode 100644
index 00000000000..51ddc892828
--- /dev/null
+++ b/src/main/java/ch/njol/skript/expressions/ExprBannerPatterns.java
@@ -0,0 +1,281 @@
+package ch.njol.skript.expressions;
+
+import ch.njol.skript.Skript;
+import ch.njol.skript.aliases.ItemType;
+import ch.njol.skript.bukkitutil.ItemUtils;
+import ch.njol.skript.classes.Changer.ChangeMode;
+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.expressions.base.PropertyExpression;
+import ch.njol.skript.lang.Expression;
+import ch.njol.skript.lang.ExpressionType;
+import ch.njol.skript.lang.SkriptParser.ParseResult;
+import ch.njol.skript.lang.SyntaxStringBuilder;
+import ch.njol.skript.util.slot.Slot;
+import ch.njol.util.Kleenean;
+import ch.njol.util.coll.CollectionUtils;
+import org.bukkit.DyeColor;
+import org.bukkit.block.Banner;
+import org.bukkit.block.Block;
+import org.bukkit.block.banner.Pattern;
+import org.bukkit.block.banner.PatternType;
+import org.bukkit.event.Event;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.meta.BannerMeta;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.function.Consumer;
+
+@Name("Banner Patterns")
+@Description({
+	"Gets or sets the banner patterns of a banner.",
+	"In order to set a specific position of a banner, there needs to be that many patterns already on the banner.",
+	"This expression will add filler patterns to the banner to allow the specified position to be set.",
+	"For Example, setting the 3rd banner pattern of a banner that has no patterns on it, will internally add 3 base patterns, "
+	+ "allowing the 3rd banner pattern to be set."
+})
+@Examples({
+	"broadcast banner patterns of {_banneritem}",
+	"broadcast 1st banner pattern of block at location(0,0,0)",
+	"clear banner patterns of {_banneritem}"
+})
+@Since("2.10")
+public class ExprBannerPatterns extends PropertyExpression<Object, Pattern> {
+
+	static {
+		Skript.registerExpression(ExprBannerPatterns.class, Pattern.class, ExpressionType.PROPERTY,
+			"[all [[of] the]|the] banner pattern[s] of %itemstacks/itemtypes/slots/blocks%",
+			"%itemstacks/itemtypes/slots/blocks%'[s] banner pattern[s]",
+			"[the] %integer%[st|nd|rd|th] [banner] pattern of %itemstacks/itemtypes/slots/blocks%",
+			"%itemstacks/itemtypes/slots/blocks%'[s] %integer%[st|nd|rd|th] [banner] pattern"
+		);
+	}
+
+	private Expression<?> objects;
+	private Expression<Integer> patternNumber = null;
+
+	@Override
+	public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelayed, ParseResult parseResult) {
+		if (matchedPattern <= 1) {
+			objects = exprs[0];
+		} else if (matchedPattern == 2) {
+			//noinspection unchecked
+			patternNumber = (Expression<Integer>) exprs[0];
+			objects = exprs[1];
+		} else {
+			//noinspection unchecked
+			patternNumber = (Expression<Integer>) exprs[1];
+			objects = exprs[0];
+		}
+		setExpr(objects);
+		return true;
+	}
+
+	@Override
+	protected Pattern @Nullable [] get(Event event, Object[] source) {
+		List<Pattern> patterns = new ArrayList<>();
+		Integer placement = patternNumber != null ? patternNumber.getSingle(event) : null;
+		for (Object object : objects.getArray(event)) {
+			if (object instanceof Block block) {
+				if (!(block.getState() instanceof Banner banner))
+					continue;
+				if (placement != null && banner.numberOfPatterns() >= placement) {
+					patterns.add(banner.getPattern(placement - 1));
+				} else if (placement == null) {
+					patterns.addAll(banner.getPatterns());
+				}
+			} else {
+				ItemStack itemStack = ItemUtils.asItemStack(object);
+				if (itemStack == null || !(itemStack.getItemMeta() instanceof BannerMeta bannerMeta))
+					continue;
+				if (placement != null && bannerMeta.numberOfPatterns() >= placement) {
+					patterns.add(bannerMeta.getPattern(placement - 1));
+				} else if (placement == null) {
+					patterns.addAll(bannerMeta.getPatterns());
+				}
+			}
+		}
+		return patterns.toArray(new Pattern[0]);
+	}
+
+	/**
+	 * Gets the appropriate {@link Consumer<BannerMeta>} to be used within {@link #change(Event, Object[], ChangeMode)}.
+	 * @param mode The {@link ChangeMode} to get the consumer matching the behavior
+	 * @param placement The specific pattern to set {@code pattern}
+	 * @param pattern The pattern to be applied
+	 * @return {@link Consumer<BannerMeta>} to be applied to objects within {@link #change(Event, Object[], ChangeMode)}
+	 */
+	private Consumer<BannerMeta> getPlacementMetaChanger(ChangeMode mode, int placement, @Nullable Pattern pattern) {
+		return switch (mode) {
+			case SET -> bannerMeta -> {
+				if (bannerMeta.numberOfPatterns() < placement) {
+					int toAdd = placement - bannerMeta.numberOfPatterns();
+					for (int i = 0; i < toAdd; i++) {
+						bannerMeta.addPattern(new Pattern(DyeColor.WHITE, PatternType.BASE));
+					}
+				}
+				bannerMeta.setPattern(placement - 1, pattern);
+			};
+			case DELETE -> bannerMeta -> {
+				if (bannerMeta.numberOfPatterns() >= placement)
+					bannerMeta.removePattern(placement - 1);
+			};
+			default -> bannerMeta -> {};
+		};
+	}
+
+	/**
+	 * Gets the appropriate {@link Consumer<Banner>} to be used within {@link #change(Event, Object[], ChangeMode)}.
+	 * @param mode The {@link ChangeMode} to get the consumer matching the behavior
+	 * @param placement The specific pattern to set {@code pattern}
+	 * @param pattern The pattern to be applied
+	 * @return {@link Consumer<Banner>} to be applied to objects within {@link #change(Event, Object[], ChangeMode)}
+	 */
+	private Consumer<Banner> getPlacementBlockChanger(ChangeMode mode, int placement, @Nullable Pattern pattern) {
+		return switch (mode) {
+			case SET -> banner -> {
+				if (banner.numberOfPatterns() < placement) {
+					int toAdd = placement - banner.numberOfPatterns();
+					for (int i = 0; i < toAdd; i++) {
+						banner.addPattern(new Pattern(DyeColor.GRAY, PatternType.BASE));
+					}
+				}
+				banner.setPattern(placement - 1, pattern);
+			};
+			case DELETE -> banner -> {
+				if (banner.numberOfPatterns() >= placement)
+					banner.removePattern(placement - 1);
+			};
+			default -> banner -> {};
+		};
+	}
+
+	/**
+	 * Gets the appropriate {@link Consumer<BannerMeta>} to be used within {@link #change(Event, Object[], ChangeMode)}.
+	 * @param mode The {@link ChangeMode} to get the consumer matching the behavior
+	 * @param patterns Patterns to be added, removed, or set to corresponding with the {@code mode}
+	 * @return {@link Consumer<BannerMeta>} to be applied to objects within {@link #change(Event, Object[], ChangeMode)}
+	 */
+	private Consumer<BannerMeta> getAllMetaChanger(ChangeMode mode, List<Pattern> patterns) {
+		return switch (mode) {
+			case SET -> bannerMeta -> {
+				bannerMeta.setPatterns(patterns);
+			};
+			case DELETE -> bannerMeta -> {
+				bannerMeta.setPatterns(new ArrayList<>());
+			};
+			case ADD -> bannerMeta -> {
+				patterns.forEach(bannerMeta::addPattern);
+			};
+			case REMOVE -> bannerMeta -> {
+				List<Pattern> current = bannerMeta.getPatterns();
+				current.removeAll(patterns);
+				bannerMeta.setPatterns(current);
+			};
+			default -> bannerMeta -> {};
+		};
+	}
+
+	/**
+	 * Gets the appropriate {@link Consumer<Banner>} to be used within {@link #change(Event, Object[], ChangeMode)}.
+	 * @param mode The {@link ChangeMode} to get the consumer matching the behavior
+	 * @param patterns Patterns to be added, removed, or set to corresponding with the {@code mode}
+	 * @return {@link Consumer<Banner>} to be applied to objects within {@link #change(Event, Object[], ChangeMode)}
+	 */
+	private Consumer<Banner> getAllBlockChanger(ChangeMode mode, List<Pattern> patterns) {
+		return switch (mode) {
+			case SET -> banner -> {
+				banner.setPatterns(patterns);
+			};
+			case DELETE -> banner -> {
+				banner.setPatterns(new ArrayList<>());
+			};
+			case ADD -> banner -> {
+				patterns.forEach(banner::addPattern);
+			};
+			case REMOVE -> banner -> {
+				List<Pattern> current = banner.getPatterns();
+				current.removeAll(patterns);
+				banner.setPatterns(current);
+			};
+			default -> banner -> {};
+		};
+	}
+
+	@Override
+	public Class<?> @Nullable [] acceptChange(ChangeMode mode) {
+		return switch (mode) {
+			case SET, DELETE -> (patternNumber != null) ? CollectionUtils.array(Pattern.class) : CollectionUtils.array(Pattern[].class);
+			case REMOVE, ADD -> (patternNumber != null) ? null : CollectionUtils.array(Pattern[].class);
+			default -> null;
+		};
+	}
+
+	@Override
+	public void change(Event event, Object @Nullable [] delta, ChangeMode mode) {
+		Pattern[] patterns = (Pattern[]) delta;
+		int placement = patternNumber == null ? 0 : patternNumber.getSingle(event);
+		List<Pattern> patternList = patterns != null ? Arrays.stream(patterns).toList() : new ArrayList<>();
+
+		Consumer<BannerMeta> metaChanger = null;
+		Consumer<Banner> blockChanger = null;
+
+		if (placement >= 1) {
+			Pattern pattern = patternList.size() == 1 ? patternList.get(0) : null;
+			metaChanger = getPlacementMetaChanger(mode, placement, pattern);
+			blockChanger = getPlacementBlockChanger(mode, placement, pattern);
+		} else {
+			metaChanger = getAllMetaChanger(mode, patternList);
+			blockChanger = getAllBlockChanger(mode, patternList);
+		}
+
+		for (Object object : objects.getArray(event)) {
+			if (object instanceof Block block && block.getState() instanceof Banner banner) {
+				blockChanger.accept(banner);
+				banner.update(true, false);
+			} else {
+				ItemStack itemStack = ItemUtils.asItemStack(object);
+				if (itemStack == null || !(itemStack.getItemMeta() instanceof BannerMeta bannerMeta))
+					continue;
+				metaChanger.accept(bannerMeta);
+				itemStack.setItemMeta(bannerMeta);
+				if (object instanceof Slot slot) {
+					slot.setItem(itemStack);
+				} else if (object instanceof ItemType itemType) {
+					itemType.setItemMeta(bannerMeta);
+				} else if (object instanceof ItemStack itemStack1) {
+					itemStack1.setItemMeta(bannerMeta);
+				}
+			}
+		}
+
+	}
+
+	@Override
+	public boolean isSingle() {
+		return patternNumber != null && getExpr().isSingle();
+	}
+
+	@Override
+	public Class<Pattern> getReturnType() {
+		return Pattern.class;
+	}
+
+	@Override
+	public String toString(@Nullable Event event, boolean debug) {
+		SyntaxStringBuilder builder = new SyntaxStringBuilder(event, debug);
+		if (patternNumber != null) {
+			builder.append("banner pattern", patternNumber);
+		} else {
+			builder.append("banner patterns");
+		}
+		builder.append("of", objects);
+		return builder.toString();
+	}
+
+}
diff --git a/src/main/java/ch/njol/skript/expressions/ExprBarterDrops.java b/src/main/java/ch/njol/skript/expressions/ExprBarterDrops.java
new file mode 100644
index 00000000000..f04ade3ac40
--- /dev/null
+++ b/src/main/java/ch/njol/skript/expressions/ExprBarterDrops.java
@@ -0,0 +1,132 @@
+package ch.njol.skript.expressions;
+
+import ch.njol.skript.Skript;
+import ch.njol.skript.aliases.ItemType;
+import ch.njol.skript.classes.Changer.ChangeMode;
+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.SkriptParser.ParseResult;
+import ch.njol.skript.lang.util.SimpleExpression;
+import ch.njol.util.Kleenean;
+import ch.njol.util.coll.CollectionUtils;
+import org.bukkit.event.Event;
+import org.bukkit.event.entity.PiglinBarterEvent;
+import org.bukkit.inventory.ItemStack;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.List;
+
+@Name("Barter Drops")
+@Description("The items dropped by the piglin in a piglin bartering event.")
+@Examples({
+	"on piglin barter:",
+		"\tif the bartering drops contain a jack-o-lantern:",
+			"\t\tremove jack-o-lantern from bartering output",
+			"\t\tbroadcast \"it's not halloween yet!\""
+})
+@Since("2.10")
+public class ExprBarterDrops extends SimpleExpression<ItemType> {
+	
+	static {
+		if (Skript.classExists("org.bukkit.event.entity.PiglinBarterEvent")) {
+			Skript.registerExpression(ExprBarterDrops.class, ItemType.class,
+					ExpressionType.SIMPLE, "[the] [piglin] barter[ing] drops");
+		}
+	}
+
+	private Kleenean delay;
+
+	@Override
+	public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelayed, ParseResult result) {
+		if (!getParser().isCurrentEvent(PiglinBarterEvent.class)) {
+			Skript.error("The expression 'barter drops' can only be used in the piglin bartering event");
+			return false;
+		}
+
+		delay = isDelayed;
+
+		return true;
+	}
+	
+	@Override
+	@Nullable
+	protected ItemType[] get(Event event) {
+		if (!(event instanceof PiglinBarterEvent))
+			return null;
+
+		return ((PiglinBarterEvent) event).getOutcome()
+			.stream()
+			.map(ItemType::new)
+			.toArray(ItemType[]::new);
+	}
+
+	@Override
+	public Class<?> @Nullable [] acceptChange(ChangeMode mode) {
+		if (!delay.isFalse()) {
+			Skript.error("Can't change the piglin bartering drops after the event has already passed");
+			return null;
+		}
+
+		switch (mode) {
+			case SET:
+			case ADD:
+			case REMOVE:
+			case REMOVE_ALL:
+			case DELETE:
+				return CollectionUtils.array(ItemType[].class);
+			default:
+				return null;
+		}
+	}
+
+	@Override
+	public void change(Event event, Object @Nullable [] delta, ChangeMode mode) {
+		if (!(event instanceof PiglinBarterEvent))
+			return;
+
+		List<ItemStack> outcome = ((PiglinBarterEvent) event).getOutcome();
+
+		switch (mode) {
+			case SET:
+				outcome.clear();
+			case ADD:
+				for (Object item : delta) {
+					((ItemType) item).addTo(outcome);
+				}
+				break;
+			case REMOVE:
+				for (Object item : delta) {
+					((ItemType) item).removeFrom(false, outcome);
+				}
+				break;
+			case REMOVE_ALL:
+				for (Object item : delta) {
+					((ItemType) item).removeAll(false, outcome);
+				}
+				break;
+			case DELETE:
+				outcome.clear();
+				break;
+		}
+	}
+
+	@Override
+	public boolean isSingle() {
+		return false;
+	}
+
+	@Override
+	public Class<? extends ItemType> getReturnType() {
+		return ItemType.class;
+	}
+
+	@Override
+	public String toString(@Nullable Event event, boolean debug) {
+		return "the barter drops";
+	}
+
+}
diff --git a/src/main/java/ch/njol/skript/expressions/ExprBarterInput.java b/src/main/java/ch/njol/skript/expressions/ExprBarterInput.java
new file mode 100644
index 00000000000..d780058817e
--- /dev/null
+++ b/src/main/java/ch/njol/skript/expressions/ExprBarterInput.java
@@ -0,0 +1,68 @@
+package ch.njol.skript.expressions;
+
+import ch.njol.skript.Skript;
+import ch.njol.skript.aliases.ItemType;
+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.SkriptParser.ParseResult;
+import ch.njol.skript.lang.util.SimpleExpression;
+import ch.njol.util.Kleenean;
+import org.bukkit.event.Event;
+import org.bukkit.event.entity.PiglinBarterEvent;
+import org.jetbrains.annotations.Nullable;
+
+@Name("Barter Input")
+@Description("The item picked up by the piglin in a piglin bartering event.")
+@Examples({
+	"on piglin barter:",
+		"\tif the bartering input is a gold ingot:",
+			"\t\tbroadcast \"my precious...\""
+})
+@Since("2.10")
+public class ExprBarterInput extends SimpleExpression<ItemType> {
+
+	static {
+		if (Skript.classExists("org.bukkit.event.entity.PiglinBarterEvent")) {
+			Skript.registerExpression(ExprBarterInput.class, ItemType.class,
+					ExpressionType.SIMPLE, "[the] [piglin] barter[ing] input");
+		}
+	}
+
+	@Override
+	public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelayed, ParseResult result) {
+		if (!getParser().isCurrentEvent(PiglinBarterEvent.class)) {
+			Skript.error("The expression 'barter input' can only be used in the piglin bartering event");
+			return false;
+		}
+		return true;
+	}
+
+	@Override
+	@Nullable
+	protected ItemType[] get(Event event) {
+		if (!(event instanceof PiglinBarterEvent))
+			return null;
+
+		return new ItemType[] { new ItemType(((PiglinBarterEvent) event).getInput()) };
+	}
+
+	@Override
+	public boolean isSingle() {
+		return true;
+	}
+
+	@Override
+	public Class<? extends ItemType> getReturnType() {
+		return ItemType.class;
+	}
+
+	@Override
+	public String toString(@Nullable Event event, boolean debug) {
+		return "the barter input";
+	}
+
+}
diff --git a/src/main/java/ch/njol/skript/expressions/ExprBeaconValues.java b/src/main/java/ch/njol/skript/expressions/ExprBeaconValues.java
new file mode 100644
index 00000000000..887a0a0cc56
--- /dev/null
+++ b/src/main/java/ch/njol/skript/expressions/ExprBeaconValues.java
@@ -0,0 +1,206 @@
+package ch.njol.skript.expressions;
+
+import ch.njol.skript.Skript;
+import ch.njol.skript.classes.Changer.ChangeMode;
+import ch.njol.skript.doc.*;
+import ch.njol.skript.expressions.base.EventValueExpression;
+import ch.njol.skript.expressions.base.PropertyExpression;
+import ch.njol.skript.lang.Expression;
+import ch.njol.skript.lang.ExpressionType;
+import ch.njol.skript.lang.SkriptParser.ParseResult;
+import ch.njol.util.Kleenean;
+import ch.njol.util.Math2;
+import ch.njol.util.coll.CollectionUtils;
+import com.destroystokyo.paper.event.block.BeaconEffectEvent;
+import io.papermc.paper.event.block.BeaconActivatedEvent;
+import io.papermc.paper.event.block.BeaconDeactivatedEvent;
+import io.papermc.paper.event.player.PlayerChangeBeaconEffectEvent;
+import org.bukkit.block.Beacon;
+import org.bukkit.block.Block;
+import org.bukkit.event.Event;
+import org.bukkit.potion.PotionEffectType;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.function.Consumer;
+
+@Name("Beacon Effects")
+@Description({
+	"The active effects of a beacon.",
+	"The secondary effect can be set to anything, but the icon in the GUI will not display correctly.",
+	"The secondary effect can only be set when the beacon is at max tier.",
+	"The primary and secondary effect can not be the same, primary will always retain the potion type and secondary will be cleared.",
+	"You can only change the range on Paper."
+})
+@Examples({
+	"broadcast tier of {_block}",
+	"set primary beacon effect of {_block} to haste",
+	"add 1 to range of {_block}"
+})
+@RequiredPlugins("Paper (range)")
+@Events({"Beacon Effect", "Beacon Toggle", "Beacon Change Effect"})
+@Since("2.10")
+public class ExprBeaconValues extends PropertyExpression<Block, Object> {
+
+	enum BeaconValues {
+		PRIMARY("primary [beacon] effect"),
+		SECONDARY("secondary [beacon] effect"),
+		RANGE("[beacon] range"),
+		TIER("[beacon] tier");
+
+		private final String pattern;
+
+		BeaconValues(String pattern) {
+			this.pattern = pattern;
+		}
+	}
+
+	private static final boolean SUPPORTS_CHANGE_EVENT = Skript.classExists("io.papermc.paper.event.player.PlayerChangeBeaconEffectEvent");
+	private static final boolean SUPPORTS_RANGE = Skript.methodExists(Beacon.class, "getEffectRange");
+	private static BeaconValues[] beaconValues = BeaconValues.values();
+
+	static {
+		String patternEnding = " of %blocks%";
+		if (SUPPORTS_CHANGE_EVENT)
+			patternEnding = " [of %blocks%]";
+		int size = beaconValues.length;
+		String[] patterns = new String[size * 2];
+		for (BeaconValues value : beaconValues) {
+			patterns[2 * value.ordinal()] = "%blocks%['s] " + value.pattern;
+			patterns[2 * value.ordinal() + 1] = "[the] " + value.pattern + patternEnding;
+		}
+
+		Skript.registerExpression(ExprBeaconValues.class, Object.class, ExpressionType.PROPERTY, patterns);
+	}
+
+	private BeaconValues valueType;
+	private boolean isEffect;
+
+	@Override
+	public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelayed, ParseResult parseResult) {
+		valueType = beaconValues[(int) Math2.floor(matchedPattern/2)];
+		if (valueType == BeaconValues.RANGE && !SUPPORTS_RANGE) {
+			Skript.error(valueType.pattern + " can only be used on Paper.");
+			return false;
+		}
+		if (exprs[0] != null) {
+			setExpr((Expression<Block>) exprs[0]);
+		} else {
+			if (!getParser().isCurrentEvent(PlayerChangeBeaconEffectEvent.class, BeaconEffectEvent.class, BeaconActivatedEvent.class, BeaconDeactivatedEvent.class)) {
+				Skript.error("There is no beacon in a " + getParser().getCurrentEventName() + " event.");
+				return false;
+			}
+			setExpr(new EventValueExpression<>(Block.class));
+		}
+		if (valueType == BeaconValues.PRIMARY || valueType == BeaconValues.SECONDARY)
+			isEffect = true;
+
+		return true;
+	}
+
+	@Override
+	protected Object @Nullable [] get(Event event, Block[] source) {
+		return get(source, block -> {
+			Beacon beacon  = (Beacon) block.getState();
+			return switch (valueType) {
+				case PRIMARY -> {
+					if (SUPPORTS_CHANGE_EVENT && event instanceof PlayerChangeBeaconEffectEvent changeEvent) {
+						yield changeEvent.getPrimary();
+					} else if (beacon.getPrimaryEffect() != null) {
+						yield beacon.getPrimaryEffect().getType();
+					}
+					yield null;
+				}
+				case SECONDARY-> {
+					if (SUPPORTS_CHANGE_EVENT && event instanceof PlayerChangeBeaconEffectEvent changeEvent) {
+						yield changeEvent.getSecondary();
+					} else if (beacon.getSecondaryEffect() != null) {
+						yield beacon.getSecondaryEffect().getType();
+					}
+					yield null;
+				}
+				case RANGE -> beacon.getEffectRange();
+				case TIER -> beacon.getTier();
+			};
+		});
+	}
+
+	@Override
+	public Class<?> @Nullable [] acceptChange(ChangeMode mode) {
+		if (mode != ChangeMode.REMOVE_ALL && valueType != BeaconValues.TIER) {
+			if (!isEffect || (isEffect && (mode != ChangeMode.ADD && mode != ChangeMode.REMOVE))) {
+				return CollectionUtils.array(Object.class);
+			}
+		}
+		return null;
+	}
+
+	@Override
+	public void change(Event event, Object @Nullable [] delta, ChangeMode mode) {
+		PotionEffectType providedEffect = null;
+		double providedRange = 0;
+		if (delta != null && delta[0] != null) {
+			if (isEffect && delta[0] instanceof PotionEffectType potionEffectType) {
+				providedEffect = potionEffectType;
+			} else if (valueType == BeaconValues.RANGE) {
+				providedRange = (double) ((long) delta[0]);
+			}
+		}
+		switch (valueType) {
+			case RANGE -> changeRange(event, providedRange, mode);
+			case PRIMARY -> changePrimary(event, providedEffect, mode);
+			case SECONDARY -> changeSecondary(event, providedEffect, mode);
+		}
+	}
+
+	private void changeBeacons(Event event, Consumer<Beacon> changer) {
+		for (Block block : getExpr().getArray(event)) {
+			Beacon beacon = (Beacon) block.getState();
+			changer.accept(beacon);
+			beacon.update(true);
+		}
+	}
+
+	private void changeRange(Event event, double providedRange, ChangeMode mode) {
+		switch (mode) {
+			case ADD -> changeBeacons(event, beacon -> beacon.setEffectRange(Math2.fit(0, beacon.getEffectRange() + providedRange, Integer.MAX_VALUE)));
+			case REMOVE -> changeBeacons(event, beacon -> beacon.setEffectRange(Math2.fit(0, beacon.getEffectRange() - providedRange, Integer.MAX_VALUE)));
+			case SET -> changeBeacons(event, beacon -> beacon.setEffectRange(Math2.fit(0, providedRange, Integer.MAX_VALUE)));
+			case DELETE, RESET -> changeBeacons(event, Beacon::resetEffectRange);
+		}
+	}
+
+	private void changePrimary(Event event, PotionEffectType providedEffect, ChangeMode mode) {
+		switch (mode) {
+			case SET -> changeBeacons(event, beacon -> beacon.setPrimaryEffect(providedEffect));
+			case DELETE, RESET -> changeBeacons(event, beacon -> beacon.setPrimaryEffect(null));
+		}
+	}
+
+	private void changeSecondary(Event event, PotionEffectType providedEffect, ChangeMode mode) {
+		switch (mode) {
+			case SET -> changeBeacons(event, beacon -> beacon.setSecondaryEffect(providedEffect));
+			case DELETE, RESET -> changeBeacons(event, beacon -> beacon.setSecondaryEffect(null));
+		}
+	}
+
+	@Override
+	public boolean isSingle() {
+		return getExpr().isSingle();
+	}
+
+	@Override
+	public Class<Object> getReturnType() {
+		return Object.class;
+	}
+
+	@Override
+	public String toString(@Nullable Event event, boolean debug) {
+		return switch (valueType) {
+			case PRIMARY -> "primary beacon effect";
+			case SECONDARY -> "secondary beacon effect";
+			case RANGE -> "beacon range";
+			case TIER -> "beacon tier";
+		} + " of " + getExpr().toString(event, debug);
+	}
+
+}
diff --git a/src/main/java/ch/njol/skript/expressions/ExprBed.java b/src/main/java/ch/njol/skript/expressions/ExprBed.java
index cf715b85433..fb01ff66067 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprBed.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprBed.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import ch.njol.skript.classes.Changer.ChangeMode;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprBiome.java b/src/main/java/ch/njol/skript/expressions/ExprBiome.java
index b27bdc3e884..29c00deb662 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprBiome.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprBiome.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import org.bukkit.Location;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprBlock.java b/src/main/java/ch/njol/skript/expressions/ExprBlock.java
index 6777a3bec9b..6b318f55e95 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprBlock.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprBlock.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import org.bukkit.Location;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprBlockData.java b/src/main/java/ch/njol/skript/expressions/ExprBlockData.java
index 1a9401d1439..31a4c9ff86f 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprBlockData.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprBlockData.java
@@ -1,85 +1,76 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
-import org.bukkit.block.Block;
-import org.bukkit.block.data.BlockData;
-import org.bukkit.event.Event;
-import org.jetbrains.annotations.Nullable;
-
 import ch.njol.skript.Skript;
 import ch.njol.skript.classes.Changer.ChangeMode;
 import ch.njol.skript.doc.Description;
 import ch.njol.skript.doc.Examples;
 import ch.njol.skript.doc.Name;
-import ch.njol.skript.doc.RequiredPlugins;
 import ch.njol.skript.doc.Since;
 import ch.njol.skript.expressions.base.SimplePropertyExpression;
 import ch.njol.util.coll.CollectionUtils;
+import org.bukkit.block.Block;
+import org.bukkit.block.data.BlockData;
+import org.bukkit.entity.BlockDisplay;
+import org.bukkit.event.Event;
+import org.jetbrains.annotations.Nullable;
 
 @Name("Block Data")
-@Description("Get the <a href='classes.html#blockdata'>block data</a> associated with a block. This data can also be used to set blocks.")
-@Examples({"set {data} to block data of target block",
-	"set block at player to {data}",
-	"set block data of target block to oak_stairs[facing=south;waterlogged=true]"})
-@RequiredPlugins("Minecraft 1.13+")
-@Since("2.5, 2.5.2 (set)")
-public class ExprBlockData extends SimplePropertyExpression<Block, BlockData> {
-	
+@Description({
+	"Get the <a href='classes.html#blockdata'>block data</a> associated with a block.",
+	"This data can also be used to set blocks."
+})
+@Examples({
+	"set {_data} to block data of target block",
+	"set block at player to {_data}",
+	"",
+	"set block data of target block to oak_stairs[facing=south;waterlogged=true]"
+})
+@Since("2.5, 2.5.2 (set), 2.10 (block displays)")
+public class ExprBlockData extends SimplePropertyExpression<Object, BlockData> {
+
 	static {
-		if (Skript.classExists("org.bukkit.block.data.BlockData"))
-			register(ExprBlockData.class, BlockData.class, "block[ ]data", "blocks");
+		String types = Skript.isRunningMinecraft(1, 19, 4) ? "blocks/displays" : "blocks";
+		register(ExprBlockData.class, BlockData.class, "block[ ]data", types);
 	}
-	
-	@Nullable
+
 	@Override
-	public BlockData convert(Block block) {
-		return block.getBlockData();
+	public @Nullable BlockData convert(Object object) {
+		if (object instanceof Block block)
+			return block.getBlockData();
+		if (object instanceof BlockDisplay blockDisplay)
+			return blockDisplay.getBlock();
+		return null;
+
 	}
-	
-	@Nullable
+
 	@Override
-	public Class<?>[] acceptChange(ChangeMode mode) {
+	public Class<?> @Nullable [] acceptChange(ChangeMode mode) {
 		if (mode == ChangeMode.SET)
 			return CollectionUtils.array(BlockData.class);
 		return null;
 	}
-	
+
 	@Override
-	public void change(Event e, @Nullable Object[] delta, ChangeMode mode) {
-		if (delta == null)
-			return;
-		
+	public void change(Event event, Object @Nullable [] delta, ChangeMode mode) {
+		assert delta != null; // reset/delete not supported
 		BlockData blockData = ((BlockData) delta[0]);
-		for (Block block : getExpr().getArray(e)) {
-			block.setBlockData(blockData);
+		for (Object object : getExpr().getArray(event)) {
+			if (object instanceof Block block) {
+				block.setBlockData(blockData);
+			} else if (object instanceof BlockDisplay blockDisplay) {
+				blockDisplay.setBlock(blockData);
+			}
 		}
 	}
-	
-	@Override
-	protected String getPropertyName() {
-		return "block data";
-	}
-	
+
 	@Override
 	public Class<? extends BlockData> getReturnType() {
 		return BlockData.class;
 	}
-	
+
+	@Override
+	protected String getPropertyName() {
+		return "block data";
+	}
+
 }
diff --git a/src/main/java/ch/njol/skript/expressions/ExprBlockHardness.java b/src/main/java/ch/njol/skript/expressions/ExprBlockHardness.java
index 7d8fb8d0186..74eb4c422a6 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprBlockHardness.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprBlockHardness.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import ch.njol.skript.Skript;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprBlockSound.java b/src/main/java/ch/njol/skript/expressions/ExprBlockSound.java
new file mode 100644
index 00000000000..ab3bd0a7d4c
--- /dev/null
+++ b/src/main/java/ch/njol/skript/expressions/ExprBlockSound.java
@@ -0,0 +1,136 @@
+package ch.njol.skript.expressions;
+
+import ch.njol.skript.aliases.ItemType;
+import ch.njol.skript.bukkitutil.SoundUtils;
+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.expressions.base.SimplePropertyExpression;
+import ch.njol.skript.lang.Expression;
+import ch.njol.skript.lang.SkriptParser.ParseResult;
+import ch.njol.skript.lang.util.SimpleExpression;
+import ch.njol.util.Kleenean;
+import org.bukkit.Sound;
+import org.bukkit.SoundGroup;
+import org.bukkit.block.Block;
+import org.bukkit.block.data.BlockData;
+import org.bukkit.event.Event;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.Objects;
+
+@Name("Block Sound")
+@Description({
+	"Gets the sound that a given block, blockdata, or itemtype will use in a specific scenario.",
+	"This will return a string in the form of \"SOUND_EXAMPLE\", which can be used in the play sound syntax.",
+	"",
+	"Check out <a href=\"https://minecraft.wiki/w/Sounds.json\">this website</a> for a list of sounds in Minecraft, " +
+		"or <a href=\"https://minecraft.wiki/w/Sound\">this one</a> to go to the Sounds wiki page."
+})
+@Examples({
+	"play sound (break sound of dirt) at all players",
+	"set {_sounds::*} to place sounds of dirt, grass block, blue wool and stone"
+})
+@Since("2.10")
+public class ExprBlockSound extends SimpleExpression<String> {
+
+	public enum SoundType {
+		BREAK {
+			@Override
+			public Sound getSound(SoundGroup group) {
+				return group.getBreakSound();
+			}
+		},
+
+		FALL {
+			@Override
+			public Sound getSound(SoundGroup group) {
+				return group.getFallSound();
+			}
+		},
+
+		HIT {
+			@Override
+			public Sound getSound(SoundGroup group) {
+				return group.getHitSound();
+			}
+		},
+
+		PLACE {
+			@Override
+			public Sound getSound(SoundGroup group) {
+				return group.getPlaceSound();
+			}
+		},
+
+		STEP {
+			@Override
+			public Sound getSound(SoundGroup group) {
+				return group.getStepSound();
+			}
+		};
+
+		public abstract @Nullable Sound getSound(SoundGroup group);
+	}
+
+	static {
+		SimplePropertyExpression.register(ExprBlockSound.class, String.class, "(1:break|2:fall|3:hit|4:place|5:step) sound[s]", "blocks/blockdatas/itemtypes");
+	}
+
+	private SoundType soundType;
+	private Expression<?> objects;
+
+	@Override
+	public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelayed, ParseResult parseResult) {
+		soundType = SoundType.values()[parseResult.mark - 1];
+		objects = exprs[0];
+		return true;
+	}
+
+	@Override
+	protected String @Nullable [] get(Event event) {
+		return objects.stream(event)
+			.map(this::convertAndGetSound)
+			.filter(Objects::nonNull)
+			.distinct()
+			.map(sound -> SoundUtils.getKey(sound).getKey())
+			.toArray(String[]::new);
+	}
+
+	private @Nullable SoundGroup getSoundGroup(Object object) {
+		if (object instanceof Block block) {
+			return block.getBlockData().getSoundGroup();
+		} else if (object instanceof BlockData data) {
+			return data.getSoundGroup();
+		} else if (object instanceof ItemType item) {
+			if (item.hasBlock())
+				return item.getMaterial().createBlockData().getSoundGroup();
+		}
+		return null;
+	}
+
+	private @Nullable Sound convertAndGetSound(Object object) {
+		SoundGroup group = getSoundGroup(object);
+		if (group == null)
+			return null;
+		return this.soundType.getSound(group);
+	}
+
+	@Override
+	public boolean isSingle() {
+		return objects.isSingle();
+	}
+
+	@Override
+	public @NotNull Class<? extends String> getReturnType() {
+		return String.class;
+	}
+
+	@Override
+	public @NotNull String toString(@Nullable Event event, boolean debug) {
+		return this.soundType.name().toLowerCase() + " sound of " + objects.toString(event, debug);
+	}
+
+}
diff --git a/src/main/java/ch/njol/skript/expressions/ExprBlockSphere.java b/src/main/java/ch/njol/skript/expressions/ExprBlockSphere.java
index a30bc7f9f9a..bce1ce8e435 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprBlockSphere.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprBlockSphere.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import java.util.ArrayList;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprBlocks.java b/src/main/java/ch/njol/skript/expressions/ExprBlocks.java
index fbc9683db1e..46122dccbff 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprBlocks.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprBlocks.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import java.util.Iterator;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprBookAuthor.java b/src/main/java/ch/njol/skript/expressions/ExprBookAuthor.java
index 34751d92c9b..dfb96413fb5 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprBookAuthor.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprBookAuthor.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import ch.njol.skript.aliases.ItemType;
@@ -29,63 +11,54 @@
 
 import org.bukkit.event.Event;
 import org.bukkit.inventory.meta.BookMeta;
-import org.bukkit.inventory.meta.ItemMeta;
 import org.jetbrains.annotations.Nullable;
 
 @Name("Book Author")
 @Description("The author of a book.")
-@Examples({"on book sign:",
-			"\tmessage \"Book Title: %author of event-item%\""})
+@Examples({
+	"on book sign:",
+		"\tmessage \"Book Title: %author of event-item%\""
+})
 @Since("2.2-dev31")
 public class ExprBookAuthor extends SimplePropertyExpression<ItemType, String> {
-	
+
 	static {
 		register(ExprBookAuthor.class, String.class, "[book] (author|writer|publisher)", "itemtypes");
 	}
-	
+
 	@Nullable
 	@Override
 	public String convert(ItemType item) {
-		ItemMeta meta = item.getItemMeta();
-		
-		if (meta instanceof BookMeta)
-			return ((BookMeta) meta).getAuthor();
-		
-		return null;
+		return item.getItemMeta() instanceof BookMeta bookMeta ? bookMeta.getAuthor() : null;
 	}
-	
-	@Nullable
+
 	@Override
-	public Class<?>[] acceptChange(ChangeMode mode) {
-		if (mode == ChangeMode.SET || mode == ChangeMode.RESET || mode == ChangeMode.DELETE)
-			return CollectionUtils.array(String.class);
-		return null;
+	public Class<?> @Nullable [] acceptChange(ChangeMode mode) {
+		return switch (mode) {
+			case SET, RESET, DELETE -> CollectionUtils.array(String.class);
+			default -> null;
+		};
 	}
-	
-	@SuppressWarnings("null")
+
 	@Override
-	public void change(Event e, @Nullable Object[] delta, ChangeMode mode) {
+	public void change(Event event, Object @Nullable [] delta, ChangeMode mode) {
 		String author = delta == null ? null : (String) delta[0];
-		
-		for (ItemType item : getExpr().getArray(e)) {
-			ItemMeta meta = item.getItemMeta();
-			
-			if (meta instanceof BookMeta) {
-				((BookMeta) meta).setAuthor(author);
-				item.setItemMeta(meta);
+		for (ItemType item : getExpr().getArray(event)) {
+			if (item.getItemMeta() instanceof BookMeta bookMeta) {
+				bookMeta.setAuthor(author);
+				item.setItemMeta(bookMeta);
 			}
 		}
 	}
-	
+
 	@Override
 	public Class<? extends String> getReturnType() {
 		return String.class;
 	}
-	
+
 	@Override
 	protected String getPropertyName() {
 		return "book author";
 	}
-	
-}
 
+}
diff --git a/src/main/java/ch/njol/skript/expressions/ExprBookPages.java b/src/main/java/ch/njol/skript/expressions/ExprBookPages.java
index a16ad8264ff..d7c28425942 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprBookPages.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprBookPages.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import java.util.ArrayList;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprBookTitle.java b/src/main/java/ch/njol/skript/expressions/ExprBookTitle.java
index 5d28bc576e6..c8773550103 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprBookTitle.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprBookTitle.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import ch.njol.skript.aliases.ItemType;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprBreakSpeed.java b/src/main/java/ch/njol/skript/expressions/ExprBreakSpeed.java
index a3c5ed36332..82dd4bacd50 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprBreakSpeed.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprBreakSpeed.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import ch.njol.skript.Skript;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprBurnCookTime.java b/src/main/java/ch/njol/skript/expressions/ExprBurnCookTime.java
deleted file mode 100644
index 1777e73799f..00000000000
--- a/src/main/java/ch/njol/skript/expressions/ExprBurnCookTime.java
+++ /dev/null
@@ -1,170 +0,0 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
-package ch.njol.skript.expressions;
-
-import java.util.Arrays;
-import java.util.function.Function;
-
-import ch.njol.skript.classes.Changer.ChangeMode;
-import org.bukkit.block.Block;
-import org.bukkit.block.BlockState;
-import org.bukkit.block.Furnace;
-import org.bukkit.event.Event;
-import org.bukkit.event.inventory.FurnaceBurnEvent;
-import org.jetbrains.annotations.Nullable;
-
-import ch.njol.skript.Skript;
-import ch.njol.skript.aliases.Aliases;
-import ch.njol.skript.aliases.ItemType;
-import ch.njol.skript.classes.Changer;
-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.expressions.base.PropertyExpression;
-import ch.njol.skript.lang.Expression;
-import ch.njol.skript.lang.ExpressionType;
-import ch.njol.skript.lang.SkriptParser;
-import ch.njol.skript.util.Timespan;
-import ch.njol.util.Kleenean;
-import ch.njol.util.coll.CollectionUtils;
-import org.skriptlang.skript.lang.arithmetic.Operator;
-import org.skriptlang.skript.lang.arithmetic.Arithmetics;
-
-@Name("Burn/Cook Time")
-@Description({
-	"The time a furnace takes to burn an item in a <a href='events.html#fuel_burn'>fuel burn</a> event.",
-	"Can also be used to change the burn/cook time of a placed furnace."
-})
-@Examples({
-	"on fuel burn:",
-		"\tif fuel slot is coal:",
-			"\t\tset burning time to 1 tick"
-})
-@Since("2.3")
-public class ExprBurnCookTime extends PropertyExpression<Block, Timespan> {
-
-	static {
-		Skript.registerExpression(ExprBurnCookTime.class, Timespan.class, ExpressionType.PROPERTY,
-				"[the] burn[ing] time",
-				"[the] (burn|1:cook)[ing] time of %blocks%",
-				"%blocks%'[s] (burn|1:cook)[ing] time");
-	}
-
-	private boolean cookTime;
-	private boolean isEvent;
-
-	@Override
-	public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelayed, SkriptParser.ParseResult parseResult) {
-		cookTime = parseResult.mark == 1;
-		isEvent = matchedPattern == 0;
-		if (isEvent && !getParser().isCurrentEvent(FurnaceBurnEvent.class)) {
-			Skript.error("Cannot use 'burning time' outside a fuel burn event.");
-			return false;
-		}
-		if (!isEvent)
-			setExpr((Expression<? extends Block>) exprs[0]);
-		return true;
-	}
-
-	@Override
-	protected Timespan[] get(Event event, Block[] source) {
-		if (isEvent) {
-			if (!(event instanceof FurnaceBurnEvent))
-				return new Timespan[0];
-			return CollectionUtils.array(Timespan.fromTicks(((FurnaceBurnEvent) event).getBurnTime()));
-		} else {
-			return Arrays.stream(source)
-					.map(Block::getState)
-					.filter(blockState -> blockState instanceof Furnace)
-					.map(state -> {
-						Furnace furnace = (Furnace) state;
-						return Timespan.fromTicks(cookTime ? furnace.getCookTime() : furnace.getBurnTime());
-					})
-					.toArray(Timespan[]::new);
-		}
-	}
-	@Override
-	@Nullable
-	public Class<?>[] acceptChange(ChangeMode mode) {
-		if (mode == ChangeMode.ADD || mode == ChangeMode.REMOVE || mode == ChangeMode.SET)
-			return CollectionUtils.array(Timespan.class);
-		return null;
-	}
-
-	@Override
-	public void change(Event event, @Nullable Object[] delta, ChangeMode mode) {
-		if (delta == null)
-			return;
-
-		Function<Timespan, Timespan> value = null;
-		Timespan changed = (Timespan) delta[0];
-
-		switch (mode) {
-			case ADD:
-				value = (original) -> Arithmetics.calculate(Operator.ADDITION, original, changed, Timespan.class);
-				break;
-			case REMOVE:
-				value = (original) -> Arithmetics.difference(original, changed, Timespan.class);
-				break;
-			case SET:
-				value = (original) -> changed;
-				break;
-			default:
-				assert false;
-				break;
-		}
-
-        if (isEvent) {
-			if (!(event instanceof FurnaceBurnEvent))
-				return;
-
-			FurnaceBurnEvent burnEvent = (FurnaceBurnEvent) event;
-			burnEvent.setBurnTime((int) value.apply(Timespan.fromTicks(burnEvent.getBurnTime())).getTicks());
-			return;
-		}
-
-		for (Block block : getExpr().getArray(event)) {
-			BlockState state = block.getState();
-			if (!(state instanceof Furnace))
-				continue;
-			Furnace furnace = (Furnace) block.getState();
-			long time = value.apply(Timespan.fromTicks(cookTime ? furnace.getCookTime() : furnace.getBurnTime())).getTicks();
-
-			if (cookTime) {
-				furnace.setCookTime((short) time);
-			} else {
-				furnace.setBurnTime((short) time);
-			}
-
-			furnace.update();
-		}
-	}
-
-	@Override
-	public Class<? extends Timespan> getReturnType() {
-		return Timespan.class;
-	}
-
-	@Override
-	public String toString(@Nullable Event event, boolean debug) {
-		return isEvent ? "the burning time" : String.format("the %sing time of %s", cookTime ? "cook" : "burn", getExpr().toString(event, debug));
-	}
-
-}
diff --git a/src/main/java/ch/njol/skript/expressions/ExprCharacterFromCodepoint.java b/src/main/java/ch/njol/skript/expressions/ExprCharacterFromCodepoint.java
index 217ffa6f4f9..485b43b2040 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprCharacterFromCodepoint.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprCharacterFromCodepoint.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import ch.njol.skript.Skript;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprCharacters.java b/src/main/java/ch/njol/skript/expressions/ExprCharacters.java
index ea12012dfe5..ba3a8509e5e 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprCharacters.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprCharacters.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import ch.njol.skript.Skript;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprCharges.java b/src/main/java/ch/njol/skript/expressions/ExprCharges.java
index b13bf99def3..72709b0dde7 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprCharges.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprCharges.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import ch.njol.skript.Skript;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprChatFormat.java b/src/main/java/ch/njol/skript/expressions/ExprChatFormat.java
index f9917b0dcb2..99df19b3bd2 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprChatFormat.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprChatFormat.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import org.apache.commons.lang.StringUtils;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprChatRecipients.java b/src/main/java/ch/njol/skript/expressions/ExprChatRecipients.java
index d53c32f0f25..462e518d859 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprChatRecipients.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprChatRecipients.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import java.util.Set;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprChestInventory.java b/src/main/java/ch/njol/skript/expressions/ExprChestInventory.java
index 241a144ec14..ee1dd7546cb 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprChestInventory.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprChestInventory.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import org.bukkit.Bukkit;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprChunk.java b/src/main/java/ch/njol/skript/expressions/ExprChunk.java
index 04950b20e36..4131f30bba3 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprChunk.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprChunk.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import java.util.Arrays;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprClicked.java b/src/main/java/ch/njol/skript/expressions/ExprClicked.java
index 14a4e4f06c7..536da33b70f 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprClicked.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprClicked.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import java.lang.reflect.Array;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprClientViewDistance.java b/src/main/java/ch/njol/skript/expressions/ExprClientViewDistance.java
index 3d721d2e4fb..ea66c5a0688 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprClientViewDistance.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprClientViewDistance.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import org.bukkit.entity.Player;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprCmdCooldownInfo.java b/src/main/java/ch/njol/skript/expressions/ExprCmdCooldownInfo.java
index 14e2d003f12..d952105fa22 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprCmdCooldownInfo.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprCmdCooldownInfo.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import java.util.UUID;
@@ -138,7 +120,7 @@ public void change(Event e, @Nullable Object[] delta, Changer.ChangeMode mode) {
 		CommandSender sender = commandEvent.getSender();
 		if (cooldown == null || !(sender instanceof Player))
 			return;
-		long cooldownMs = cooldown.getMilliSeconds();
+		long cooldownMs = cooldown.getAs(Timespan.TimePeriod.MILLISECOND);
 		UUID uuid = ((Player) sender).getUniqueId();
 		
 		if (pattern <= 1) {
@@ -146,7 +128,7 @@ public void change(Event e, @Nullable Object[] delta, Changer.ChangeMode mode) {
 			switch (mode) {
 				case ADD:
 				case REMOVE:
-					long change = (mode == Changer.ChangeMode.ADD ? 1 : -1) * timespan.getMilliSeconds();
+					long change = (mode == Changer.ChangeMode.ADD ? 1 : -1) * timespan.getAs(Timespan.TimePeriod.MILLISECOND);
 					if (pattern == 0) {
 						long remaining = command.getRemainingMilliseconds(uuid, commandEvent);
 						long changed = remaining + change;
@@ -169,9 +151,9 @@ public void change(Event e, @Nullable Object[] delta, Changer.ChangeMode mode) {
 					break;
 				case SET:
 					if (pattern == 0)
-						command.setRemainingMilliseconds(uuid, commandEvent, timespan.getMilliSeconds());
+						command.setRemainingMilliseconds(uuid, commandEvent, timespan.getAs(Timespan.TimePeriod.MILLISECOND));
 					else
-						command.setElapsedMilliSeconds(uuid, commandEvent, timespan.getMilliSeconds());
+						command.setElapsedMilliSeconds(uuid, commandEvent, timespan.getAs(Timespan.TimePeriod.MILLISECOND));
 					break;
 			}
 		} else if (pattern == 3) {
diff --git a/src/main/java/ch/njol/skript/expressions/ExprCodepoint.java b/src/main/java/ch/njol/skript/expressions/ExprCodepoint.java
index a090495f692..a643241e78c 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprCodepoint.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprCodepoint.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import ch.njol.skript.doc.Description;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprColorOf.java b/src/main/java/ch/njol/skript/expressions/ExprColorOf.java
index 518402fc192..4378ff5dbfb 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprColorOf.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprColorOf.java
@@ -1,39 +1,6 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import ch.njol.skript.Skript;
-import org.bukkit.DyeColor;
-import org.bukkit.FireworkEffect;
-import org.bukkit.block.Block;
-import org.bukkit.block.BlockState;
-import org.bukkit.entity.Entity;
-import org.bukkit.entity.Item;
-import org.bukkit.event.Event;
-import org.bukkit.inventory.ItemStack;
-import org.bukkit.material.Colorable;
-import org.bukkit.material.MaterialData;
-import org.jetbrains.annotations.Nullable;
-
 import ch.njol.skript.aliases.ItemType;
 import ch.njol.skript.classes.Changer.ChangeMode;
 import ch.njol.skript.doc.Description;
@@ -44,156 +11,207 @@
 import ch.njol.skript.lang.Expression;
 import ch.njol.skript.lang.SkriptParser.ParseResult;
 import ch.njol.skript.util.Color;
+import ch.njol.skript.util.ColorRGB;
 import ch.njol.skript.util.SkriptColor;
 import ch.njol.util.Kleenean;
 import ch.njol.util.coll.CollectionUtils;
+import org.bukkit.DyeColor;
+import org.bukkit.FireworkEffect;
+import org.bukkit.block.Banner;
+import org.bukkit.block.Block;
+import org.bukkit.block.BlockState;
+import org.bukkit.entity.Display;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.Item;
+import org.bukkit.entity.TextDisplay;
+import org.bukkit.event.Event;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.material.Colorable;
+import org.bukkit.material.MaterialData;
+import org.jetbrains.annotations.Nullable;
+import org.skriptlang.skript.bukkit.displays.DisplayData;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.function.Consumer;
 
 @Name("Color of")
-@Description("The <a href='./classes.html#color'>color</a> of an item, can also be used to color chat messages with \"&lt;%color of ...%&gt;this text is colored!\".")
-@Examples({"on click on wool:",
-		"	message \"This wool block is <%color of block%>%color of block%<reset>!\"",
-		"	set the color of the block to black"})
-@Since("1.2")
+@Description({
+	"The <a href='./classes.html#color'>color</a> of an item, entity, block, firework effect, or text display.",
+	"This can also be used to color chat messages with \"&lt;%color of ...%&gt;this text is colored!\".",
+	"Do note that firework effects support setting, adding, removing, resetting, and deleting; text displays support " +
+	"setting and resetting; and items, entities, and blocks only support setting, and only for very few items/blocks."
+})
+@Examples({
+	"on click on wool:",
+		"\tmessage \"This wool block is <%color of block%>%color of block%<reset>!\"",
+		"\tset the color of the block to black"
+})
+@Since("1.2, 2.10 (displays)")
 public class ExprColorOf extends PropertyExpression<Object, Color> {
 
 	static {
-		register(ExprColorOf.class, Color.class, "colo[u]r[s]", "blocks/itemtypes/entities/fireworkeffects");
+		String types = "blocks/itemtypes/entities/fireworkeffects";
+		if (Skript.isRunningMinecraft(1, 19, 4))
+			types += "/displays";
+		register(ExprColorOf.class, Color.class, "colo[u]r[s]", types);
 	}
-	
-	@SuppressWarnings("null")
+
 	@Override
 	public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelayed, ParseResult parseResult) {
 		setExpr(exprs[0]);
 		return true;
 	}
-	
-	@SuppressWarnings("null")
+
 	@Override
-	protected Color[] get(Event e, Object[] source) {
+	protected Color[] get(Event event, Object[] source) {
 		if (source instanceof FireworkEffect[]) {
 			List<Color> colors = new ArrayList<>();
-			
 			for (FireworkEffect effect : (FireworkEffect[]) source) {
 				effect.getColors().stream()
-					.map(SkriptColor::fromBukkitColor)
+					.map(ColorRGB::fromBukkitColor)
 					.forEach(colors::add);
 			}
-			
-			if (colors.size() == 0)
-				return null;
 			return colors.toArray(new Color[0]);
 		}
-		return get(source, o -> {
-			Colorable colorable = getColorable(o);
-
-			if (colorable == null)
-				return null;
-			DyeColor dyeColor = colorable.getColor();
-			if (dyeColor == null)
-				return null;
-			return SkriptColor.fromDyeColor(dyeColor);
+		return get(source, object -> {
+			if (object instanceof Display) {
+				if (!(object instanceof TextDisplay display))
+					return null;
+				if (display.isDefaultBackground())
+					return ColorRGB.fromBukkitColor(DisplayData.DEFAULT_BACKGROUND_COLOR);
+				org.bukkit.Color bukkitColor = display.getBackgroundColor();
+				if (bukkitColor == null)
+					return null;
+				return ColorRGB.fromBukkitColor(bukkitColor);
+			}
+			return getColor(object);
 		});
 	}
 
 	@Override
-	public Class<? extends Color> getReturnType() {
-		return Color.class;
-	}
-
-	@Override
-	public String toString(@Nullable Event e, boolean debug) {
-		return "color of " + getExpr().toString(e, debug);
-	}
-
-	@Override
-	@Nullable
-	public Class<?>[] acceptChange(ChangeMode mode) {
+	public Class<?> @Nullable [] acceptChange(ChangeMode mode) {
 		Class<?> returnType = getExpr().getReturnType();
 
-		if (FireworkEffect.class.isAssignableFrom(returnType))
+		if (returnType.isAssignableFrom(FireworkEffect.class))
 			return CollectionUtils.array(Color[].class);
 
-		if (mode != ChangeMode.SET && !getExpr().isSingle())
-			return null;
-
-		if (Entity.class.isAssignableFrom(returnType))
-			return CollectionUtils.array(Color.class);
-		else if (Block.class.isAssignableFrom(returnType))
+		// double assignable checks are to allow both parent and child types, since variables return Object
+		// This does mean we have to be more stringent in checking the validity of the change mode in change() itself.
+		if ((returnType.isAssignableFrom(Display.class) || Display.class.isAssignableFrom(returnType)) && (mode == ChangeMode.RESET || mode == ChangeMode.SET))
 			return CollectionUtils.array(Color.class);
-		if (ItemType.class.isAssignableFrom(returnType))
+
+		// the following only support SET
+		if (mode != ChangeMode.SET)
+			return null;
+		if (returnType.isAssignableFrom(Entity.class)
+			|| Entity.class.isAssignableFrom(returnType)
+			|| returnType.isAssignableFrom(Block.class)
+			|| Block.class.isAssignableFrom(returnType)
+			|| returnType.isAssignableFrom(ItemType.class)
+		) {
 			return CollectionUtils.array(Color.class);
+		}
 		return null;
 	}
 
-	@SuppressWarnings("deprecated")
 	@Override
-	public void change(Event e, @Nullable Object[] delta, ChangeMode mode) {
-		if (delta == null)
-			return;
-		DyeColor color = ((Color) delta[0]).asDyeColor();
-
-		for (Object o : getExpr().getArray(e)) {
-			if (o instanceof Item || o instanceof ItemType) {
-				ItemStack stack = o instanceof Item ? ((Item) o).getItemStack() : ((ItemType) o).getRandom();
-
-				if (stack == null)
-					continue;
-
-				MaterialData data = stack.getData();
-
-				if (!(data instanceof Colorable))
-					continue;
-
-				((Colorable) data).setColor(color);
-				stack.setData(data);
-
-				if (o instanceof Item)
-					((Item) o).setItemStack(stack);
-			} else if (o instanceof Block || o instanceof Colorable) {
-				Colorable colorable = getColorable(o);
-
+	@SuppressWarnings("removal")
+	public void change(Event event, Object @Nullable [] delta, ChangeMode mode) {
+		Color[] colors = delta != null ? (Color[]) delta : null;
+		Consumer<TextDisplay> displayChanger = getDisplayChanger(mode, colors);
+		Consumer<FireworkEffect> fireworkChanger = getFireworkChanger(mode, colors);
+		for (Object object : getExpr().getArray(event)) {
+			if (object instanceof TextDisplay display) {
+				displayChanger.accept(display);
+			} else if (object instanceof FireworkEffect effect) {
+				fireworkChanger.accept(effect);
+			} else if (mode == ChangeMode.SET && (object instanceof Block || object instanceof Colorable)) {
+				assert colors[0] != null;
+				Colorable colorable = getColorable(object);
 				if (colorable != null) {
 					try {
-						colorable.setColor(color);
+						colorable.setColor(colors[0].asDyeColor());
 					} catch (UnsupportedOperationException ex) {
 						// https://github.com/SkriptLang/Skript/issues/2931
 						Skript.error("Tried setting the color of a bed, but this isn't possible in your Minecraft version, " +
 							"since different colored beds are different materials. " +
 							"Instead, set the block to right material, such as a blue bed."); // Let's just assume it's a bed
 					}
+				} else {
+					if (object instanceof Block block) {
+						if (block.getState() instanceof Banner banner)
+							banner.setBaseColor(colors[0].asDyeColor());
+					}
 				}
-			} else if (o instanceof FireworkEffect) {
-				Color[] input = (Color[]) delta;
-				FireworkEffect effect = ((FireworkEffect) o);
-				switch (mode) {
-					case ADD:
-						for (Color c : input)
-							effect.getColors().add(c.asBukkitColor());
-						break;
-					case REMOVE:
-					case REMOVE_ALL:
-						for (Color c : input)
-							effect.getColors().remove(c.asBukkitColor());
-						break;
-					case DELETE:
-					case RESET:
-						effect.getColors().clear();
-						break;
-					case SET:
-						effect.getColors().clear();
-						for (Color c : input)
-							effect.getColors().add(c.asBukkitColor());
-						break;
-					default:
-						break;
+			} else if (mode == ChangeMode.SET && (object instanceof Item || object instanceof ItemType)) {
+				assert colors[0] != null;
+				ItemStack stack = object instanceof Item ? ((Item) object).getItemStack() : ((ItemType) object).getRandom();
+				if (stack == null)
+					continue;
+				MaterialData data = stack.getData();
+				if (!(data instanceof Colorable colorable))
+					continue;
+				colorable.setColor(colors[0].asDyeColor());
+				stack.setData(data);
+				if (object instanceof Item item) {
+					item.setItemStack(stack);
 				}
 			}
 		}
 	}
 
-	@SuppressWarnings("deprecated")
-	@Nullable
-	private Colorable getColorable(Object colorable) {
+	@Override
+	public Class<? extends Color> getReturnType() {
+		return Color.class;
+	}
+
+	@Override
+	public String toString(@Nullable Event event, boolean debug) {
+		return "color of " + getExpr().toString(event, debug);
+	}
+
+	private Consumer<TextDisplay> getDisplayChanger(ChangeMode mode, Color @Nullable [] colors) {
+		Color color = (colors != null && colors.length == 1) ? colors[0] : null;
+		return switch (mode) {
+			case RESET -> display -> {
+				display.setDefaultBackground(true);
+			};
+			case SET -> display -> {
+				if (color != null) {
+					if (display.isDefaultBackground())
+						display.setDefaultBackground(false);
+					display.setBackgroundColor(color.asBukkitColor());
+				}
+			};
+			default -> display -> {};
+		};
+	}
+
+	private Consumer<FireworkEffect> getFireworkChanger(ChangeMode mode, Color @Nullable [] colors) {
+		return switch (mode) {
+			case ADD -> effect -> {
+				for (Color color : colors)
+					effect.getColors().add(color.asBukkitColor());
+			};
+			case REMOVE, REMOVE_ALL -> effect -> {
+				for (Color color : colors)
+					effect.getColors().remove(color.asBukkitColor());
+			};
+			case DELETE, RESET -> effect -> {
+				effect.getColors().clear();
+			};
+			case SET -> effect -> {
+				effect.getColors().clear();
+				for (Color color : colors)
+					effect.getColors().add(color.asBukkitColor());
+			};
+			default -> effect -> {};
+		};
+	}
+
+	@SuppressWarnings({"removal"})
+	private @Nullable Colorable getColorable(Object colorable) {
 		if (colorable instanceof Item || colorable instanceof ItemType) {
 			ItemStack item = colorable instanceof Item ?
 					((Item) colorable).getItemStack() : ((ItemType) colorable).getRandom();
@@ -201,12 +219,10 @@ private Colorable getColorable(Object colorable) {
 			if (item == null)
 				return null;
 			MaterialData data = item.getData();
-
 			if (data instanceof Colorable)
 				return (Colorable) data;
 		} else if (colorable instanceof Block) {
 			BlockState state = ((Block) colorable).getState();
-
 			if (state instanceof Colorable)
 				return (Colorable) state;
 		} else if (colorable instanceof Colorable) {
@@ -215,4 +231,19 @@ private Colorable getColorable(Object colorable) {
 		return null;
 	}
 
+	private @Nullable Color getColor(Object object) {
+		Colorable colorable = getColorable(object);
+		if (colorable != null) {
+			DyeColor dyeColor = colorable.getColor();
+			if (dyeColor == null)
+				return null;
+			return SkriptColor.fromDyeColor(dyeColor);
+		}
+		if (object instanceof Block block) {
+			if (block.getState() instanceof Banner banner)
+				return SkriptColor.fromDyeColor(banner.getBaseColor());
+		}
+		return null;
+	}
+
 }
diff --git a/src/main/java/ch/njol/skript/expressions/ExprColoured.java b/src/main/java/ch/njol/skript/expressions/ExprColoured.java
index f681cfb642b..95c1f6a0ebe 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprColoured.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprColoured.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import ch.njol.skript.Skript;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprCommand.java b/src/main/java/ch/njol/skript/expressions/ExprCommand.java
index ef64e6af4cd..8cb71f77e34 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprCommand.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprCommand.java
@@ -1,24 +1,8 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import ch.njol.skript.command.ScriptCommandEvent;
+import ch.njol.skript.lang.EventRestrictedSyntax;
+import ch.njol.util.coll.CollectionUtils;
 import org.bukkit.event.Event;
 import org.bukkit.event.player.PlayerCommandPreprocessEvent;
 import org.bukkit.event.server.ServerCommandEvent;
@@ -49,7 +33,7 @@
 		"\t\t\tcancel the event"})
 @Since("2.0, 2.7 (support for script commands)")
 @Events("command")
-public class ExprCommand extends SimpleExpression<String> {
+public class ExprCommand extends SimpleExpression<String> implements EventRestrictedSyntax {
 
 	static {
 		Skript.registerExpression(ExprCommand.class, String.class, ExpressionType.SIMPLE,
@@ -62,13 +46,14 @@ public class ExprCommand extends SimpleExpression<String> {
 	
 	@Override
 	public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelayed, ParseResult parseResult) {
-		if (!getParser().isCurrentEvent(PlayerCommandPreprocessEvent.class, ServerCommandEvent.class, ScriptCommandEvent.class)) {
-			Skript.error("The 'command' expression can only be used in a script command or command event");
-			return false;
-		}
 		fullCommand = matchedPattern == 0;
 		return true;
 	}
+
+	@Override
+	public Class<? extends Event>[] supportedEvents() {
+		return CollectionUtils.array(PlayerCommandPreprocessEvent.class, ServerCommandEvent.class, ScriptCommandEvent.class);
+	}
 	
 	@Override
 	@Nullable
@@ -106,5 +91,5 @@ public Class<? extends String> getReturnType() {
 	public String toString(@Nullable Event e, boolean debug) {
 		return fullCommand ? "the full command" : "the command";
 	}
-	
+
 }
diff --git a/src/main/java/ch/njol/skript/expressions/ExprCommandBlockCommand.java b/src/main/java/ch/njol/skript/expressions/ExprCommandBlockCommand.java
new file mode 100644
index 00000000000..be034ed9325
--- /dev/null
+++ b/src/main/java/ch/njol/skript/expressions/ExprCommandBlockCommand.java
@@ -0,0 +1,80 @@
+package ch.njol.skript.expressions;
+
+import ch.njol.skript.classes.Changer.ChangeMode;
+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.expressions.base.SimplePropertyExpression;
+import ch.njol.util.coll.CollectionUtils;
+import org.bukkit.block.Block;
+import org.bukkit.block.CommandBlock;
+import org.bukkit.entity.minecart.CommandMinecart;
+import org.bukkit.event.Event;
+import org.jetbrains.annotations.Nullable;
+
+@Name("Command Block Command")
+@Description(
+	"Gets or sets the command associated with a command block or minecart with command block."
+)
+@Examples({
+	"send command of {_block}",
+	"set command of {_cmdMinecart} to \"say asdf\""
+})
+@Since("2.10")
+public class ExprCommandBlockCommand extends SimplePropertyExpression<Object, String> {
+
+	static {
+		register(ExprCommandBlockCommand.class, String.class, "[command[ ]block] command", "blocks/entities");
+	}
+
+	@Override
+	public @Nullable String convert(Object holder) {
+		String command = "";
+		if (holder instanceof Block block && block.getState() instanceof CommandBlock cmdBlock) {
+			command = cmdBlock.getCommand();
+		} else if (holder instanceof CommandMinecart cmdMinecart) {
+			command = cmdMinecart.getCommand();
+		}
+		return (command.isEmpty()) ? null : command;
+	}
+
+	@Override
+	public Class<?> @Nullable [] acceptChange(ChangeMode mode) {
+		if (mode == ChangeMode.SET || mode == ChangeMode.DELETE || mode == ChangeMode.RESET)
+			return CollectionUtils.array(String.class);
+		return null;
+	}
+
+	@Override
+	public void change(Event event, Object @Nullable [] delta, ChangeMode mode) {
+		String newCommand = delta == null ? null : ((String) delta[0]);
+		for (Object holder : getExpr().getArray(event)) {
+			switch (mode) {
+				case RESET:
+				case DELETE:
+				case SET:
+					if (holder instanceof Block block && block.getState() instanceof CommandBlock cmdBlock) {
+						cmdBlock.setCommand(newCommand);
+						cmdBlock.update();
+					} else if (holder instanceof CommandMinecart cmdMinecart) {
+						cmdMinecart.setCommand(newCommand);
+					}
+					break;
+				default:
+					assert false;
+			}
+		}
+	}
+
+	@Override
+	public Class<? extends String> getReturnType() {
+		return String.class;
+	}
+
+	@Override
+	protected String getPropertyName() {
+		return "command block command";
+	}
+
+}
diff --git a/src/main/java/ch/njol/skript/expressions/ExprCommandInfo.java b/src/main/java/ch/njol/skript/expressions/ExprCommandInfo.java
index 6a1184d98ca..8e88a9751b7 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprCommandInfo.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprCommandInfo.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import java.util.ArrayList;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprCommandSender.java b/src/main/java/ch/njol/skript/expressions/ExprCommandSender.java
index 076a2b8f5cd..2d71a3b2e0e 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprCommandSender.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprCommandSender.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import org.bukkit.command.CommandSender;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprCompassTarget.java b/src/main/java/ch/njol/skript/expressions/ExprCompassTarget.java
index 4127b24d140..9bcc06735d4 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprCompassTarget.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprCompassTarget.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import org.bukkit.Location;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprConfig.java b/src/main/java/ch/njol/skript/expressions/ExprConfig.java
new file mode 100644
index 00000000000..8cabbafa817
--- /dev/null
+++ b/src/main/java/ch/njol/skript/expressions/ExprConfig.java
@@ -0,0 +1,76 @@
+package ch.njol.skript.expressions;
+
+import ch.njol.skript.Skript;
+import ch.njol.skript.SkriptConfig;
+import ch.njol.skript.config.Config;
+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.SkriptParser.ParseResult;
+import ch.njol.skript.lang.util.SimpleExpression;
+import ch.njol.skript.registrations.Feature;
+import ch.njol.util.Kleenean;
+import org.bukkit.event.Event;
+import org.jetbrains.annotations.Nullable;
+
+@Name("Config (Experimental)")
+@Description({
+	"The Skript config.",
+	"This can be reloaded, or navigated to retrieve options."
+})
+@Examples({"""
+	set {_node} to node "language" in the skript config
+	if text value of {_node} is "french":
+		broadcast "Bonjour!"
+	"""})
+@Since("2.10")
+public class ExprConfig extends SimpleExpression<Config> {
+
+	static {
+		Skript.registerExpression(ExprConfig.class, Config.class, ExpressionType.SIMPLE,
+			"[the] [skript] config"
+		);
+	}
+
+	private @Nullable Config config;
+
+	@Override
+	public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelayed, ParseResult parseResult) {
+		if (!this.getParser().hasExperiment(Feature.SCRIPT_REFLECTION))
+			return false;
+		this.config = SkriptConfig.getConfig();
+		if (config == null) {
+			Skript.warning("The main config is unavailable here!");
+			return false;
+		}
+		return true;
+	}
+
+	@Override
+	protected Config[] get(Event event) {
+		if (config == null || !config.valid())
+			this.config = SkriptConfig.getConfig();
+		if (config != null && config.valid())
+			return new Config[] {config};
+		return new Config[0];
+	}
+
+	@Override
+	public boolean isSingle() {
+		return true;
+	}
+
+	@Override
+	public Class<? extends Config> getReturnType() {
+		return Config.class;
+	}
+
+	@Override
+	public String toString(@Nullable Event event, boolean debug) {
+		return "the skript config";
+	}
+
+}
diff --git a/src/main/java/ch/njol/skript/expressions/ExprCoordinate.java b/src/main/java/ch/njol/skript/expressions/ExprCoordinate.java
index dbd1f1ce283..5ae429f3cec 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprCoordinate.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprCoordinate.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import org.bukkit.Location;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprCreeperMaxFuseTicks.java b/src/main/java/ch/njol/skript/expressions/ExprCreeperMaxFuseTicks.java
index 8df0920a558..53d6b26ae5a 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprCreeperMaxFuseTicks.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprCreeperMaxFuseTicks.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import org.bukkit.entity.Creeper;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprCursorSlot.java b/src/main/java/ch/njol/skript/expressions/ExprCursorSlot.java
index 8fdb2573791..0b6580a0d9b 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprCursorSlot.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprCursorSlot.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import org.bukkit.entity.Player;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprCustomModelData.java b/src/main/java/ch/njol/skript/expressions/ExprCustomModelData.java
index c05f6d97882..9b04e619f8c 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprCustomModelData.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprCustomModelData.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import org.bukkit.event.Event;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprDamage.java b/src/main/java/ch/njol/skript/expressions/ExprDamage.java
index 2d2395bd574..962e20262f2 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprDamage.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprDamage.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import org.bukkit.event.Event;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprDamageCause.java b/src/main/java/ch/njol/skript/expressions/ExprDamageCause.java
index 9cd8bac4ea3..e8fdbd87d1f 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprDamageCause.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprDamageCause.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import org.bukkit.event.entity.EntityDamageEvent.DamageCause;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprDamagedItem.java b/src/main/java/ch/njol/skript/expressions/ExprDamagedItem.java
index 8dc3cd995d8..2e7f7a58ad2 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprDamagedItem.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprDamagedItem.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import org.bukkit.event.Event;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprDateAgoLater.java b/src/main/java/ch/njol/skript/expressions/ExprDateAgoLater.java
index 177467e9fd6..4d806e2037e 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprDateAgoLater.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprDateAgoLater.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import ch.njol.skript.Skript;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprDefaultValue.java b/src/main/java/ch/njol/skript/expressions/ExprDefaultValue.java
index 24ccacafad5..336a8376402 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprDefaultValue.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprDefaultValue.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import ch.njol.skript.Skript;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprDequeuedQueue.java b/src/main/java/ch/njol/skript/expressions/ExprDequeuedQueue.java
new file mode 100644
index 00000000000..0d5507aec7f
--- /dev/null
+++ b/src/main/java/ch/njol/skript/expressions/ExprDequeuedQueue.java
@@ -0,0 +1,73 @@
+package ch.njol.skript.expressions;
+
+import ch.njol.skript.Skript;
+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.SkriptParser.ParseResult;
+import ch.njol.skript.lang.util.SimpleExpression;
+import ch.njol.skript.registrations.Feature;
+import ch.njol.util.Kleenean;
+import org.bukkit.event.Event;
+import org.jetbrains.annotations.Nullable;
+import org.skriptlang.skript.lang.util.SkriptQueue;
+
+@Name("De-queue Queue (Experimental)")
+@Description("""
+	Requires the <code>using queues</code> experimental feature flag to be enabled.
+	
+	Unrolls a queue into a regular list of values, which can be stored in a list variable.
+	The order of the list will be the same as the order of the elements in the queue.
+	If a list variable is set to this, it will use numerical indices.
+	The original queue will not be changed.""")
+@Examples({
+	"""
+		set {queue} to a new queue
+		add "hello" and "there" to {queue}
+		set {list::*} to dequeued {queue}"""
+})
+@Since("2.10 (experimental)")
+public class ExprDequeuedQueue extends SimpleExpression<Object> {
+
+	static {
+		Skript.registerExpression(ExprDequeuedQueue.class, Object.class, ExpressionType.COMBINED,
+			"(de|un)queued %queue%", "unrolled %queue%");
+	}
+
+	private Expression<SkriptQueue> queue;
+
+	@Override
+	public boolean init(Expression<?>[] expressions, int pattern, Kleenean delayed, ParseResult result) {
+		if (!this.getParser().hasExperiment(Feature.QUEUES))
+			return false;
+		this.queue = (Expression<SkriptQueue>) expressions[0];
+		return true;
+	}
+
+	@Override
+	protected Object @Nullable [] get(Event event) {
+		SkriptQueue queue = this.queue.getSingle(event);
+		if (queue == null)
+			return null;
+		return queue.toArray();
+	}
+
+	@Override
+	public boolean isSingle() {
+		return false;
+	}
+
+	@Override
+	public Class<Object> getReturnType() {
+		return Object.class;
+	}
+
+	@Override
+	public String toString(@Nullable Event event, boolean debug) {
+		return "dequeued " + queue.toString(event, debug);
+	}
+
+}
diff --git a/src/main/java/ch/njol/skript/expressions/ExprDifference.java b/src/main/java/ch/njol/skript/expressions/ExprDifference.java
index 4e31308e69d..6a652b83a26 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprDifference.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprDifference.java
@@ -1,26 +1,6 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import ch.njol.skript.Skript;
-import ch.njol.skript.classes.Arithmetic;
-import ch.njol.skript.classes.ClassInfo;
 import ch.njol.skript.conditions.CondCompare;
 import ch.njol.skript.doc.Description;
 import ch.njol.skript.doc.Examples;
@@ -30,7 +10,6 @@
 import ch.njol.skript.lang.ExpressionType;
 import ch.njol.skript.lang.SkriptParser.ParseResult;
 import ch.njol.skript.lang.util.SimpleExpression;
-import ch.njol.skript.registrations.Classes;
 import ch.njol.skript.util.LiteralUtils;
 import ch.njol.skript.util.Utils;
 import ch.njol.util.Kleenean;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprDifficulty.java b/src/main/java/ch/njol/skript/expressions/ExprDifficulty.java
index 5416cd9a69b..79210ededf5 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprDifficulty.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprDifficulty.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import org.bukkit.Difficulty;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprDirection.java b/src/main/java/ch/njol/skript/expressions/ExprDirection.java
index 01596d86ba6..0e64f2f43f8 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprDirection.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprDirection.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import org.bukkit.Location;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprDistance.java b/src/main/java/ch/njol/skript/expressions/ExprDistance.java
index c9c124be5e4..51d33144ee7 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprDistance.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprDistance.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import org.bukkit.Location;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprDomestication.java b/src/main/java/ch/njol/skript/expressions/ExprDomestication.java
new file mode 100644
index 00000000000..cd7dbc72f72
--- /dev/null
+++ b/src/main/java/ch/njol/skript/expressions/ExprDomestication.java
@@ -0,0 +1,103 @@
+package ch.njol.skript.expressions;
+
+import ch.njol.skript.classes.Changer.ChangeMode;
+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.expressions.base.SimplePropertyExpression;
+import ch.njol.skript.lang.Expression;
+import ch.njol.skript.lang.SkriptParser.ParseResult;
+import ch.njol.util.Kleenean;
+import ch.njol.util.Math2;
+import ch.njol.util.coll.CollectionUtils;
+import org.bukkit.entity.AbstractHorse;
+import org.bukkit.entity.LivingEntity;
+import org.bukkit.event.Event;
+import org.jetbrains.annotations.Nullable;
+
+@Name("Horse Domestication")
+@Description({
+	"Gets and/or sets the (max) domestication of a horse.",
+	"The domestication of a horse is how close a horse is to becoming tame - the higher the domestication, the closer they are to becoming tame (must be between 1 and the max domestication level of the horse).",
+	"The max domestication of a horse is how long it will take for a horse to become tame (must be greater than 0)."
+})
+@Examples({
+	"function domesticateAndTame(horse: entity, p: offline player, i: int = 10):",
+		"\tadd {_i} to domestication level of {_horse}",
+		"\tif domestication level of {_horse} >= max domestication level of {_horse}:",
+			"\t\ttame {_horse}",
+			"\t\tset tamer of {_horse} to {_p}"
+})
+@Since("2.10")
+public class ExprDomestication extends SimplePropertyExpression<LivingEntity, Integer> {
+
+	static {
+		register(ExprDomestication.class, Integer.class, "[:max[imum]] domestication level", "livingentities");
+	}
+
+	private boolean max;
+
+	@Override
+	public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelayed, ParseResult parseResult) {
+		max = parseResult.hasTag("max");
+		return super.init(exprs, matchedPattern, isDelayed, parseResult);
+	}
+
+	@Override
+	public @Nullable Integer convert(LivingEntity entity) {
+		if (entity instanceof AbstractHorse horse)
+			return max ? horse.getMaxDomestication() : horse.getDomestication();
+		return null;
+	}
+
+	@Override
+	public @Nullable Class<?>[] acceptChange(ChangeMode mode) {
+		return switch (mode) {
+			case SET, ADD, REMOVE, RESET -> CollectionUtils.array(Number.class);
+			default -> null;
+		};
+	}
+
+	@Override
+	public void change(Event event, Object @Nullable [] delta, ChangeMode mode) {
+		assert mode != ChangeMode.REMOVE_ALL && mode != ChangeMode.DELETE;
+
+		int change = delta == null ? 0 : ((Number) delta[0]).intValue();
+
+		for (LivingEntity entity : getExpr().getArray(event)) {
+			if (entity instanceof AbstractHorse horse) {
+				int level = max ? horse.getMaxDomestication() : horse.getDomestication();
+				switch (mode) {
+					case SET -> level = change;
+					case ADD -> level += change;
+					case REMOVE -> level -= change;
+					case RESET -> level = 1;
+					default -> {
+						assert false;
+						return;
+					}
+				}
+				level = max ? Math.max(level, 1) : Math2.fit(1, level, horse.getMaxDomestication());
+				if (max) {
+					horse.setMaxDomestication(level);
+					if (horse.getDomestication() > level)
+						horse.setDomestication(level);
+				} else {
+					horse.setDomestication(level);
+				}
+			}
+		}
+	}
+
+	@Override
+	public Class<? extends Integer> getReturnType() {
+		return Integer.class;
+	}
+
+	@Override
+	protected String getPropertyName() {
+		return (max ? "max " : "") + "domestication level";
+	}
+
+}
diff --git a/src/main/java/ch/njol/skript/expressions/ExprDrops.java b/src/main/java/ch/njol/skript/expressions/ExprDrops.java
index 5c94dd50c06..02809a05502 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprDrops.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprDrops.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import ch.njol.skript.Skript;
@@ -26,6 +8,7 @@
 import ch.njol.skript.doc.Examples;
 import ch.njol.skript.doc.Name;
 import ch.njol.skript.doc.Since;
+import ch.njol.skript.lang.EventRestrictedSyntax;
 import ch.njol.skript.lang.Expression;
 import ch.njol.skript.lang.ExpressionType;
 import ch.njol.skript.lang.SkriptParser.ParseResult;
@@ -34,7 +17,10 @@
 import ch.njol.skript.util.Experience;
 import ch.njol.util.Kleenean;
 import ch.njol.util.coll.CollectionUtils;
+import org.bukkit.entity.Item;
 import org.bukkit.event.Event;
+import org.bukkit.event.block.BlockDropItemEvent;
+import org.bukkit.event.block.BlockEvent;
 import org.bukkit.event.entity.EntityDeathEvent;
 import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.ItemStack;
@@ -53,36 +39,46 @@
 		"remove 4 planks from the drops"})
 @Since("1.0")
 @Events("death")
-public class ExprDrops extends SimpleExpression<ItemType> {
+public class ExprDrops extends SimpleExpression<ItemType> implements EventRestrictedSyntax {
 
 	static {
 		Skript.registerExpression(ExprDrops.class, ItemType.class, ExpressionType.SIMPLE, "[the] drops");
 	}
 
+	private boolean isDeathEvent;
+
 	@Override
 	public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelayed, ParseResult parseResult) {
-		if (!getParser().isCurrentEvent(EntityDeathEvent.class)) {
-			Skript.error("The expression 'drops' can only be used in death events", ErrorQuality.SEMANTIC_ERROR);
-			return false;
-		}
+		if (getParser().isCurrentEvent(EntityDeathEvent.class))
+			isDeathEvent = true;
 		return true;
 	}
 
 	@Override
-	@Nullable
-	protected ItemType[] get(Event e) {
-		if (!(e instanceof EntityDeathEvent))
-			return null;
+	public Class<? extends Event>[] supportedEvents() {
+		return CollectionUtils.array(EntityDeathEvent.class, BlockDropItemEvent.class);
+	}
 
-		return ((EntityDeathEvent) e).getDrops()
-			.stream()
-			.map(ItemType::new)
-			.toArray(ItemType[]::new);
+	@Override
+	protected ItemType @Nullable [] get(Event event) {
+		if (event instanceof EntityDeathEvent entityDeathEvent) {
+			return entityDeathEvent.getDrops()
+				.stream()
+				.map(ItemType::new)
+				.toArray(ItemType[]::new);
+		} else if (event instanceof BlockDropItemEvent blockDropItemEvent) {
+			return blockDropItemEvent.getItems()
+				.stream()
+				.map(Item::getItemStack)
+				.map(ItemType::new)
+				.toArray(ItemType[]::new);
+		}
+		assert false;
+		return new ItemType[0];
 	}
 
 	@Override
-	@Nullable
-	public Class<?>[] acceptChange(ChangeMode mode) {
+	public Class<?> @Nullable [] acceptChange(ChangeMode mode) {
 		if (getParser().getHasDelayBefore().isTrue()) {
 			Skript.error("Can't change the drops after the event has already passed");
 			return null;
@@ -90,9 +86,11 @@ public Class<?>[] acceptChange(ChangeMode mode) {
 		switch (mode) {
 			case ADD:
 			case REMOVE:
-			case REMOVE_ALL:
 			case SET:
-				return CollectionUtils.array(ItemType[].class, Inventory[].class, Experience[].class);
+				if (isDeathEvent)
+					return CollectionUtils.array(ItemType[].class, Inventory[].class, Experience[].class);
+				else
+					return CollectionUtils.array(ItemType[].class, Inventory[].class);
 			case DELETE: // handled by EffClearDrops
 			case RESET:
 			default:
@@ -101,12 +99,21 @@ public Class<?>[] acceptChange(ChangeMode mode) {
 	}
 
 	@Override
-	public void change(Event event, @Nullable Object[] delta, ChangeMode mode) {
-		if (!(event instanceof EntityDeathEvent))
+	public void change(Event event, Object @Nullable [] delta, ChangeMode mode) {
+		List<ItemStack> drops = null;
+		int originalExperience = 0;
+		if (event instanceof EntityDeathEvent entityDeathEvent) {
+			drops = entityDeathEvent.getDrops();
+			originalExperience = entityDeathEvent.getDroppedExp();
+		} else if (event instanceof BlockDropItemEvent blockDropItemEvent) {
+			drops = blockDropItemEvent.getItems()
+				.stream()
+				.map(Item::getItemStack)
+				.toList();
+		} else {
 			return;
+		}
 
-		List<ItemStack> drops = ((EntityDeathEvent) event).getDrops();
-		int originalExperience = ((EntityDeathEvent) event).getDroppedExp();
 		assert delta != null;
 
 		// separate the delta into experience and drops to make it easier to handle
@@ -114,25 +121,25 @@ public void change(Event event, @Nullable Object[] delta, ChangeMode mode) {
 		boolean removeAllExperience = false;
 		List<ItemType> deltaDrops = new ArrayList<>();
 		for (Object o : delta) {
-			if (o instanceof Experience) {
+			if (o instanceof Experience experience) {
 				// Special case for `remove xp from the drops`
-				if ((((Experience) o).getInternalXP() == -1 && mode == ChangeMode.REMOVE) || mode == ChangeMode.REMOVE_ALL) {
+				if ((experience.getInternalXP() == -1 && mode == ChangeMode.REMOVE) || mode == ChangeMode.REMOVE_ALL) {
 					removeAllExperience = true;
 				}
 				// add the value even if we're removing all experience, just so we know that experience was changed
 				if (deltaExperience == -1) {
-					deltaExperience = ((Experience) o).getXP();
+					deltaExperience = experience.getXP();
 				} else {
-					deltaExperience += ((Experience) o).getXP();
+					deltaExperience += experience.getXP();
 				}
-			} else if (o instanceof Inventory) {
+			} else if (o instanceof Inventory inventory) {
 				// inventories are unrolled into their contents
-				for (ItemStack item : ((Inventory) o).getContents()) {
+				for (ItemStack item : inventory.getContents()) {
 					if (item != null)
 						deltaDrops.add(new ItemType(item));
 				}
-			} else if (o instanceof ItemType) {
-				deltaDrops.add((ItemType) o);
+			} else if (o instanceof ItemType itemType) {
+				deltaDrops.add(itemType);
 			} else {
 				assert false;
 			}
@@ -144,20 +151,20 @@ public void change(Event event, @Nullable Object[] delta, ChangeMode mode) {
 		// todo: All the experience stuff should be removed from this class for 2.8 and given to ExprExperience
 
 		// handle experience
-		if (deltaExperience > -1) {
+		if (deltaExperience > -1 && event instanceof EntityDeathEvent entityDeathEvent) {
 			switch (mode) {
 				case SET:
-					((EntityDeathEvent) event).setDroppedExp(deltaExperience);
+					entityDeathEvent.setDroppedExp(deltaExperience);
 					break;
 				case ADD:
-					((EntityDeathEvent) event).setDroppedExp(originalExperience + deltaExperience);
+					entityDeathEvent.setDroppedExp(originalExperience + deltaExperience);
 					break;
 				case REMOVE:
-					((EntityDeathEvent) event).setDroppedExp(originalExperience - deltaExperience);
+					entityDeathEvent.setDroppedExp(originalExperience - deltaExperience);
 					// fallthrough to check for removeAllExperience
 				case REMOVE_ALL:
 					if (removeAllExperience)
-						((EntityDeathEvent) event).setDroppedExp(0);
+						entityDeathEvent.setDroppedExp(0);
 					break;
 				case DELETE:
 				case RESET:
diff --git a/src/main/java/ch/njol/skript/expressions/ExprDropsOfBlock.java b/src/main/java/ch/njol/skript/expressions/ExprDropsOfBlock.java
index 64b5d167927..fd809b73b56 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprDropsOfBlock.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprDropsOfBlock.java
@@ -1,22 +1,3 @@
-/**
- * This file is part of Skript.
- *
- * Skript is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Skript is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import java.util.ArrayList;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprDurability.java b/src/main/java/ch/njol/skript/expressions/ExprDurability.java
index bf8dd737b00..06b176bccdb 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprDurability.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprDurability.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import ch.njol.skript.aliases.ItemType;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprEgg.java b/src/main/java/ch/njol/skript/expressions/ExprEgg.java
index 45f26fd1047..17b18ad73f1 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprEgg.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprEgg.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import org.bukkit.entity.Egg;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprElement.java b/src/main/java/ch/njol/skript/expressions/ExprElement.java
index b0d79dd08da..d5b61c17695 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprElement.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprElement.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import ch.njol.skript.Skript;
@@ -28,6 +10,7 @@
 import ch.njol.skript.lang.Literal;
 import ch.njol.skript.lang.SkriptParser.ParseResult;
 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;
@@ -37,13 +20,16 @@
 import org.apache.commons.lang.ArrayUtils;
 import org.bukkit.event.Event;
 import org.jetbrains.annotations.Nullable;
+import org.skriptlang.skript.lang.util.SkriptQueue;
 
 import java.lang.reflect.Array;
 import java.util.Iterator;
+import java.util.concurrent.ThreadLocalRandom;
 
 @Name("Elements")
 @Description({
-		"The first, last, range or a random element of a set, e.g. a list variable.",
+		"The first, last, range or a random element of a set, e.g. a list variable, or a queue.",
+		"Asking for elements from a queue will also remove them from the queue, see the new queue expression for more information.",
 		"See also: <a href='#ExprRandom'>random expression</a>"
 })
 @Examples({
@@ -51,7 +37,9 @@
 	"set {_last} to last element of {top players::*}",
 	"set {_random player} to random element out of all players",
 	"send 2nd last element of {top players::*} to player",
-	"set {page2::*} to elements from 11 to 20 of {top players::*}"
+	"set {page2::*} to elements from 11 to 20 of {top players::*}",
+	"broadcast the 1st element in {queue}",
+	"broadcast the first 3 elements in {queue}"
 })
 @Since("2.0, 2.7 (relative to last element), 2.8.0 (range of elements)")
 public class ExprElement<T> extends SimpleExpression<T> {
@@ -61,7 +49,13 @@ public class ExprElement<T> extends SimpleExpression<T> {
 		{"[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] 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}},
 	});
 
 	static {
@@ -83,33 +77,38 @@ private enum ElementType {
 	private Expression<? extends T> expr;
 	private	@Nullable Expression<Integer> startIndex, endIndex;
 	private ElementType type;
+	private boolean queue;
 
 	@Override
 	@SuppressWarnings("unchecked")
 	public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelayed, ParseResult parseResult) {
 		ElementType[] types = PATTERNS.getInfo(matchedPattern);
-		expr = LiteralUtils.defendExpression(exprs[exprs.length - 1]);
+		this.queue = matchedPattern > 4;
+		if (queue && !this.getParser().hasExperiment(Feature.QUEUES))
+			return false;
+		if (queue) {
+			this.expr = (Expression<T>) exprs[exprs.length - 1];
+		} else {
+			this.expr = LiteralUtils.defendExpression(exprs[exprs.length - 1]);
+		}
 		switch (type = types[parseResult.mark]) {
 			case RANGE:
 				endIndex = (Expression<Integer>) exprs[1];
-				//$FALL-THROUGH$
-			case FIRST_X_ELEMENTS:
-			case LAST_X_ELEMENTS:
-			case ORDINAL:
-			case TAIL_END_ORDINAL:
+			case FIRST_X_ELEMENTS, LAST_X_ELEMENTS, ORDINAL, TAIL_END_ORDINAL:
 				startIndex = (Expression<Integer>) exprs[0];
 				break;
 			default:
 				startIndex = null;
 				break;
 		}
-		return LiteralUtils.canInitSafely(expr);
+		return queue || LiteralUtils.canInitSafely(expr);
 	}
 
 	@Override
-	@Nullable
 	@SuppressWarnings("unchecked")
-	protected T[] get(Event event) {
+	protected T @Nullable [] get(Event event) {
+		if (queue)
+			return this.getFromQueue(event);
 		Iterator<? extends T> iterator = expr.iterator(event);
 		if (iterator == null || !iterator.hasNext())
 			return null;
@@ -175,6 +174,40 @@ protected T[] get(Event event) {
 		return elementArray;
 	}
 
+	@SuppressWarnings("unchecked")
+	private T @Nullable [] getFromQueue(Event event) {
+		SkriptQueue queue = (SkriptQueue) expr.getSingle(event);
+		if (queue == null)
+			return null;
+		Integer startIndex = 0, endIndex = 0;
+		if (this.startIndex != null) {
+			startIndex = this.startIndex.getSingle(event);
+			if (startIndex == null || startIndex <= 0 && type != ElementType.RANGE)
+				return null;
+		}
+		if (this.endIndex != null) {
+			endIndex = this.endIndex.getSingle(event);
+			if (endIndex == null)
+				return null;
+		}
+		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 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 RANGE -> {
+				boolean reverse = startIndex > endIndex;
+				T[] elements = CollectionUtils.array((T[]) queue.removeRangeSafely(Math.min(startIndex, endIndex) - 1, Math.max(startIndex, endIndex)));
+				if (reverse)
+					ArrayUtils.reverse(elements);
+				yield elements;
+			}
+		};
+	}
+
 	@Override
 	@Nullable
 	@SuppressWarnings("unchecked")
@@ -188,6 +221,7 @@ public <R> Expression<? extends R> getConvertedExpression(Class<R>... to) {
 		exprElement.startIndex = startIndex;
 		exprElement.endIndex = endIndex;
 		exprElement.type = type;
+		exprElement.queue = queue;
 		return exprElement;
 	}
 
@@ -198,6 +232,8 @@ public boolean isSingle() {
 
 	@Override
 	public Class<? extends T> getReturnType() {
+		if (queue)
+			return (Class<? extends T>) Object.class;
 		return expr.getReturnType();
 	}
 
diff --git a/src/main/java/ch/njol/skript/expressions/ExprEnchantItem.java b/src/main/java/ch/njol/skript/expressions/ExprEnchantItem.java
index 30c9e2036b7..cf06ff046bc 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprEnchantItem.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprEnchantItem.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import org.bukkit.event.Event;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprEnchantingExpCost.java b/src/main/java/ch/njol/skript/expressions/ExprEnchantingExpCost.java
index eafdb5fbe69..4f9a52763dd 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprEnchantingExpCost.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprEnchantingExpCost.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import org.bukkit.event.Event;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprEnchantmentBonus.java b/src/main/java/ch/njol/skript/expressions/ExprEnchantmentBonus.java
index f1eadc1de2f..0e599582871 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprEnchantmentBonus.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprEnchantmentBonus.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import org.bukkit.event.Event;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprEnchantmentLevel.java b/src/main/java/ch/njol/skript/expressions/ExprEnchantmentLevel.java
index 71ccbc01d29..9c4266fb5cf 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprEnchantmentLevel.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprEnchantmentLevel.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import ch.njol.skript.Skript;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprEnchantmentOffer.java b/src/main/java/ch/njol/skript/expressions/ExprEnchantmentOffer.java
index 284e565d48c..e96f501b1a2 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprEnchantmentOffer.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprEnchantmentOffer.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import java.util.ArrayList;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprEnchantmentOfferCost.java b/src/main/java/ch/njol/skript/expressions/ExprEnchantmentOfferCost.java
index 1b549cc5351..f01d87a476b 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprEnchantmentOfferCost.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprEnchantmentOfferCost.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import org.bukkit.enchantments.EnchantmentOffer;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprEnchantments.java b/src/main/java/ch/njol/skript/expressions/ExprEnchantments.java
index 054dd99f7b0..8f7f7f409d2 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprEnchantments.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprEnchantments.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import java.util.ArrayList;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprEnderChest.java b/src/main/java/ch/njol/skript/expressions/ExprEnderChest.java
index 4eb3c8ccf01..dca7814af51 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprEnderChest.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprEnderChest.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import org.bukkit.entity.Player;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprEntities.java b/src/main/java/ch/njol/skript/expressions/ExprEntities.java
index 9b881d61a91..08a439f03ed 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprEntities.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprEntities.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import ch.njol.skript.Skript;
@@ -40,7 +22,9 @@
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
 import org.bukkit.event.Event;
+import org.bukkit.util.BoundingBox;
 import org.jetbrains.annotations.Nullable;
+import org.jetbrains.annotations.UnknownNullability;
 
 import java.lang.reflect.Array;
 import java.util.ArrayList;
@@ -50,14 +34,15 @@
 import java.util.List;
 
 @Name("Entities")
-@Description("All entities in all worlds, in a specific world, in a chunk or in a radius around a certain location, " +
+@Description("All entities in all worlds, in a specific world, in a chunk, in a radius around a certain location or within two locations. " +
 		"e.g. <code>all players</code>, <code>all creepers in the player's world</code>, or <code>players in radius 100 of the player</code>.")
 @Examples({"kill all creepers in the player's world",
 		"send \"Psst!\" to all players within 100 meters of the player",
 		"give a diamond to all ops",
 		"heal all tamed wolves in radius 2000 around {town center}",
-		"delete all monsters in chunk at player"})
-@Since("1.2.1, 2.5 (chunks)")
+		"delete all monsters in chunk at player",
+		"size of all players within {_corner::1} and {_corner::2}}"})
+@Since("1.2.1, 2.5 (chunks), 2.10 (within)")
 public class ExprEntities extends SimpleExpression<Entity> {
 
 	static {
@@ -65,38 +50,49 @@ public class ExprEntities extends SimpleExpression<Entity> {
 				"[(all [[of] the]|the)] %*entitydatas% [(in|of) ([world[s]] %-worlds%|1¦%-chunks%)]",
 				"[(all [[of] the]|the)] entities of type[s] %entitydatas% [(in|of) ([world[s]] %-worlds%|1¦%-chunks%)]",
 				"[(all [[of] the]|the)] %*entitydatas% (within|[with]in radius) %number% [(block[s]|met(er|re)[s])] (of|around) %location%",
-				"[(all [[of] the]|the)] entities of type[s] %entitydatas% in radius %number% (of|around) %location%");
+				"[(all [[of] the]|the)] entities of type[s] %entitydatas% in radius %number% (of|around) %location%",
+				"[(all [[of] the]|the)] %*entitydatas% within %location% and %location%",
+				"[(all [[of] the]|the)] entities of type[s] %entitydatas% within %location% and %location%");
 	}
 
 	@SuppressWarnings("null")
 	Expression<? extends EntityData<?>> types;
 
-	@Nullable
+	@UnknownNullability
 	private Expression<World> worlds;
-	@Nullable
+	@UnknownNullability
 	private Expression<Chunk> chunks;
-	@Nullable
+	@UnknownNullability
 	private Expression<Number> radius;
-	@Nullable
+	@UnknownNullability
 	private Expression<Location> center;
+	@UnknownNullability
+	private Expression<Location> from;
+	@UnknownNullability
+	private Expression<Location> to;
 
 	private Class<? extends Entity> returnType = Entity.class;
 	private boolean isUsingRadius;
+	private boolean isUsingCuboid;
 
 	@Override
 	@SuppressWarnings("unchecked")
 	public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelayed, ParseResult parseResult) {
 		types = (Expression<? extends EntityData<?>>) exprs[0];
 		if (matchedPattern % 2 == 0) {
-			for (EntityData<?> d : ((Literal<EntityData<?>>) types).getAll()) {
-				if (d.isPlural().isFalse() || d.isPlural().isUnknown() && !StringUtils.startsWithIgnoreCase(parseResult.expr, "all"))
+			for (EntityData<?> entityType : ((Literal<EntityData<?>>) types).getAll()) {
+				if (entityType.isPlural().isFalse() || entityType.isPlural().isUnknown() && !StringUtils.startsWithIgnoreCase(parseResult.expr, "all"))
 					return false;
 			}
 		}
-		isUsingRadius = matchedPattern >= 2;
+		isUsingRadius = matchedPattern == 2 || matchedPattern == 3;
+		isUsingCuboid = matchedPattern >= 4;
 		if (isUsingRadius) {
-			radius = (Expression<Number>) exprs[exprs.length - 2];
-			center = (Expression<Location>) exprs[exprs.length - 1];
+			radius = (Expression<Number>) exprs[1];
+			center = (Expression<Location>) exprs[2];
+		} else if (isUsingCuboid) {
+			from = (Expression<Location>) exprs[1];
+			to = (Expression<Location>) exprs[2];
 		} else {
 			if (parseResult.mark == 1) {
 				chunks = (Expression<Chunk>) exprs[2];
@@ -115,11 +111,11 @@ public boolean isLoopOf(String s) {
 		if (!(types instanceof Literal<?>))
 			return false;
 		try (LogHandler ignored = new BlockingLogHandler().start()) {
-			EntityData<?> d = EntityData.parseWithoutIndefiniteArticle(s);
-			if (d != null) {
-				for (EntityData<?> t : ((Literal<EntityData<?>>) types).getAll()) {
-					assert t != null;
-					if (!d.isSupertypeOf(t))
+			EntityData<?> entityData = EntityData.parseWithoutIndefiniteArticle(s);
+			if (entityData != null) {
+				for (EntityData<?> entityType : ((Literal<EntityData<?>>) types).getAll()) {
+					assert entityType != null;
+					if (!entityData.isSupertypeOf(entityType))
 						return false;
 				}
 				return true;
@@ -129,23 +125,22 @@ public boolean isLoopOf(String s) {
 	}
 
 	@Override
-	@Nullable
 	@SuppressWarnings("null")
-	protected Entity[] get(Event e) {
-		if (isUsingRadius) {
-			Iterator<? extends Entity> iter = iterator(e);
+	protected Entity @Nullable [] get(Event event) {
+		if (isUsingRadius || isUsingCuboid) {
+			Iterator<? extends Entity> iter = iterator(event);
 			if (iter == null || !iter.hasNext())
 				return null;
 
-			List<Entity> l = new ArrayList<>();
+			List<Entity> list = new ArrayList<>();
 			while (iter.hasNext())
-				l.add(iter.next());
-			return l.toArray((Entity[]) Array.newInstance(returnType, l.size()));
+				list.add(iter.next());
+			return list.toArray((Entity[]) Array.newInstance(returnType, list.size()));
 		} else {
 			if (chunks != null) {
-				return EntityData.getAll(types.getArray(e), returnType, chunks.getArray(e));
+				return EntityData.getAll(types.getArray(event), returnType, chunks.getArray(event));
 			} else {
-				return EntityData.getAll(types.getAll(e), returnType, worlds != null ? worlds.getArray(e) : null);
+				return EntityData.getAll(types.getAll(event), returnType, worlds != null ? worlds.getArray(event) : null);
 			}
 		}
 	}
@@ -153,38 +148,59 @@ protected Entity[] get(Event e) {
 	@Override
 	@Nullable
 	@SuppressWarnings("null")
-	public Iterator<? extends Entity> iterator(Event e) {
+	public Iterator<? extends Entity> iterator(Event event) {
 		if (isUsingRadius) {
-			assert center != null;
-			Location l = center.getSingle(e);
-			if (l == null)
+			Location location = center.getSingle(event);
+			if (location == null)
 				return null;
-			assert radius != null;
-			Number n = radius.getSingle(e);
-			if (n == null)
+			Number number = radius.getSingle(event);
+			if (number == null)
 				return null;
-			double d = n.doubleValue();
+			double rad = number.doubleValue();
 
-			if (l.getWorld() == null) // safety
+			if (location.getWorld() == null) // safety
 				return null;
 
-			Collection<Entity> es = l.getWorld().getNearbyEntities(l, d, d, d);
-			double radiusSquared = d * d * Skript.EPSILON_MULT;
-			EntityData<?>[] ts = types.getAll(e);
-			return new CheckedIterator<>(es.iterator(), e1 -> {
-					if (e1 == null || e1.getLocation().distanceSquared(l) > radiusSquared)
+			Collection<Entity> nearbyEntities = location.getWorld().getNearbyEntities(location, rad, rad, rad);
+			double radiusSquared = rad * rad * Skript.EPSILON_MULT;
+			EntityData<?>[] entityTypes = types.getAll(event);
+			return new CheckedIterator<>(nearbyEntities.iterator(), entity -> {
+					if (entity == null || entity.getLocation().distanceSquared(location) > radiusSquared)
 						return false;
-					for (EntityData<?> t : ts) {
-						if (t.isInstance(e1))
+					for (EntityData<?> entityType : entityTypes) {
+						if (entityType.isInstance(entity))
 							return true;
 					}
 					return false;
 				});
+		} else if (isUsingCuboid) {
+			Location corner1 = from.getSingle(event);
+			if (corner1 == null)
+				return null;
+			Location corner2 = to.getSingle(event);
+			if (corner2 == null)
+				return null;
+			EntityData<?>[] entityTypes = types.getAll(event);
+			World world = corner1.getWorld();
+			if (world == null)
+				world = corner2.getWorld();
+			if (world == null)
+				return null;
+			Collection<Entity> entities = corner1.getWorld().getNearbyEntities(BoundingBox.of(corner1, corner2));
+			return new CheckedIterator<>(entities.iterator(), entity -> {
+				if (entity == null)
+					return false;
+				for (EntityData<?> entityType : entityTypes) {
+					if (entityType.isInstance(entity))
+						return true;
+				}
+				return false;
+			});
 		} else {
 			if (chunks == null || returnType == Player.class)
-				return super.iterator(e);
+				return super.iterator(event);
 
-			return Arrays.stream(EntityData.getAll(types.getArray(e), returnType, chunks.getArray(e))).iterator();
+			return Arrays.stream(EntityData.getAll(types.getArray(event), returnType, chunks.getArray(event))).iterator();
 		}
 	}
 
@@ -201,8 +217,14 @@ public Class<? extends Entity> getReturnType() {
 	@Override
 	@SuppressWarnings("null")
 	public String toString(@Nullable Event e, boolean debug) {
-		return "all entities of type " + types.toString(e, debug) + (worlds != null ? " in " + worlds.toString(e, debug) :
-				radius != null && center != null ? " in radius " + radius.toString(e, debug) + " around " + center.toString(e, debug) : "");
+		String message = "all entities of type " + types.toString(e, debug);
+		if (worlds != null)
+			message += " in " + worlds.toString(e, debug);
+		else if (radius != null && center != null)
+			message += " in radius " + radius.toString(e, debug) + " around " + center.toString(e, debug);
+		else if (from != null && to != null)
+			message += " within " + from.toString(e, debug) + " and " + to.toString(e, debug);
+		return message;
 	}
 
 }
diff --git a/src/main/java/ch/njol/skript/expressions/ExprEntity.java b/src/main/java/ch/njol/skript/expressions/ExprEntity.java
index ec3e45b6d1c..15782c7bcdb 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprEntity.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprEntity.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import org.bukkit.entity.Entity;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprEntityAttribute.java b/src/main/java/ch/njol/skript/expressions/ExprEntityAttribute.java
index 5c1ab2f5349..6c672c59ed6 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprEntityAttribute.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprEntityAttribute.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import ch.njol.skript.Skript;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprEntityItemUseTime.java b/src/main/java/ch/njol/skript/expressions/ExprEntityItemUseTime.java
index 7b7dba018f7..31b07d846d6 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprEntityItemUseTime.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprEntityItemUseTime.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import ch.njol.skript.Skript;
@@ -63,8 +45,8 @@ public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelaye
 	@Override
 	public Timespan convert(LivingEntity livingEntity) {
 		if (remaining)
-			return Timespan.fromTicks(livingEntity.getItemUseRemainingTime());
-		return Timespan.fromTicks(livingEntity.getHandRaisedTime());
+			return new Timespan(Timespan.TimePeriod.TICK, livingEntity.getItemUseRemainingTime());
+		return new Timespan(Timespan.TimePeriod.TICK, livingEntity.getHandRaisedTime());
 	}
 
 	@Override
diff --git a/src/main/java/ch/njol/skript/expressions/ExprEntitySnapshot.java b/src/main/java/ch/njol/skript/expressions/ExprEntitySnapshot.java
new file mode 100644
index 00000000000..9ce582aea5a
--- /dev/null
+++ b/src/main/java/ch/njol/skript/expressions/ExprEntitySnapshot.java
@@ -0,0 +1,71 @@
+package ch.njol.skript.expressions;
+
+import ch.njol.skript.Skript;
+import ch.njol.skript.doc.*;
+import ch.njol.skript.entity.EntityData;
+import ch.njol.skript.expressions.base.SimplePropertyExpression;
+import ch.njol.skript.lang.Expression;
+import ch.njol.skript.lang.SkriptParser.ParseResult;
+import ch.njol.util.Kleenean;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.EntitySnapshot;
+import org.bukkit.entity.FishHook;
+import org.bukkit.entity.Player;
+import org.jetbrains.annotations.Nullable;
+
+@Name("Entity Snapshot")
+@Description({
+	"Returns the entity snapshot of a provided entity, which includes all the data associated with it "
+	    + "(name, health, attributes, etc.) at the time this expression is used.",
+	"Individual attributes of a snapshot cannot be modified or retrieved."
+})
+@Examples({
+	"spawn a pig at location(0, 0, 0):",
+		"\tset the max health of entity to 20",
+		"\tset the health of entity to 20",
+		"\tset {_snapshot} to the entity snapshot of entity",
+		"\tclear entity",
+	"spawn {_snapshot} at location(0, 0, 0)"
+})
+@RequiredPlugins("Minecraft 1.20.2+")
+@Since("2.10")
+public class ExprEntitySnapshot extends SimplePropertyExpression<Object, EntitySnapshot> {
+
+	static {
+		if (Skript.classExists("org.bukkit.entity.EntitySnapshot"))
+			register(ExprEntitySnapshot.class, EntitySnapshot.class, "entity snapshot", "entities/entitydatas");
+	}
+
+	@Override
+	public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelayed, ParseResult parseResult) {
+		if (Player.class.isAssignableFrom(exprs[0].getReturnType()) || FishHook.class.isAssignableFrom(exprs[0].getReturnType())) {
+			Skript.error("One or more listed entities can not return an entity snapshot.");
+			return false;
+		}
+		return super.init(exprs, matchedPattern, isDelayed, parseResult);
+	}
+
+	@Override
+	public @Nullable EntitySnapshot convert(Object object) {
+		if (object instanceof Entity entity) {
+			return entity.createSnapshot();
+		} else if (object instanceof EntityData<?> entityData) {
+			Entity entity = entityData.create();
+			EntitySnapshot snapshot = entity.createSnapshot();
+			entity.remove();
+			return snapshot;
+		}
+		return null;
+	}
+
+	@Override
+	protected String getPropertyName() {
+		return "entity snapshot";
+	}
+
+	@Override
+	public Class<EntitySnapshot> getReturnType() {
+		return EntitySnapshot.class;
+	}
+
+}
diff --git a/src/main/java/ch/njol/skript/expressions/ExprEntitySound.java b/src/main/java/ch/njol/skript/expressions/ExprEntitySound.java
new file mode 100644
index 00000000000..177c124e9de
--- /dev/null
+++ b/src/main/java/ch/njol/skript/expressions/ExprEntitySound.java
@@ -0,0 +1,193 @@
+package ch.njol.skript.expressions;
+
+import ch.njol.skript.Skript;
+import ch.njol.skript.aliases.ItemType;
+import ch.njol.skript.bukkitutil.SoundUtils;
+import ch.njol.skript.doc.Description;
+import ch.njol.skript.doc.Examples;
+import ch.njol.skript.doc.Name;
+import ch.njol.skript.doc.RequiredPlugins;
+import ch.njol.skript.doc.Since;
+import ch.njol.skript.lang.Expression;
+import ch.njol.skript.lang.ExpressionType;
+import ch.njol.skript.lang.SkriptParser.ParseResult;
+import ch.njol.skript.lang.util.SimpleExpression;
+import ch.njol.skript.util.Patterns;
+import ch.njol.util.Kleenean;
+import org.bukkit.Material;
+import org.bukkit.Sound;
+import org.bukkit.entity.LivingEntity;
+import org.bukkit.entity.Mob;
+import org.bukkit.event.Event;
+import org.bukkit.inventory.ItemStack;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.Objects;
+
+@Name("Entity Sound")
+@Description("Gets the sound that a given entity will make in a specific scenario.")
+@Examples({
+	"play sound (hurt sound of player) at player",
+	"set {_sounds::*} to death sounds of (all mobs in radius 10 of player)"
+})
+@Since("2.10")
+@RequiredPlugins("Spigot 1.19.2+")
+public class ExprEntitySound extends SimpleExpression<String> {
+
+	public enum SoundType {
+		DAMAGE {
+			@Override
+			public @Nullable Sound getSound(LivingEntity entity, int height, ItemStack item, boolean bigOrSpeedy) {
+				return entity.getHurtSound();
+			}
+		},
+		DEATH {
+			@Override
+			public @Nullable Sound getSound(LivingEntity entity, int height, ItemStack item, boolean bigOrSpeedy) {
+				return entity.getDeathSound();
+			}
+		},
+		FALL {
+			@Override
+			public Sound getSound(LivingEntity entity, int height, ItemStack item, boolean bigOrSpeedy) {
+				if (height != -1)
+					return entity.getFallDamageSound(height);
+				else
+					return bigOrSpeedy ? entity.getFallDamageSoundBig() : entity.getFallDamageSoundSmall();
+			}
+		},
+		SWIM {
+			@Override
+			public Sound getSound(LivingEntity entity, int height, ItemStack item, boolean bigOrSpeedy) {
+				return entity.getSwimSound();
+			}
+		},
+		SPLASH {
+			@Override
+			public Sound getSound(LivingEntity entity, int height, ItemStack item, boolean bigOrSpeedy) {
+				return bigOrSpeedy ? entity.getSwimHighSpeedSplashSound() : entity.getSwimSplashSound();
+			}
+		},
+		EAT {
+			@Override
+			public Sound getSound(LivingEntity entity, int height, ItemStack item, boolean bigOrSpeedy) {
+				return entity.getEatingSound(item);
+			}
+		},
+		DRINK {
+			@Override
+			public Sound getSound(LivingEntity entity, int height, ItemStack item, boolean bigOrSpeedy) {
+				return entity.getDrinkingSound(item);
+			}
+		},
+		AMBIENT {
+			@Override
+			public @Nullable Sound getSound(LivingEntity entity, int height, ItemStack item, boolean bigOrSpeedy) {
+				return entity instanceof Mob mob ? mob.getAmbientSound() : null;
+			}
+		};
+
+		public abstract @Nullable Sound getSound(LivingEntity entity, int height, ItemStack item, boolean bigOrSpeedy);
+	}
+
+	private static final Patterns<SoundType> patterns = new Patterns<>(new Object[][]{
+		{"[the] (damage|hurt) sound[s] of %livingentities%", SoundType.DAMAGE},
+		{"%livingentities%'[s] (damage|hurt) sound[s]", SoundType.DAMAGE},
+
+		{"[the] death sound[s] of %livingentities%", SoundType.DEATH},
+		{"%livingentities%'[s] death sound[s]", SoundType.DEATH},
+
+		{"[the] [high:(tall|high)|(low|normal)] fall damage sound[s] [from [[a] height [of]] %-number%] of %livingentities%", SoundType.FALL},
+		{"%livingentities%'[s] [high:(tall|high)|low:(low|normal)] fall [damage] sound[s] [from [[a] height [of]] %-number%]", SoundType.FALL},
+
+		{"[the] swim[ming] sound[s] of %livingentities%", SoundType.SWIM},
+		{"%livingentities%'[s] swim[ming] sound[s]", SoundType.SWIM},
+
+		{"[the] [fast:(fast|speedy)] splash sound[s] of %livingentities%", SoundType.SPLASH},
+		{"%livingentities%'[s] [fast:(fast|speedy)] splash sound[s]", SoundType.SPLASH},
+
+		{"[the] eat[ing] sound[s] of %livingentities% [(with|using|[while] eating [a]) %-itemtype%]", SoundType.EAT},
+		{"%livingentities%'[s] eat[ing] sound[s]", SoundType.EAT},
+
+		{"[the] drink[ing] sound[s] of %livingentities% [(with|using|[while] drinking [a]) %-itemtype%]", SoundType.DRINK},
+		{"%livingentities%'[s] drink[ing] sound[s]", SoundType.DRINK},
+
+		{"[the] ambient sound[s] of %livingentities%", SoundType.AMBIENT},
+		{"%livingentities%'[s] ambient sound[s]", SoundType.AMBIENT}
+	});
+
+	static {
+		if (Skript.methodExists(LivingEntity.class, "getDeathSound"))
+			Skript.registerExpression(ExprEntitySound.class, String.class, ExpressionType.COMBINED, patterns.getPatterns());
+	}
+
+	private boolean bigOrSpeedy;
+	private SoundType soundType;
+	private Expression<Number> height;
+	private Expression<LivingEntity> entities;
+	private Expression<ItemType> item;
+
+	@Override
+	@SuppressWarnings("unchecked")
+	public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelayed, ParseResult parseResult) {
+		soundType = patterns.getInfo(matchedPattern);
+		bigOrSpeedy = parseResult.hasTag("high") || parseResult.hasTag("fast");
+		if (soundType == SoundType.FALL)
+			height = (Expression<Number>) exprs[0];
+		if (soundType == SoundType.EAT || soundType == SoundType.DRINK)
+			item = (Expression<ItemType>) exprs[1];
+		entities = (Expression<LivingEntity>) ((soundType == SoundType.FALL) ? exprs[1] : exprs[0]);
+		return true;
+	}
+
+	@Override
+	protected String @Nullable [] get(Event event) {
+        int height = this.height == null ? -1 : this.height.getOptionalSingle(event).orElse(-1).intValue();
+
+		ItemStack defaultItem = new ItemStack(soundType == SoundType.EAT ? Material.COOKED_BEEF : Material.POTION);
+        ItemStack item = this.item == null ? defaultItem : this.item.getOptionalSingle(event).map(ItemType::getRandom).orElse(defaultItem);
+
+		return entities.stream(event)
+			.map(entity -> soundType.getSound(entity, height, item, bigOrSpeedy))
+			.filter(Objects::nonNull)
+			.distinct()
+			.map(sound -> SoundUtils.getKey(sound).getKey())
+			.toArray(String[]::new);
+	}
+
+	@Override
+	public boolean isSingle() {
+		return entities.isSingle();
+	}
+
+	@Override
+	public Class<? extends String> getReturnType() {
+		return String.class;
+	}
+
+	@Override
+	public String toString(@Nullable Event event, boolean debug) {
+		String sound = "unknown";
+		switch (soundType) {
+			case DAMAGE, DEATH, SWIM, AMBIENT -> sound = soundType.name().toLowerCase();
+			case FALL -> {
+                if (this.height == null) {
+					sound = bigOrSpeedy ? "high fall damage" : "normal fall damage";
+				} else {
+					sound = "fall damage from a height of " + this.height.toString(event, debug);
+				}
+			}
+			case SPLASH -> sound = bigOrSpeedy ? "speedy splash" : "splash";
+			case EAT, DRINK -> {
+				String action = soundType == SoundType.EAT ? "eating" : "drinking";
+                if (this.item == null) {
+					sound = action;
+				} else {
+					sound = action + " " + this.item.toString(event, debug);
+				}
+			}
+		}
+		return sound + " sound of " + entities.toString(event, debug);
+	}
+
+}
diff --git a/src/main/java/ch/njol/skript/expressions/ExprEntityTamer.java b/src/main/java/ch/njol/skript/expressions/ExprEntityTamer.java
index 5d5cc0883e7..83f2aa43cc7 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprEntityTamer.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprEntityTamer.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import org.bukkit.OfflinePlayer;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprEventCancelled.java b/src/main/java/ch/njol/skript/expressions/ExprEventCancelled.java
index 59f0059041d..8bdcc466a59 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprEventCancelled.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprEventCancelled.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import org.bukkit.event.Cancellable;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprEventExpression.java b/src/main/java/ch/njol/skript/expressions/ExprEventExpression.java
index c2f4220be9f..8e08624b7d5 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprEventExpression.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprEventExpression.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import ch.njol.skript.Skript;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprEvtInitiator.java b/src/main/java/ch/njol/skript/expressions/ExprEvtInitiator.java
index 23a4c4213ce..aa454c71df3 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprEvtInitiator.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprEvtInitiator.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import ch.njol.skript.Skript;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprExhaustion.java b/src/main/java/ch/njol/skript/expressions/ExprExhaustion.java
index bb607e85f0b..1cab6371c1d 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprExhaustion.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprExhaustion.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import org.bukkit.entity.Player;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprExperience.java b/src/main/java/ch/njol/skript/expressions/ExprExperience.java
index 29be39d0fa2..aba4975419e 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprExperience.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprExperience.java
@@ -1,35 +1,8 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
-import org.bukkit.event.Event;
-import org.bukkit.event.block.BlockBreakEvent;
-import org.bukkit.event.player.PlayerExpChangeEvent;
-import org.jetbrains.annotations.Nullable;
-
 import ch.njol.skript.Skript;
 import ch.njol.skript.classes.Changer.ChangeMode;
-import ch.njol.skript.doc.Description;
-import ch.njol.skript.doc.Events;
-import ch.njol.skript.doc.Examples;
-import ch.njol.skript.doc.Name;
-import ch.njol.skript.doc.Since;
+import ch.njol.skript.doc.*;
 import ch.njol.skript.events.bukkit.ExperienceSpawnEvent;
 import ch.njol.skript.lang.Expression;
 import ch.njol.skript.lang.ExpressionType;
@@ -37,126 +10,148 @@
 import ch.njol.skript.lang.util.SimpleExpression;
 import ch.njol.skript.util.Experience;
 import ch.njol.util.Kleenean;
+import org.bukkit.event.Event;
+import org.bukkit.event.block.BlockBreakEvent;
+import org.bukkit.event.player.PlayerExpChangeEvent;
+import org.bukkit.event.player.PlayerFishEvent;
+import ch.njol.util.coll.CollectionUtils;
+import org.bukkit.event.Event;
+import org.bukkit.event.block.BlockBreakEvent;
+import org.bukkit.event.entity.EntityBreedEvent;
+import org.bukkit.event.player.PlayerExpChangeEvent;
+import org.jetbrains.annotations.Nullable;
 
-/**
- * @author Peter Güttinger
- */
 @Name("Experience")
 @Description("How much experience was spawned in an experience spawn or block break event. Can be changed.")
-@Examples({"on experience spawn:",
+@Examples({
+	"on experience spawn:",
 		"\tadd 5 to the spawned experience",
-		"on break of coal ore:",
+	"",
+	"on break of coal ore:",
 		"\tclear dropped experience",
-		"on break of diamond ore:",
+	"",
+	"on break of diamond ore:",
 		"\tif tool of player = diamond pickaxe:",
-		"\t\tadd 100 to dropped experience"})
-@Since("2.1, 2.5.3 (block break event), 2.7 (experience change event)")
-@Events({"experience spawn", "break / mine", "experience change"})
+			"\t\tadd 100 to dropped experience",
+	"",
+	"on breed:",
+		"\tbreeding father is a cow",
+		"\tset dropped experience to 10",
+   "",
+   "on fish catch:",
+		"\tadd 70 to dropped experience",
+})
+@Since("2.1, 2.5.3 (block break event), 2.7 (experience change event), 2.10 (breeding, fishing)")
+@Events({"experience spawn", "break / mine", "experience change", "entity breeding"})
 public class ExprExperience extends SimpleExpression<Experience> {
+
 	static {
-		Skript.registerExpression(ExprExperience.class, Experience.class, ExpressionType.SIMPLE, "[the] (spawned|dropped|) [e]xp[erience] [orb[s]]");
+		Skript.registerExpression(ExprExperience.class, Experience.class, ExpressionType.SIMPLE,
+			"[the] (spawned|dropped|) [e]xp[erience] [orb[s]]");
 	}
-	
+
 	@Override
-	public boolean init(final Expression<?>[] exprs, final int matchedPattern, final Kleenean isDelayed, final ParseResult parseResult) {
-		if (!getParser().isCurrentEvent(ExperienceSpawnEvent.class, BlockBreakEvent.class, PlayerExpChangeEvent.class)) {
-			Skript.error("The experience expression can only be used in experience spawn, block break and player experience change events");
+	public boolean init(Expression<?>[] expressions, int matchedPattern,
+						Kleenean isDelayed, ParseResult parseResult) {
+		if (!getParser().isCurrentEvent(ExperienceSpawnEvent.class, BlockBreakEvent.class,
+			PlayerExpChangeEvent.class, EntityBreedEvent.class, PlayerFishEvent.class)) {
+			Skript.error("The 'experience' expression can only be used in experience spawn, " +
+				"block break, player experience change, entity breeding or fishing events");
 			return false;
 		}
+
 		return true;
 	}
-	
+
 	@Override
-	@Nullable
-	protected Experience[] get(final Event e) {
-		if (e instanceof ExperienceSpawnEvent)
-			return new Experience[] {new Experience(((ExperienceSpawnEvent) e).getSpawnedXP())};
-		else if (e instanceof BlockBreakEvent)
-			return new Experience[] {new Experience(((BlockBreakEvent) e).getExpToDrop())};
-		else if (e instanceof PlayerExpChangeEvent)
-			return new Experience[] {new Experience(((PlayerExpChangeEvent) e).getAmount())};
-		else
-			return new Experience[0];
+	protected Experience @Nullable [] get(Event event) {
+		Experience[] exp;
+
+		if (event instanceof ExperienceSpawnEvent experienceSpawnEvent) {
+			exp = new Experience[]{new Experience(experienceSpawnEvent.getSpawnedXP())};
+		} else if (event instanceof BlockBreakEvent blockBreakEvent) {
+			exp = new Experience[]{new Experience(blockBreakEvent.getExpToDrop())};
+		} else if (event instanceof PlayerExpChangeEvent playerExpChangeEvent) {
+			exp = new Experience[]{new Experience(playerExpChangeEvent.getAmount())};
+		} else if (event instanceof EntityBreedEvent entityBreedEvent) {
+			exp = new Experience[]{new Experience(entityBreedEvent.getExperience())};
+		} else if (event instanceof PlayerFishEvent fishEvent) {
+			exp = new Experience[]{new Experience(fishEvent.getExpToDrop())};
+		} else {
+			exp = new Experience[0];
+		}
+
+		return exp;
 	}
-	
+
 	@Override
-	@Nullable
-	public Class<?>[] acceptChange(final ChangeMode mode) {
-		switch (mode) {
-			case ADD:
-			case DELETE:
-			case REMOVE:
-			case REMOVE_ALL:
-				return new Class[] {Experience[].class, Number[].class};
-			case SET:
-				return new Class[] {Experience.class, Number.class};
-			case RESET:
-				return null;
-		}
-		return null;
+	public Class<?> @Nullable [] acceptChange(ChangeMode mode) {
+		return switch (mode) {
+			case SET, DELETE -> CollectionUtils.array(Experience.class, Integer.class);
+			case ADD, REMOVE -> CollectionUtils.array(Experience[].class, Integer[].class);
+			case RESET -> CollectionUtils.array();
+			default -> null;
+		};
 	}
-	
+
 	@Override
-	public void change(final Event e, final @Nullable Object[] delta, final ChangeMode mode) {
-		double eventExp;
-		if (e instanceof ExperienceSpawnEvent) {
-			eventExp = ((ExperienceSpawnEvent) e).getSpawnedXP();
-		} else if (e instanceof BlockBreakEvent) {
-			eventExp = ((BlockBreakEvent) e).getExpToDrop();
-		} else if (e instanceof PlayerExpChangeEvent) {
-			eventExp = ((PlayerExpChangeEvent) e).getAmount();
+	public void change(Event event, Object @Nullable [] delta, ChangeMode mode) {
+		int exp;
+
+		if (event instanceof ExperienceSpawnEvent experienceSpawnEvent) {
+			exp = experienceSpawnEvent.getSpawnedXP();
+		} else if (event instanceof BlockBreakEvent blockBreakEvent) {
+			exp = blockBreakEvent.getExpToDrop();
+		} else if (event instanceof PlayerExpChangeEvent playerExpChangeEvent) {
+			exp = playerExpChangeEvent.getAmount();
+		} else if (event instanceof EntityBreedEvent entityBreedEvent) {
+			exp = entityBreedEvent.getExperience();
+		} else if (event instanceof PlayerFishEvent fishEvent) {
+			exp = fishEvent.getExpToDrop();
 		} else {
 			return;
 		}
-		if (delta == null) {
-			eventExp = 0;
-		} else {
-			for (Object obj : delta) {
-				double value = obj instanceof Experience ? ((Experience) obj).getXP() : ((Number) obj).doubleValue();
+
+		if (delta != null) {
+			for (Object object : delta) {
+				int value = object instanceof Experience experience ? experience.getXP() : (int) object;
 				switch (mode) {
-					case ADD:
-						eventExp += value;
-						break;
-					case SET:
-						eventExp = value;
-						break;
-					case REMOVE:
-					case REMOVE_ALL:
-						eventExp -= value;
-						break;
-					case RESET:
-					case DELETE:
-						assert false;
-						break;
+					case ADD -> exp += value;
+					case SET -> exp = value;
+					case REMOVE, REMOVE_ALL -> exp -= value;
 				}
 			}
+		} else {
+			exp = 0;
 		}
 
-		
-		eventExp = Math.max(0, Math.round(eventExp));
-		int roundedEventExp = (int) eventExp;
-		if (e instanceof ExperienceSpawnEvent) {
-			((ExperienceSpawnEvent) e).setSpawnedXP(roundedEventExp);
-		} else if (e instanceof BlockBreakEvent) {
-			((BlockBreakEvent) e).setExpToDrop(roundedEventExp);
-		} else if (e instanceof PlayerExpChangeEvent) {
-			((PlayerExpChangeEvent) e).setAmount(roundedEventExp);
+		exp = Math.max(0, exp);
+		if (event instanceof ExperienceSpawnEvent experienceSpawnEvent) {
+			experienceSpawnEvent.setSpawnedXP(exp);
+		} else if (event instanceof BlockBreakEvent blockBreakEvent) {
+			blockBreakEvent.setExpToDrop(exp);
+		} else if (event instanceof PlayerExpChangeEvent playerExpChangeEvent) {
+			playerExpChangeEvent.setAmount(exp);
+		} else if (event instanceof EntityBreedEvent entityBreedEvent) {
+			entityBreedEvent.setExperience(exp);
+		} else if (event instanceof PlayerFishEvent fishEvent) {
+			fishEvent.setExpToDrop(exp);
 		}
 	}
-	
+
 	@Override
 	public boolean isSingle() {
 		return true;
 	}
-	
+
 	@Override
 	public Class<? extends Experience> getReturnType() {
 		return Experience.class;
 	}
-	
+
 	@Override
-	public String toString(final @Nullable Event e, final boolean debug) {
+	public String toString(@Nullable Event event, boolean debug) {
 		return "the experience";
 	}
-	
+
 }
diff --git a/src/main/java/ch/njol/skript/expressions/ExprExperienceCooldown.java b/src/main/java/ch/njol/skript/expressions/ExprExperienceCooldown.java
new file mode 100644
index 00000000000..4fc90490348
--- /dev/null
+++ b/src/main/java/ch/njol/skript/expressions/ExprExperienceCooldown.java
@@ -0,0 +1,92 @@
+package ch.njol.skript.expressions;
+
+import ch.njol.skript.classes.Changer.ChangeMode;
+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.expressions.base.SimplePropertyExpression;
+import ch.njol.skript.util.Timespan;
+import ch.njol.util.Math2;
+import ch.njol.util.coll.CollectionUtils;
+import org.bukkit.entity.Player;
+import org.bukkit.event.Event;
+import org.jetbrains.annotations.Nullable;
+
+@Name("Experience Pickup Cooldown")
+@Description({
+	"The experience cooldown of a player.",
+	"Experience cooldown is how long until a player can pick up another orb of experience.",
+	"The cooldown of a player must be 0 to pick up another orb of experience."
+})
+@Examples({
+	"send experience cooldown of player",
+	"set the xp pickup cooldown of player to 1 hour",
+	"if exp collection cooldown of player >= 10 minutes:",
+		"\tclear the experience pickup cooldown of player"
+})
+@Since("2.10")
+public class ExprExperienceCooldown extends SimplePropertyExpression<Player, Timespan> {
+
+	static {
+		register(ExprExperienceCooldown.class, Timespan.class, "[the] (experience|[e]xp) [pickup|collection] cooldown", "players");
+	}
+
+	private static final int maxTicks = Integer.MAX_VALUE;
+
+	@Override
+	public Timespan convert(Player player) {
+		return new Timespan(Timespan.TimePeriod.TICK, player.getExpCooldown());
+	}
+
+	@Override
+	public Class<?> @Nullable [] acceptChange(ChangeMode mode) {
+		return switch (mode) {
+			case ADD, SET, RESET, DELETE -> CollectionUtils.array(Timespan.class);
+			default -> null;
+		};
+	}
+
+	@Override
+	public void change(Event event, Object @Nullable [] delta, ChangeMode mode) {
+		int providedTime = 0;
+		if (delta[0] != null)
+			providedTime = (int) ((Timespan) delta[0]).get(Timespan.TimePeriod.TICK);
+
+
+		switch (mode) {
+			case ADD -> {
+				for (Player player : getExpr().getArray(event)) {
+					player.setExpCooldown(Math2.fit(-1, player.getExpCooldown() + providedTime, Integer.MAX_VALUE));
+				}
+			}
+			case REMOVE -> {
+				for (Player player : getExpr().getArray(event)) {
+					player.setExpCooldown(Math2.fit(-1, player.getExpCooldown() - providedTime, Integer.MAX_VALUE));
+				}
+			}
+			case SET -> {
+				for (Player player : getExpr().getArray(event)) {
+					player.setExpCooldown(Math2.fit(-1, providedTime, Integer.MAX_VALUE));
+				}
+			}
+			case RESET, DELETE -> {
+				for (Player player : getExpr().getArray(event)) {
+					player.setExpCooldown(0);
+				}
+			}
+			default -> {}
+		}
+	}
+
+	@Override
+	protected String getPropertyName() {
+		return "experience cooldown";
+	}
+
+	@Override
+	public Class<? extends Timespan> getReturnType() {
+		return Timespan.class;
+	}
+
+}
diff --git a/src/main/java/ch/njol/skript/expressions/ExprExperienceCooldownChangeReason.java b/src/main/java/ch/njol/skript/expressions/ExprExperienceCooldownChangeReason.java
new file mode 100644
index 00000000000..4cb4570a7eb
--- /dev/null
+++ b/src/main/java/ch/njol/skript/expressions/ExprExperienceCooldownChangeReason.java
@@ -0,0 +1,40 @@
+package ch.njol.skript.expressions;
+
+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.expressions.base.EventValueExpression;
+import org.bukkit.event.Event;
+import org.bukkit.event.player.PlayerExpCooldownChangeEvent.ChangeReason;
+import org.jetbrains.annotations.Nullable;
+
+@Name("Experience Cooldown Change Reason")
+@Description({
+	"The <a href='classes.html#experiencechangereason'>experience change reason</a> within an " +
+	"<a href='events.html#experience%20cooldown%20change%20event'>experience cooldown change event</a>."
+})
+@Examples({
+	"on player experience cooldown change:",
+		"\tif xp cooldown change reason is plugin:",
+			"\t\t#Changed by a plugin",
+		"\telse if xp cooldown change reason is orb pickup:",
+			"\t\t#Changed by picking up xp orb"
+})
+@Since("2.10")
+public class ExprExperienceCooldownChangeReason extends EventValueExpression<ChangeReason> {
+
+	static {
+		register(ExprExperienceCooldownChangeReason.class, ChangeReason.class, "[the] (experience|[e]xp) cooldown change (reason|cause|type)");
+	}
+
+	public ExprExperienceCooldownChangeReason() {
+		super(ChangeReason.class);
+	}
+
+	@Override
+	public String toString(@Nullable Event event, boolean debug) {
+		return "experience cooldown change reason";
+	}
+
+}
diff --git a/src/main/java/ch/njol/skript/expressions/ExprExplodedBlocks.java b/src/main/java/ch/njol/skript/expressions/ExprExplodedBlocks.java
index aac5d1bd2a3..d67b502f56b 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprExplodedBlocks.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprExplodedBlocks.java
@@ -1,26 +1,9 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import java.util.List;
 
 import ch.njol.skript.classes.Changer.ChangeMode;
+import ch.njol.skript.lang.EventRestrictedSyntax;
 import ch.njol.util.coll.CollectionUtils;
 import org.bukkit.block.Block;
 import org.bukkit.event.Event;
@@ -61,21 +44,22 @@
 		"\tadd blocks above event-entity to exploded blocks"})
 @Events("explode")
 @Since("2.5, 2.8.6 (modify blocks)")
-public class ExprExplodedBlocks extends SimpleExpression<Block> {
+public class ExprExplodedBlocks extends SimpleExpression<Block> implements EventRestrictedSyntax {
 
 	static {
 		Skript.registerExpression(ExprExplodedBlocks.class, Block.class, ExpressionType.COMBINED, "[the] exploded blocks");
 	}
-	
+
 	@Override
 	public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelayed, SkriptParser.ParseResult parseResult) {
-		if (!getParser().isCurrentEvent(EntityExplodeEvent.class)) {
-			Skript.error("Exploded blocks can only be retrieved from an explode event.");
-			return false;
-		}
 		return true;
 	}
-	
+
+	@Override
+	public Class<? extends Event>[] supportedEvents() {
+		return CollectionUtils.array(EntityExplodeEvent.class);
+	}
+
 	@Nullable
 	@Override
 	protected Block[] get(Event e) {
diff --git a/src/main/java/ch/njol/skript/expressions/ExprExplosionBlockYield.java b/src/main/java/ch/njol/skript/expressions/ExprExplosionBlockYield.java
index a2a03b7f636..d38b373cfb3 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprExplosionBlockYield.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprExplosionBlockYield.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import org.bukkit.event.Event;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprExplosionYield.java b/src/main/java/ch/njol/skript/expressions/ExprExplosionYield.java
index aaefbc86f44..78605dbef38 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprExplosionYield.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprExplosionYield.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import org.bukkit.event.Event;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprExplosiveYield.java b/src/main/java/ch/njol/skript/expressions/ExprExplosiveYield.java
index f89c1daef1d..72f70126894 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprExplosiveYield.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprExplosiveYield.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import org.bukkit.entity.Creeper;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprEyeLocation.java b/src/main/java/ch/njol/skript/expressions/ExprEyeLocation.java
index 268148b21ad..bd4249c3f9d 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprEyeLocation.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprEyeLocation.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import org.bukkit.Location;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprFacing.java b/src/main/java/ch/njol/skript/expressions/ExprFacing.java
index 6b754154362..ec9b073d8df 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprFacing.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprFacing.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import ch.njol.skript.classes.Changer.ChangeMode;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprFallDistance.java b/src/main/java/ch/njol/skript/expressions/ExprFallDistance.java
index 34f5a00b0a5..161fa4dfe1d 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprFallDistance.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprFallDistance.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import org.bukkit.entity.Entity;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprFertilizedBlocks.java b/src/main/java/ch/njol/skript/expressions/ExprFertilizedBlocks.java
index 78e28775b12..9c8cc950ab0 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprFertilizedBlocks.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprFertilizedBlocks.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 
diff --git a/src/main/java/ch/njol/skript/expressions/ExprFilter.java b/src/main/java/ch/njol/skript/expressions/ExprFilter.java
index a9747bbc3fc..8f1b809976d 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprFilter.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprFilter.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import ch.njol.skript.Skript;
@@ -32,15 +14,15 @@
 import ch.njol.skript.lang.Variable;
 import ch.njol.skript.lang.parser.ParserInstance;
 import ch.njol.skript.lang.util.SimpleExpression;
+import ch.njol.skript.util.LiteralUtils;
+import ch.njol.util.Kleenean;
 import ch.njol.util.Pair;
+import com.google.common.collect.Iterators;
+import org.bukkit.event.Event;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.annotations.UnknownNullability;
 import org.skriptlang.skript.lang.converter.Converters;
-import ch.njol.skript.util.LiteralUtils;
-import ch.njol.util.Kleenean;
-import com.google.common.collect.Iterators;
-import org.bukkit.event.Event;
 
 import java.util.Collections;
 import java.util.HashSet;
@@ -48,7 +30,6 @@
 import java.util.Set;
 import java.util.Spliterator;
 import java.util.Spliterators;
-import java.util.regex.Pattern;
 import java.util.stream.StreamSupport;
 
 @Name("Filter")
@@ -57,31 +38,33 @@
 	"For example, if you ran 'broadcast \"something\" and \"something else\" where [string input is \"something\"]', ",
 	"only \"something\" would be broadcast as it is the only string that matched the condition."
 })
-@Examples("send \"congrats on being staff!\" to all players where [player input has permission \"staff\"]")
-@Since("2.2-dev36")
-@SuppressWarnings({"null", "unchecked"})
+@Examples({
+	"send \"congrats on being staff!\" to all players where [player input has permission \"staff\"]",
+	"loop (all blocks in radius 5 of player) where [block input is not air]:"
+})
+@Since("2.2-dev36, 2.10 (parenthesis pattern)")
 public class ExprFilter extends SimpleExpression<Object> implements InputSource {
 
 	static {
 		Skript.registerExpression(ExprFilter.class, Object.class, ExpressionType.COMBINED,
-				"%objects% (where|that match) \\[<.+>\\]");
+				"%objects% (where|that match) \\[<.+>\\]",
+				"%objects% (where|that match) \\(<.+>\\)"
+			);
 		if (!ParserInstance.isRegistered(InputData.class))
 			ParserInstance.registerData(InputData.class, InputData::new);
 	}
 
-	private Condition filterCondition;
-	private String unparsedCondition;
-	private Expression<?> unfilteredObjects;
-	private Set<ExprInput<?>> dependentInputs = new HashSet<>();
+	private @UnknownNullability Condition filterCondition;
+	private @UnknownNullability String unparsedCondition;
+	private @UnknownNullability Expression<?> unfilteredObjects;
+	private final Set<ExprInput<?>> dependentInputs = new HashSet<>();
 
-	@Nullable
-	private Object currentFilterValue;
-	@Nullable
-	private String currentFilterIndex;
+	private @Nullable Object currentValue;
+	private @UnknownNullability String currentIndex;
 
 	@Override
-	public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelayed, ParseResult parseResult) {
-		unfilteredObjects = LiteralUtils.defendExpression(exprs[0]);
+	public boolean init(Expression<?>[] expressions, int matchedPattern, Kleenean isDelayed, ParseResult parseResult) {
+		unfilteredObjects = LiteralUtils.defendExpression(expressions[0]);
 		if (unfilteredObjects.isSingle() || !LiteralUtils.canInitSafely(unfilteredObjects))
 			return false;
 		unparsedCondition = parseResult.regexes.get(0).group();
@@ -93,15 +76,15 @@ public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelaye
 		return filterCondition != null;
 	}
 
-	@NotNull
+
 	@Override
-	public Iterator<?> iterator(Event event) {
+	public @NotNull Iterator<?> iterator(Event event) {
 		if (unfilteredObjects instanceof Variable<?>) {
 			Iterator<Pair<String, Object>> variableIterator = ((Variable<?>) unfilteredObjects).variablesIterator(event);
 			return StreamSupport.stream(Spliterators.spliteratorUnknownSize(variableIterator, Spliterator.ORDERED), false)
 				.filter(pair -> {
-					currentFilterValue = pair.getValue();
-					currentFilterIndex = pair.getKey();
+					currentValue = pair.getValue();
+					currentIndex = pair.getKey();
 					return filterCondition.check(event);
 				})
 				.map(Pair::getValue)
@@ -109,19 +92,19 @@ public Iterator<?> iterator(Event event) {
 		}
 
 		// clear current index just to be safe
-		currentFilterIndex = null;
+		currentIndex = null;
 
 		Iterator<?> unfilteredObjectIterator = unfilteredObjects.iterator(event);
 		if (unfilteredObjectIterator == null)
 			return Collections.emptyIterator();
 		return Iterators.filter(unfilteredObjectIterator, candidateObject -> {
-			currentFilterValue = candidateObject;
+			currentValue = candidateObject;
 			return filterCondition.check(event);
 		});
 	}
 
 	@Override
-	protected Object[] get(Event event) {
+	protected Object @Nullable [] get(Event event) {
 		try {
 			return Converters.convertStrictly(Iterators.toArray(iterator(event), Object.class), getReturnType());
 		} catch (ClassCastException e1) {
@@ -139,9 +122,8 @@ public Class<?> getReturnType() {
 		return unfilteredObjects.getReturnType();
 	}
 
-
 	@Override
-	public String toString(Event event, boolean debug) {
+	public String toString(@Nullable Event event, boolean debug) {
 		return unfilteredObjects.toString(event, debug) + " that match [" + unparsedCondition + "]";
 	}
 
@@ -150,20 +132,12 @@ private boolean matchesAnySpecifiedTypes(String candidateString) {
 			ClassInfo<?> specifiedType = dependentInput.getSpecifiedType();
 			if (specifiedType == null)
 				return false;
-			Pattern[] specifiedTypePatterns = specifiedType.getUserInputPatterns();
-			if (specifiedTypePatterns == null)
-				return false;
-
-			for (Pattern typePattern : specifiedTypePatterns) {
-				if (typePattern.matcher(candidateString).matches()) {
-					return true;
-				}
-			}
+			if (specifiedType.matchesUserInput(candidateString))
+				return true;
 		}
 		return false;
 	}
 
-
 	@Override
 	public boolean isLoopOf(String candidateString) {
 		return unfilteredObjects.isLoopOf(candidateString) || matchesAnySpecifiedTypes(candidateString);
@@ -173,9 +147,8 @@ public Set<ExprInput<?>> getDependentInputs() {
 		return dependentInputs;
 	}
 
-	@Nullable
-	public Object getCurrentValue() {
-		return currentFilterValue;
+	public @Nullable Object getCurrentValue() {
+		return currentValue;
 	}
 
 	@Override
@@ -184,9 +157,8 @@ public boolean hasIndices() {
 	}
 
 	@Override
-	@UnknownNullability
-	public String getCurrentIndex() {
-		return currentFilterIndex;
+	public @UnknownNullability String getCurrentIndex() {
+		return currentIndex;
 	}
 
 }
diff --git a/src/main/java/ch/njol/skript/expressions/ExprFinalDamage.java b/src/main/java/ch/njol/skript/expressions/ExprFinalDamage.java
index 6d5573527e0..324ded1aef7 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprFinalDamage.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprFinalDamage.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import org.bukkit.event.Event;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprFireTicks.java b/src/main/java/ch/njol/skript/expressions/ExprFireTicks.java
index e12c124c1c1..a68e248487d 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprFireTicks.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprFireTicks.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import ch.njol.skript.classes.Changer.ChangeMode;
@@ -24,7 +6,11 @@
 import ch.njol.skript.doc.Name;
 import ch.njol.skript.doc.Since;
 import ch.njol.skript.expressions.base.SimplePropertyExpression;
+import ch.njol.skript.lang.Expression;
+import ch.njol.skript.lang.SkriptParser.ParseResult;
 import ch.njol.skript.util.Timespan;
+import ch.njol.skript.util.Timespan.TimePeriod;
+import ch.njol.util.Kleenean;
 import ch.njol.util.coll.CollectionUtils;
 import org.bukkit.entity.Entity;
 import org.bukkit.event.Event;
@@ -32,30 +18,44 @@
 
 @Name("Entity Fire Burn Duration")
 @Description("How much time an entity will be burning for.")
-@Examples({"send \"You will stop burning in %fire time of player%\""})
-@Since("2.7")
+@Examples({
+	"send \"You will stop burning in %fire time of player%\"",
+	"send the max burn time of target"
+})
+@Since("2.7, 2.10 (maximum)")
 public class ExprFireTicks extends SimplePropertyExpression<Entity, Timespan> {
 
 	static {
-		register(ExprFireTicks.class, Timespan.class, "(burn[ing]|fire) (time|duration)", "entities");
+		register(ExprFireTicks.class, Timespan.class, "[:max[imum]] (burn[ing]|fire) (time|duration)", "entities");
+	}
+
+	private boolean max;
+
+	@Override
+	public boolean init(Expression<?>[] expressions, int matchedPattern, Kleenean isDelayed, ParseResult parseResult) {
+		max = (parseResult.hasTag("max"));
+		return super.init(expressions, matchedPattern, isDelayed, parseResult);
 	}
 
 	@Override
-	@Nullable
-	public Timespan convert(Entity entity) {
-		return Timespan.fromTicks(Math.max(entity.getFireTicks(), 0));
+	public @Nullable Timespan convert(Entity entity) {
+		return new Timespan(TimePeriod.TICK, (max ? entity.getMaxFireTicks() : Math.max(entity.getFireTicks(), 0)));
 	}
 
 	@Override
-	@Nullable
-	public Class<?>[] acceptChange(ChangeMode mode) {
-		return (mode != ChangeMode.REMOVE_ALL) ? CollectionUtils.array(Timespan.class) :  null;
+	public Class<?> @Nullable [] acceptChange(ChangeMode mode) {
+		if (max)
+			return null;
+		return switch (mode) {
+			case ADD, SET, RESET, DELETE, REMOVE -> CollectionUtils.array(Timespan.class);
+			default -> null;
+		};
 	}
 
 	@Override
 	public void change(Event event, @Nullable Object[] delta, ChangeMode mode) {
 		Entity[] entities = getExpr().getArray(event);
-		int change = delta == null ? 0 : (int) ((Timespan) delta[0]).getTicks();
+		int change = delta == null ? 0 : (int) ((Timespan) delta[0]).getAs(Timespan.TimePeriod.TICK);
 		switch (mode) {
 			case REMOVE:
 				change = -change;
@@ -75,7 +75,7 @@ public void change(Event event, @Nullable Object[] delta, ChangeMode mode) {
 	}
 
 	@Override
-	public Class<? extends Timespan> getReturnType() {
+	public Class<Timespan> getReturnType() {
 		return Timespan.class;
 	}
 
diff --git a/src/main/java/ch/njol/skript/expressions/ExprFireworkEffect.java b/src/main/java/ch/njol/skript/expressions/ExprFireworkEffect.java
index 8765a2aa69d..802b43192e4 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprFireworkEffect.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprFireworkEffect.java
@@ -1,23 +1,6 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
+import ch.njol.skript.util.ColorRGB;
 import org.bukkit.FireworkEffect;
 import org.bukkit.event.Event;
 import org.jetbrains.annotations.Nullable;
@@ -86,11 +69,19 @@ protected FireworkEffect[] get(Event e) {
 			return null;
 		FireworkEffect.Builder builder = FireworkEffect.builder().with(type);
 		
-		for (Color colour : color.getArray(e))
-			builder.withColor(colour.asBukkitColor());
+		for (Color colour : color.getArray(e)) {
+			if (colour instanceof ColorRGB)
+				builder.withColor(colour.asBukkitColor());
+			else
+				builder.withColor(colour.asDyeColor().getFireworkColor());
+		}
 		if (hasFade)
-			for (Color colour : fade.getArray(e))
-				builder.withFade(colour.asBukkitColor());
+			for (Color colour : fade.getArray(e)) {
+				if (colour instanceof ColorRGB)
+					builder.withFade(colour.asBukkitColor());
+				else
+					builder.withFade(colour.asDyeColor().getFireworkColor());
+			}
 		
 		builder.flicker(flicker);
 		builder.trail(trail);
diff --git a/src/main/java/ch/njol/skript/expressions/ExprFlightMode.java b/src/main/java/ch/njol/skript/expressions/ExprFlightMode.java
index 861ae7c4dbe..c25e0040d74 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprFlightMode.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprFlightMode.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import ch.njol.skript.classes.Changer;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprFoodLevel.java b/src/main/java/ch/njol/skript/expressions/ExprFoodLevel.java
index 8f749ef1358..2ac18e7acba 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprFoodLevel.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprFoodLevel.java
@@ -1,28 +1,5 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
-import org.bukkit.entity.Player;
-import org.bukkit.event.Event;
-import org.bukkit.event.entity.FoodLevelChangeEvent;
-import org.jetbrains.annotations.Nullable;
-
 import ch.njol.skript.Skript;
 import ch.njol.skript.classes.Changer.ChangeMode;
 import ch.njol.skript.doc.Description;
@@ -34,10 +11,13 @@
 import ch.njol.skript.lang.Expression;
 import ch.njol.skript.lang.ExpressionType;
 import ch.njol.skript.lang.SkriptParser.ParseResult;
-import ch.njol.skript.util.Getter;
 import ch.njol.util.Kleenean;
 import ch.njol.util.Math2;
 import ch.njol.util.coll.CollectionUtils;
+import org.bukkit.entity.Player;
+import org.bukkit.event.Event;
+import org.bukkit.event.entity.FoodLevelChangeEvent;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * @author Peter Güttinger
@@ -60,15 +40,13 @@ public boolean init(final Expression<?>[] vars, final int matchedPattern, final
 	}
 	
 	@Override
-	protected Number[] get(final Event e, final Player[] source) {
-		return get(source, new Getter<Number, Player>() {
-			@Override
-			public Number get(final Player p) {
-				if (getTime() >= 0 && e instanceof FoodLevelChangeEvent && p.equals(((FoodLevelChangeEvent) e).getEntity()) && !Delay.isDelayed(e)) {
-					return 0.5f * ((FoodLevelChangeEvent) e).getFoodLevel();
-				}
-				return 0.5f * p.getFoodLevel();
+	protected Number[] get(Event event, Player[] source) {
+		return get(source, player -> {
+			if (getTime() >= 0 && event instanceof FoodLevelChangeEvent foodLevelChangeEvent
+				&& player.equals(foodLevelChangeEvent.getEntity()) && !Delay.isDelayed(event)) {
+				return 0.5f * foodLevelChangeEvent.getFoodLevel();
 			}
+			return 0.5f * player.getFoodLevel();
 		});
 	}
 	
diff --git a/src/main/java/ch/njol/skript/expressions/ExprFormatDate.java b/src/main/java/ch/njol/skript/expressions/ExprFormatDate.java
index 63a755cdd29..d18ea2a4c78 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprFormatDate.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprFormatDate.java
@@ -1,30 +1,5 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
-import java.text.SimpleDateFormat;
-
-import ch.njol.skript.lang.Literal;
-import ch.njol.skript.lang.VariableString;
-import org.bukkit.event.Event;
-import org.jetbrains.annotations.Nullable;
-
 import ch.njol.skript.Skript;
 import ch.njol.skript.doc.Description;
 import ch.njol.skript.doc.Examples;
@@ -33,10 +8,15 @@
 import ch.njol.skript.expressions.base.PropertyExpression;
 import ch.njol.skript.lang.Expression;
 import ch.njol.skript.lang.ExpressionType;
+import ch.njol.skript.lang.Literal;
 import ch.njol.skript.lang.SkriptParser.ParseResult;
+import ch.njol.skript.lang.VariableString;
 import ch.njol.skript.util.Date;
-import ch.njol.skript.util.Getter;
 import ch.njol.util.Kleenean;
+import org.bukkit.event.Event;
+import org.jetbrains.annotations.Nullable;
+
+import java.text.SimpleDateFormat;
 
 @Name("Formatted Date")
 @Description({
@@ -115,12 +95,7 @@ protected String[] get(Event e, Date[] source) {
 			format = this.format;
 		}
 
-		return get(source, new Getter<String, Date>() {
-			@Override
-			public String get(Date date) {
-				return format.format(new java.util.Date(date.getTimestamp()));
-			}
-		});
+		return get(source, date -> format.format(date));
 	}
 
 	@Override
diff --git a/src/main/java/ch/njol/skript/expressions/ExprFreezeTicks.java b/src/main/java/ch/njol/skript/expressions/ExprFreezeTicks.java
index 003cc77fae3..c75766f09ea 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprFreezeTicks.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprFreezeTicks.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import ch.njol.skript.Skript;
@@ -48,7 +30,7 @@ public class ExprFreezeTicks extends SimplePropertyExpression<Entity, Timespan>
 	@Override
 	@Nullable
 	public Timespan convert(Entity entity) {
-		return Timespan.fromTicks(entity.getFreezeTicks());
+		return new Timespan(Timespan.TimePeriod.TICK, entity.getFreezeTicks());
 	}
 
 	@Override
@@ -59,7 +41,7 @@ public Class<?>[] acceptChange(ChangeMode mode) {
 
 	@Override
 	public void change(Event e, @Nullable Object[] delta, ChangeMode mode) {
-		int time = delta == null ? 0 : (int) ((Timespan) delta[0]).getTicks();
+		int time = delta == null ? 0 : (int) ((Timespan) delta[0]).getAs(Timespan.TimePeriod.TICK);
 		int newTime;
 		switch (mode) {
 			case ADD:
diff --git a/src/main/java/ch/njol/skript/expressions/ExprFunction.java b/src/main/java/ch/njol/skript/expressions/ExprFunction.java
new file mode 100644
index 00000000000..01cc92fb86f
--- /dev/null
+++ b/src/main/java/ch/njol/skript/expressions/ExprFunction.java
@@ -0,0 +1,129 @@
+package ch.njol.skript.expressions;
+
+import ch.njol.skript.Skript;
+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.SkriptParser.ParseResult;
+import ch.njol.skript.lang.function.DynamicFunctionReference;
+import ch.njol.skript.lang.function.Functions;
+import ch.njol.skript.lang.function.Namespace;
+import ch.njol.skript.lang.util.SimpleExpression;
+import ch.njol.skript.registrations.Feature;
+import ch.njol.util.Kleenean;
+import ch.njol.util.coll.CollectionUtils;
+import org.bukkit.event.Event;
+import org.jetbrains.annotations.Nullable;
+import org.skriptlang.skript.lang.script.Script;
+
+import java.util.Objects;
+
+@Name("Function (Experimental)")
+@Description("Obtain a function by name, which can be executed.")
+@Examples({
+		"set {_function} to the function named \"myFunction\"",
+		"run {_function} with arguments 13 and true"
+})
+@Since("2.10")
+@SuppressWarnings("rawtypes")
+public class ExprFunction extends SimpleExpression<DynamicFunctionReference> {
+
+	static {
+		Skript.registerExpression(ExprFunction.class, DynamicFunctionReference.class, ExpressionType.COMBINED,
+				"[the|a] function [named] %string% [(in|from) %-script%]",
+				"[the] functions [named] %strings% [(in|from) %-script%]",
+				"[all [[of] the]|the] functions (in|from) %script%"
+		);
+	}
+
+	private Expression<String> name;
+	private Expression<Script> script;
+	private int mode;
+	private boolean local;
+	private Script here;
+
+	@Override
+	@SuppressWarnings("null")
+	public boolean init(Expression<?>[] expressions, int matchedPattern, Kleenean isDelayed,
+                        ParseResult result) {
+		if (!this.getParser().hasExperiment(Feature.SCRIPT_REFLECTION))
+			return false;
+		this.mode = matchedPattern;
+		this.local = mode == 2 || expressions[1] != null;
+		switch (mode) {
+			case 0, 1 -> {
+				//noinspection unchecked
+				this.name = (Expression<String>) expressions[0];
+				if (local)
+					//noinspection unchecked
+					this.script = (Expression<Script>) expressions[1];
+			}
+			case 2 ->
+				//noinspection unchecked
+				this.script = (Expression<Script>) expressions[0];
+		}
+		this.here = this.getParser().getCurrentScript();
+		return true;
+	}
+
+	@Override
+	protected DynamicFunctionReference<?>[] get(Event event) {
+		@Nullable Script script;
+		if (local) {
+			script = this.script.getSingle(event);
+		} else {
+			script = here;
+		}
+		return switch (mode) {
+			case 0 -> {
+				@Nullable String name = this.name.getSingle(event);
+				if (name == null)
+					yield CollectionUtils.array();
+				@Nullable DynamicFunctionReference reference = DynamicFunctionReference.resolveFunction(name, script);
+				if (reference == null)
+					yield CollectionUtils.array();
+				yield CollectionUtils.array(reference);
+			}
+			case 1 -> this.name.stream(event).map(string -> DynamicFunctionReference.resolveFunction(string, script))
+					.filter(Objects::nonNull)
+					.toArray(DynamicFunctionReference[]::new);
+			case 2 -> {
+				if (script == null)
+					yield CollectionUtils.array();
+				@Nullable Namespace namespace = Functions.getScriptNamespace(script.getConfig().getFileName());
+				if (namespace == null)
+					yield CollectionUtils.array();
+				yield namespace.getFunctions().stream()
+					.map(DynamicFunctionReference::new)
+					.toArray(DynamicFunctionReference[]::new);
+			}
+			default -> throw new IllegalStateException("Unexpected value: " + mode);
+		};
+	}
+
+	@Override
+	public boolean isSingle() {
+		return mode != 2 && name.isSingle();
+	}
+
+	@Override
+	public Class<? extends DynamicFunctionReference> getReturnType() {
+		return DynamicFunctionReference.class;
+	}
+
+	@Override
+	public String toString(@Nullable Event event, boolean debug) {
+		return switch (mode) {
+			case 0 -> "the function named " + name.toString(event, debug)
+						+ (local ? " from " + script.toString(event, debug) : "");
+			case 1 -> "functions named " + name.toString(event, debug)
+						+ (local ? " from " + script.toString(event, debug) : "");
+			case 2 -> "the functions from " + script.toString(event, debug);
+			default -> throw new IllegalStateException("Unexpected value: " + mode);
+		};
+	}
+
+}
diff --git a/src/main/java/ch/njol/skript/expressions/ExprFurnaceSlot.java b/src/main/java/ch/njol/skript/expressions/ExprFurnaceSlot.java
deleted file mode 100644
index b43652b7ae4..00000000000
--- a/src/main/java/ch/njol/skript/expressions/ExprFurnaceSlot.java
+++ /dev/null
@@ -1,259 +0,0 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
-package ch.njol.skript.expressions;
-
-import ch.njol.skript.Skript;
-import ch.njol.skript.doc.Description;
-import ch.njol.skript.doc.Events;
-import ch.njol.skript.doc.Examples;
-import ch.njol.skript.doc.Name;
-import ch.njol.skript.doc.Since;
-import ch.njol.skript.effects.Delay;
-import ch.njol.skript.lang.Expression;
-import ch.njol.skript.lang.ExpressionType;
-import ch.njol.skript.lang.SkriptParser.ParseResult;
-import ch.njol.skript.lang.util.SimpleExpression;
-import ch.njol.skript.registrations.EventValues;
-import ch.njol.skript.util.slot.InventorySlot;
-import ch.njol.skript.util.slot.Slot;
-import ch.njol.util.Kleenean;
-import org.bukkit.Bukkit;
-import org.bukkit.Material;
-import org.bukkit.block.Block;
-import org.bukkit.block.BlockState;
-import org.bukkit.block.Furnace;
-import org.bukkit.event.Event;
-import org.bukkit.event.inventory.FurnaceBurnEvent;
-import org.bukkit.event.inventory.FurnaceSmeltEvent;
-import org.bukkit.inventory.FurnaceInventory;
-import org.bukkit.inventory.ItemStack;
-import org.jetbrains.annotations.Nullable;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@Name("Furnace Slot")
-@Description({
-	"A slot of a furnace, i.e. either the ore, fuel or result slot.",
-	"Remember to use '<a href='#ExprBlock'>block</a>' and not <code>furnace</code>, as <code>furnace</code> is not an existing expression.",
-	"Note that <code>the result</code> and <code>the result slot</code> refer to separate things. <code>the result</code> is the product in a smelt event " +
-	"and <code>the result slot</code> is the output slot of a furnace (where <code>the result</code> will end up).",
-	"Note that if the result in a smelt event is changed to an item that differs in type from the items currently in " +
-	"the result slot, the smelting will fail to complete (the item will attempt to smelt itself again).",
-	"Note that if values other than <code>the result</code> are changed, event values may not accurately reflect the actual items in a furnace.",
-	"Thus you may wish to use the event block in this case (e.g. <code>the fuel slot of the event-block</code>) to get accurate values if needed."
-})
-@Examples({
-	"set the fuel slot of the clicked block to a lava bucket",
-	"set the block's ore slot to 64 iron ore",
-	"give the result of the block to the player",
-	"clear the result slot of the block"
-})
-@Events({"smelt", "fuel burn"})
-@Since("1.0, 2.8.0 (syntax rework)")
-public class ExprFurnaceSlot extends SimpleExpression<Slot> {
-
-	private static final int ORE = 0, FUEL = 1, RESULT = 2;
-	
-	static {
-		Skript.registerExpression(ExprFurnaceSlot.class, Slot.class, ExpressionType.PROPERTY,
-				"[the] (0:ore slot|1:fuel slot|2:result [5:slot])",
-				"[the] (0:ore|1:fuel|2:result) slot[s] of %blocks%",
-				"%blocks%'[s] (0:ore|1:fuel|2:result) slot[s]"
-		);
-	}
-
-	@Nullable
-	private Expression<Block> blocks;
-	private boolean isEvent;
-	private boolean isResultSlot;
-	private int slot;
-
-	@Override
-	@SuppressWarnings("unchecked")
-	public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelayed, ParseResult parseResult) {
-		isEvent = matchedPattern == 0;
-		if (!isEvent)
-			blocks = (Expression<Block>) exprs[0];
-
-		slot = parseResult.mark;
-		isResultSlot = slot == 7;
-		if (isResultSlot)
-			slot = RESULT;
-
-		if (isEvent && (slot == ORE || slot == RESULT) && !getParser().isCurrentEvent(FurnaceSmeltEvent.class)) {
-			Skript.error("Cannot use 'result slot' or 'ore slot' outside an ore smelt event.");
-			return false;
-		} else if (isEvent && slot == FUEL && !getParser().isCurrentEvent(FurnaceBurnEvent.class)) {
-			Skript.error("Cannot use 'fuel slot' outside a fuel burn event.");
-			return false;
-		}
-
-		return true;
-	}
-
-	@Override
-	@Nullable
-	protected Slot[] get(Event event) {
-		Block[] blocks;
-		if (isEvent) {
-			blocks = new Block[1];
-			if (event instanceof FurnaceSmeltEvent) {
-				blocks[0] = ((FurnaceSmeltEvent) event).getBlock();
-			} else if (event instanceof FurnaceBurnEvent) {
-				blocks[0] = ((FurnaceBurnEvent) event).getBlock();
-			} else {
-				return new Slot[0];
-			}
-		} else {
-			assert this.blocks != null;
-			blocks = this.blocks.getArray(event);
-		}
-
-		List<Slot> slots = new ArrayList<>();
-		for (Block block : blocks) {
-			BlockState state = block.getState();
-			if (!(state instanceof Furnace))
-				continue;
-			FurnaceInventory furnaceInventory = ((Furnace) state).getInventory();
-			if (isEvent && !Delay.isDelayed(event)) {
-				slots.add(new FurnaceEventSlot(event, furnaceInventory));
-			} else { // Normal inventory slot is fine since the time will always be in the present
-				slots.add(new InventorySlot(furnaceInventory, slot));
-			}
-		}
-		return slots.toArray(new Slot[0]);
-	}
-
-	@Override
-	public boolean isSingle() {
-		if (isEvent)
-			return true;
-		assert blocks != null;
-		return blocks.isSingle();
-	}
-
-	@Override
-	public Class<? extends Slot> getReturnType() {
-		return InventorySlot.class;
-	}
-
-	@Override
-	public String toString(@Nullable Event event, boolean debug) {
-		String time = (getTime() == -1) ? "past " : (getTime() == 1) ? "future " : "";
-		String slotName = (slot == ORE) ? "ore" : (slot == FUEL) ? "fuel" : "result";
-		if (isEvent) {
-			return "the " + time + slotName + (isResultSlot ? " slot" : "");
-		} else {
-			assert blocks != null;
-			return "the " + time + slotName + " slot of " + blocks.toString(event, debug);
-		}
-	}
-
-	@Override
-	public boolean setTime(int time) {
-		if (isEvent) { // getExpr will be null
-			if (slot == RESULT && !isResultSlot) { // 'the past/future result' - doesn't make sense, don't allow it
-				return false;
-			} else if (slot == FUEL) {
-				return setTime(time, FurnaceBurnEvent.class);
-			} else {
-				return setTime(time, FurnaceSmeltEvent.class);
-			}
-		}
-		return false;
-	}
-	
-	private final class FurnaceEventSlot extends InventorySlot {
-		
-		private final Event event;
-		
-		public FurnaceEventSlot(Event event, FurnaceInventory furnaceInventory) {
-			super(furnaceInventory, slot);
-			this.event = event;
-		}
-		
-		@Override
-		@Nullable
-		public ItemStack getItem() {
-			switch (slot) {
-				case ORE:
-					if (event instanceof FurnaceSmeltEvent) {
-						ItemStack source = ((FurnaceSmeltEvent) event).getSource().clone();
-						if (getTime() != EventValues.TIME_FUTURE)
-							return source;
-						source.setAmount(source.getAmount() - 1);
-						return source;
-					}
-					return super.getItem();
-				case FUEL:
-					if (event instanceof FurnaceBurnEvent) {
-						ItemStack fuel = ((FurnaceBurnEvent) event).getFuel().clone();
-						if (getTime() != EventValues.TIME_FUTURE)
-							return fuel;
-						// a single lava bucket becomes an empty bucket
-						// see https://minecraft.wiki/w/Smelting#Fuel
-						// this is declared here because setting the amount to 0 may cause the ItemStack to become AIR
-						Material newMaterial = fuel.getType() == Material.LAVA_BUCKET ? Material.BUCKET : Material.AIR;
-						fuel.setAmount(fuel.getAmount() - 1);
-						if (fuel.getAmount() == 0)
-							fuel = new ItemStack(newMaterial);
-						return fuel;
-					}
-					return super.getItem();
-				case RESULT:
-					if (event instanceof FurnaceSmeltEvent) {
-						ItemStack result = ((FurnaceSmeltEvent) event).getResult().clone();
-						if (isResultSlot) { // Special handling for getting the result slot
-							ItemStack currentResult = ((FurnaceInventory) getInventory()).getResult();
-							if (currentResult != null)
-								currentResult = currentResult.clone();
-							if (getTime() != EventValues.TIME_FUTURE) { // 'past result slot' and 'result slot'
-								return currentResult;
-							} else if (currentResult != null && currentResult.isSimilar(result)) { // 'future result slot'
-								currentResult.setAmount(currentResult.getAmount() + result.getAmount());
-								return currentResult;
-							} else {
-								return result;
-							}
-						}
-						// 'the result'
-						return result;
-					}
-					return super.getItem();
-			}
-			return null;
-		}
-
-		@Override
-		public void setItem(@Nullable ItemStack item) {
-			if (slot == RESULT && !isResultSlot && event instanceof FurnaceSmeltEvent) {
-				((FurnaceSmeltEvent) event).setResult(item != null ? item : new ItemStack(Material.AIR));
-			} else {
-				if (getTime() == EventValues.TIME_FUTURE) { // Since this is a future expression, run it AFTER the event
-					Bukkit.getScheduler().scheduleSyncDelayedTask(Skript.getInstance(), () -> FurnaceEventSlot.super.setItem(item));
-				} else {
-					super.setItem(item);
-				}
-			}
-		}
-		
-	}
-	
-}
diff --git a/src/main/java/ch/njol/skript/expressions/ExprGameMode.java b/src/main/java/ch/njol/skript/expressions/ExprGameMode.java
index 6d3107c04b7..4d299078307 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprGameMode.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprGameMode.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import ch.njol.skript.Skript;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprGameRule.java b/src/main/java/ch/njol/skript/expressions/ExprGameRule.java
index 5c59a39c30e..7e21a7caa2a 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprGameRule.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprGameRule.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import org.bukkit.GameRule;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprGlidingState.java b/src/main/java/ch/njol/skript/expressions/ExprGlidingState.java
index ede9345a61b..b616707c6e4 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprGlidingState.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprGlidingState.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import org.bukkit.entity.LivingEntity;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprGlowing.java b/src/main/java/ch/njol/skript/expressions/ExprGlowing.java
index ea3f7b4f2ce..d6cbb3e1d82 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprGlowing.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprGlowing.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import org.bukkit.entity.Entity;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprGravity.java b/src/main/java/ch/njol/skript/expressions/ExprGravity.java
index 01d99ea1f0a..fdc07803b15 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprGravity.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprGravity.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import org.bukkit.entity.Entity;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprHanging.java b/src/main/java/ch/njol/skript/expressions/ExprHanging.java
index e18f97fbdd7..0d746617fca 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprHanging.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprHanging.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import ch.njol.skript.Skript;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprHash.java b/src/main/java/ch/njol/skript/expressions/ExprHash.java
index fed5b62d6b1..7614220f014 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprHash.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprHash.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import java.nio.charset.Charset;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprHatchingNumber.java b/src/main/java/ch/njol/skript/expressions/ExprHatchingNumber.java
index 95c3ef3cc0c..49228742570 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprHatchingNumber.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprHatchingNumber.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import ch.njol.skript.Skript;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprHatchingType.java b/src/main/java/ch/njol/skript/expressions/ExprHatchingType.java
index ebf470f4c75..c5b8639657c 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprHatchingType.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprHatchingType.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import ch.njol.skript.Skript;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprHealAmount.java b/src/main/java/ch/njol/skript/expressions/ExprHealAmount.java
index 2facfc74f2c..5410d2ccc5d 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprHealAmount.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprHealAmount.java
@@ -1,21 +1,3 @@
-/**
- * This file is part of Skript.
- *
- * Skript is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Skript is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 
 package ch.njol.skript.expressions;
 
diff --git a/src/main/java/ch/njol/skript/expressions/ExprHealReason.java b/src/main/java/ch/njol/skript/expressions/ExprHealReason.java
index 330ec4ed4d7..bc6602eb8b3 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprHealReason.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprHealReason.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import ch.njol.skript.doc.Description;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprHealth.java b/src/main/java/ch/njol/skript/expressions/ExprHealth.java
index e33b85a47b1..9459a1b20d4 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprHealth.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprHealth.java
@@ -1,40 +1,16 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
-import org.bukkit.entity.LivingEntity;
-import org.bukkit.event.Event;
-import org.jetbrains.annotations.Nullable;
-
 import ch.njol.skript.bukkitutil.HealthUtils;
 import ch.njol.skript.classes.Changer.ChangeMode;
-import ch.njol.skript.doc.Description;
-import ch.njol.skript.doc.Events;
-import ch.njol.skript.doc.Examples;
-import ch.njol.skript.doc.Name;
-import ch.njol.skript.doc.Since;
+import ch.njol.skript.doc.*;
 import ch.njol.skript.expressions.base.PropertyExpression;
 import ch.njol.skript.lang.Expression;
 import ch.njol.skript.lang.SkriptParser.ParseResult;
-import ch.njol.skript.util.Getter;
 import ch.njol.util.Kleenean;
 import ch.njol.util.coll.CollectionUtils;
+import org.bukkit.entity.LivingEntity;
+import org.bukkit.event.Event;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * @author Peter Güttinger
@@ -67,12 +43,7 @@ protected Number[] get(final Event e, final LivingEntity[] source) {
 //				}
 //			});
 //		}
-		return get(source, new Getter<Number, LivingEntity>() {
-			@Override
-			public Number get(final LivingEntity entity) {
-				return HealthUtils.getHealth(entity);
-			}
-		});
+		return get(source, HealthUtils::getHealth);
 	}
 	
 	@Override
diff --git a/src/main/java/ch/njol/skript/expressions/ExprHiddenPlayers.java b/src/main/java/ch/njol/skript/expressions/ExprHiddenPlayers.java
index decfcd5977e..4041b58cb2e 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprHiddenPlayers.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprHiddenPlayers.java
@@ -1,41 +1,24 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
-import java.util.List;
-import java.util.ArrayList;
 import ch.njol.skript.Skript;
 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.SkriptParser;
 import ch.njol.skript.lang.Expression;
 import ch.njol.skript.lang.ExpressionType;
+import ch.njol.skript.lang.SkriptParser.ParseResult;
 import ch.njol.skript.lang.util.SimpleExpression;
 import ch.njol.util.Kleenean;
 import org.bukkit.entity.Player;
 import org.bukkit.event.Event;
 import org.jetbrains.annotations.Nullable;
 
+import java.util.ArrayList;
+import java.util.List;
+
 @Name("Hidden Players")
-@Description({"The players hidden from a player that were hidden using the <a href='effects.html#EffPlayerVisibility'>player visibility</a> effect."})
+@Description({"The players hidden from a player that were hidden using the <a href='effects.html#EffEntityVisibility'>entity visibility</a> effect."})
 @Examples({"message \"&lt;light red&gt;You are currently hiding: &lt;light gray&gt;%hidden players of the player%\""})
 @Since("2.3")
 public class ExprHiddenPlayers extends SimpleExpression<Player> {
@@ -47,33 +30,33 @@ public class ExprHiddenPlayers extends SimpleExpression<Player> {
 	}
 
 	@SuppressWarnings("null")
-	private Expression<Player> players;
+	private Expression<Player> viewers;
 
-	@SuppressWarnings({"unchecked", "null"})
 	@Override
-	public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelayed, SkriptParser.ParseResult parseResult) {
-		players = (Expression<Player>) exprs[0];
+	@SuppressWarnings("unchecked")
+	public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelayed, ParseResult result) {
+		viewers = (Expression<Player>) exprs[0];
 		return true;
 	}
 
-	@Override
-	public boolean isSingle() {
-		return false;
-	}
-
-	@Override
 	@Nullable
-	public Player[] get(Event e) {
+	@Override
+	public Player[] get(Event event) {
 		List<Player> list = new ArrayList<>();
-		for (Player player : players.getArray(e)) {
+		for (Player player : viewers.getArray(event)) {
 			list.addAll(player.spigot().getHiddenPlayers());
 		}
-		return list.toArray(new Player[list.size()]);
+		return list.toArray(new Player[0]);
 	}
 
 	@Nullable
-	public Expression<Player> getPlayers() {
-		return players;
+	public Expression<Player> getViewers() {
+		return viewers;
+	}
+
+	@Override
+	public boolean isSingle() {
+		return false;
 	}
 
 	@Override
@@ -82,8 +65,7 @@ public Class<? extends Player> getReturnType() {
 	}
 
 	@Override
-	public String toString(@Nullable Event e, boolean debug) {
-		return "hidden players for " + players.toString(e, debug);
+	public String toString(@Nullable Event event, boolean debug) {
+		return "hidden players for " + viewers.toString(event, debug);
 	}
-
 }
diff --git a/src/main/java/ch/njol/skript/expressions/ExprHostname.java b/src/main/java/ch/njol/skript/expressions/ExprHostname.java
index 08d1bfda582..3c6230f3d3a 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprHostname.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprHostname.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import org.bukkit.event.Event;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprHotbarButton.java b/src/main/java/ch/njol/skript/expressions/ExprHotbarButton.java
index 847f2353009..823d56abcac 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprHotbarButton.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprHotbarButton.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import org.bukkit.event.Event;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprHotbarSlot.java b/src/main/java/ch/njol/skript/expressions/ExprHotbarSlot.java
index 174560bdfae..98427ebd323 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprHotbarSlot.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprHotbarSlot.java
@@ -1,29 +1,5 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
-import org.bukkit.entity.Player;
-import org.bukkit.event.Event;
-import org.bukkit.event.player.PlayerItemHeldEvent;
-import org.bukkit.inventory.PlayerInventory;
-import org.jetbrains.annotations.Nullable;
-
 import ch.njol.skript.classes.Changer.ChangeMode;
 import ch.njol.skript.doc.Description;
 import ch.njol.skript.doc.Examples;
@@ -33,10 +9,14 @@
 import ch.njol.skript.lang.Expression;
 import ch.njol.skript.lang.SkriptParser.ParseResult;
 import ch.njol.skript.registrations.EventValues;
-import ch.njol.skript.util.Getter;
 import ch.njol.skript.util.slot.InventorySlot;
 import ch.njol.skript.util.slot.Slot;
 import ch.njol.util.Kleenean;
+import org.bukkit.entity.Player;
+import org.bukkit.event.Event;
+import org.bukkit.event.player.PlayerItemHeldEvent;
+import org.bukkit.inventory.PlayerInventory;
+import org.jetbrains.annotations.Nullable;
 
 @Name("Hotbar Slot")
 @Description({
@@ -74,21 +54,16 @@ public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelaye
 
 	@Override
 	protected Slot[] get(Event event, Player[] source) {
-		return get(source, new Getter<Slot, Player>() {
-			@Override
-			@Nullable
-			public Slot get(Player player) {
-				int time = getTime();
-				PlayerInventory inventory = player.getInventory();
-				if (event instanceof PlayerItemHeldEvent && time != EventValues.TIME_NOW) {
-					PlayerItemHeldEvent switchEvent = (PlayerItemHeldEvent) event;
-					if (time == EventValues.TIME_FUTURE)
-						return new InventorySlot(inventory, switchEvent.getNewSlot());
-					if (time == EventValues.TIME_PAST)
-						return new InventorySlot(inventory, switchEvent.getPreviousSlot());
-				}
-				return new InventorySlot(inventory, inventory.getHeldItemSlot());
+		return get(source, player -> {
+			int time = getTime();
+			PlayerInventory inventory = player.getInventory();
+			if (event instanceof PlayerItemHeldEvent switchEvent && time != EventValues.TIME_NOW) {
+				if (time == EventValues.TIME_FUTURE)
+					return new InventorySlot(inventory, switchEvent.getNewSlot());
+				if (time == EventValues.TIME_PAST)
+					return new InventorySlot(inventory, switchEvent.getPreviousSlot());
 			}
+			return new InventorySlot(inventory, inventory.getHeldItemSlot());
 		});
 	}
 
diff --git a/src/main/java/ch/njol/skript/expressions/ExprHoverList.java b/src/main/java/ch/njol/skript/expressions/ExprHoverList.java
index 835319f3449..16c2036f70d 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprHoverList.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprHoverList.java
@@ -62,8 +62,8 @@ public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelaye
 	}
 
 	@Override
-	@Nullable
-	public String[] get(Event event) {
+	@SuppressWarnings({"removal"})
+	public String @Nullable [] get(Event event) {
 		if (!(event instanceof PaperServerListPingEvent))
 			return null;
 
@@ -96,8 +96,8 @@ public Class<?>[] acceptChange(ChangeMode mode) {
 		return null;
 	}
 
-	@SuppressWarnings("null")
 	@Override
+	@SuppressWarnings({"null", "removal"})
 	public void change(Event event, @Nullable Object[] delta, ChangeMode mode) {
 		if (!(event instanceof PaperServerListPingEvent))
 			return;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprHumidity.java b/src/main/java/ch/njol/skript/expressions/ExprHumidity.java
index 68562c7b27a..6dd9f54c256 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprHumidity.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprHumidity.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import ch.njol.skript.doc.Description;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprIP.java b/src/main/java/ch/njol/skript/expressions/ExprIP.java
index 632ee8d6c84..6c8136d7a2c 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprIP.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprIP.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import java.net.InetAddress;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprIndexOf.java b/src/main/java/ch/njol/skript/expressions/ExprIndexOf.java
index b8b5e51bf60..94d27f52c79 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprIndexOf.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprIndexOf.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import org.bukkit.event.Event;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprIndices.java b/src/main/java/ch/njol/skript/expressions/ExprIndices.java
index c48380e1ece..ea8cb405e54 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprIndices.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprIndices.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import ch.njol.skript.Skript;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprInput.java b/src/main/java/ch/njol/skript/expressions/ExprInput.java
index a417efcdd51..c7e9e2adcf7 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprInput.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprInput.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import ch.njol.skript.Skript;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprInventory.java b/src/main/java/ch/njol/skript/expressions/ExprInventory.java
index 60e930ddf66..702f2411332 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprInventory.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprInventory.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import ch.njol.skript.aliases.ItemType;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprInventoryAction.java b/src/main/java/ch/njol/skript/expressions/ExprInventoryAction.java
index 6b46f610f70..3a8c24a88cd 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprInventoryAction.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprInventoryAction.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import org.bukkit.event.inventory.InventoryAction;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprInventoryCloseReason.java b/src/main/java/ch/njol/skript/expressions/ExprInventoryCloseReason.java
index 136c27bebfb..41191362b22 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprInventoryCloseReason.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprInventoryCloseReason.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import ch.njol.skript.Skript;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprInventoryInfo.java b/src/main/java/ch/njol/skript/expressions/ExprInventoryInfo.java
index a5e1b34e455..c7dc5c8395f 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprInventoryInfo.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprInventoryInfo.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import java.util.ArrayList;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprInventorySlot.java b/src/main/java/ch/njol/skript/expressions/ExprInventorySlot.java
index a60bc899a7b..4a3fc3618e7 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprInventorySlot.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprInventorySlot.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import java.util.ArrayList;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprItem.java b/src/main/java/ch/njol/skript/expressions/ExprItem.java
index c7f2f8a97cd..5b51d868f26 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprItem.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprItem.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import org.bukkit.entity.Item;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprItemAmount.java b/src/main/java/ch/njol/skript/expressions/ExprItemAmount.java
index 046d4ec41c9..be39645cd7f 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprItemAmount.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprItemAmount.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import ch.njol.skript.aliases.ItemType;
@@ -110,6 +92,6 @@ public Class<? extends Long> getReturnType() {
 
 	@Override
 	protected String getPropertyName() {
-		return "item[[ ]stack] (amount|size|number)";
+		return "item amount";
 	}
 }
diff --git a/src/main/java/ch/njol/skript/expressions/ExprItemCooldown.java b/src/main/java/ch/njol/skript/expressions/ExprItemCooldown.java
index e981cfabea1..162884af692 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprItemCooldown.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprItemCooldown.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import ch.njol.skript.Skript;
@@ -83,7 +65,7 @@ protected Timespan[] get(Event event) {
 		int i = 0;
 		for (Player player : players) {
 			for (ItemType itemType : itemTypes) {
-				timespan[i++] = Timespan.fromTicks_i(player.getCooldown(itemType.getMaterial()));
+				timespan[i++] = new Timespan(Timespan.TimePeriod.TICK, player.getCooldown(itemType.getMaterial()));
 			}
 		}
 		return timespan;
@@ -100,7 +82,7 @@ public void change(Event event, Object @Nullable [] delta, ChangeMode mode) {
 		if (mode != ChangeMode.RESET && mode != ChangeMode.DELETE && delta == null)
 			return;
 		
-		int ticks = delta != null ? (int) ((Timespan) delta[0]).getTicks_i() : 0; // 0 for DELETE/RESET
+		int ticks = delta != null ? (int) ((Timespan) delta[0]).getAs(Timespan.TimePeriod.TICK) : 0; // 0 for DELETE/RESET
 		Player[] players = this.players.getArray(event);
 		List<ItemType> itemTypes = this.itemtypes.stream(event)
 				.filter(ItemType::hasType)
diff --git a/src/main/java/ch/njol/skript/expressions/ExprItemFlags.java b/src/main/java/ch/njol/skript/expressions/ExprItemFlags.java
new file mode 100644
index 00000000000..3b04e6e0a21
--- /dev/null
+++ b/src/main/java/ch/njol/skript/expressions/ExprItemFlags.java
@@ -0,0 +1,97 @@
+package ch.njol.skript.expressions;
+
+import ch.njol.skript.classes.Changer.ChangeMode;
+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.expressions.base.PropertyExpression;
+import ch.njol.skript.lang.Expression;
+import ch.njol.skript.lang.SkriptParser.ParseResult;
+import ch.njol.util.Kleenean;
+import ch.njol.util.coll.CollectionUtils;
+import org.bukkit.event.Event;
+import org.bukkit.inventory.ItemFlag;
+import org.bukkit.inventory.meta.ItemMeta;
+import ch.njol.skript.aliases.ItemType;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.HashSet;
+import java.util.Set;
+
+@Name("Item Flags")
+@Description("The item flags of an item. Can be modified.")
+@Examples({
+	"set item flags of player's tool to hide enchants and hide attributes",
+	"add hide potion effects to item flags of player's held item",
+	"remove hide enchants from item flags of {legendary sword}"
+})
+@Since("2.10")
+public class ExprItemFlags extends PropertyExpression<ItemType, ItemFlag> {
+
+	static {
+		register(ExprItemFlags.class, ItemFlag.class, "item flags", "itemtypes");
+	}
+
+	@Override
+	public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelayed, ParseResult parseResult) {
+		setExpr((Expression<? extends ItemType>) exprs[0]);
+		return true;
+	}
+
+	@Override
+	protected ItemFlag[] get(Event event, ItemType[] source) {
+		Set<ItemFlag> flags = new HashSet<>();
+		for (ItemType itemType : source) {
+			ItemMeta meta = itemType.getItemMeta();
+			flags.addAll(meta.getItemFlags());
+		}
+		return flags.toArray(new ItemFlag[0]);
+	}
+
+	@Override
+	public @Nullable Class<?>[] acceptChange(ChangeMode mode) {
+		return switch (mode) {
+			case SET, ADD, REMOVE, RESET, DELETE -> CollectionUtils.array(ItemFlag[].class);
+			default -> null;
+		};
+	}
+
+	@Override
+	public void change(Event event, Object @Nullable [] delta, ChangeMode mode) {
+		ItemFlag[] flags = delta != null ? (ItemFlag[]) delta : new ItemFlag[0];
+
+		for (ItemType itemType : getExpr().getArray(event)) {
+			ItemMeta meta = itemType.getItemMeta();
+			switch (mode) {
+				case SET -> {
+					meta.removeItemFlags(ItemFlag.values());
+					meta.addItemFlags(flags);
+				}
+				case ADD -> meta.addItemFlags(flags);
+				case REMOVE -> meta.removeItemFlags(flags);
+				case RESET, DELETE -> meta.removeItemFlags(ItemFlag.values());
+				default -> {
+					return;
+				}
+			}
+			itemType.setItemMeta(meta);
+		}
+	}
+
+	@Override
+	public boolean isSingle() {
+		return false;
+	}
+
+	@Override
+	public Class<? extends ItemFlag> getReturnType() {
+		return ItemFlag.class;
+	}
+
+	@Override
+	public String toString(Event event, boolean debug) {
+		return "item flags of " + getExpr().toString(event, debug);
+	}
+
+}
diff --git a/src/main/java/ch/njol/skript/expressions/ExprItemFrameSlot.java b/src/main/java/ch/njol/skript/expressions/ExprItemFrameSlot.java
deleted file mode 100644
index 6a67e34aa4d..00000000000
--- a/src/main/java/ch/njol/skript/expressions/ExprItemFrameSlot.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
-package ch.njol.skript.expressions;
-
-import org.bukkit.entity.Entity;
-import org.bukkit.entity.Item;
-import org.bukkit.entity.ItemFrame;
-import org.bukkit.entity.ThrowableProjectile;
-import org.jetbrains.annotations.Nullable;
-
-import ch.njol.skript.Skript;
-import ch.njol.skript.doc.Description;
-import ch.njol.skript.doc.Examples;
-import ch.njol.skript.doc.Name;
-import ch.njol.skript.doc.RequiredPlugins;
-import ch.njol.skript.doc.Since;
-import ch.njol.skript.expressions.base.SimplePropertyExpression;
-import ch.njol.skript.util.slot.DroppedItemSlot;
-import ch.njol.skript.util.slot.ItemFrameSlot;
-import ch.njol.skript.util.slot.Slot;
-import ch.njol.skript.util.slot.ThrowableProjectileSlot;
-
-@Name("Item of an Entity")
-@Description("An item associated with an entity. For dropped item entities, it gets, obviously, the item that was dropped. "
-		+ "For item frames, the item inside the frame is returned. For throwable projectiles (snowballs, enderpearls etc.),"
-		+ "it gets the displayed item. Other entities do not have items associated with them.")
-@Examples("")
-@Since("2.2-dev35, 2.2-dev36 (improved), 2.5.2 (throwable projectiles)")
-@RequiredPlugins("Minecraft 1.15.2+ (throwable projectiles)")
-public class ExprItemFrameSlot extends SimplePropertyExpression<Entity, Slot> {
-	
-	private static final boolean PROJECTILE_SUPPORT = Skript.classExists("org.bukkit.entity.ThrowableProjectile");
-	
-	static {
-		register(ExprItemFrameSlot.class, Slot.class, "item", "entities");
-	}
-	
-	@Override
-	@Nullable
-	public Slot convert(Entity e) {
-		if (e instanceof ItemFrame)
-			return new ItemFrameSlot((ItemFrame) e);
-		else if (e instanceof Item)
-			return new DroppedItemSlot((Item) e);
-		else if (PROJECTILE_SUPPORT && e instanceof ThrowableProjectile)
-			return new ThrowableProjectileSlot((ThrowableProjectile) e);
-		return null; // Other entities don't have associated items
-	}
-
-	@Override
-	protected String getPropertyName() {
-		return "item of entity";
-	}
-	
-	@Override
-	public Class<? extends Slot> getReturnType() {
-		return Slot.class;
-	}
-}
diff --git a/src/main/java/ch/njol/skript/expressions/ExprItemWithCustomModelData.java b/src/main/java/ch/njol/skript/expressions/ExprItemWithCustomModelData.java
index 643b038c29f..b2818ebb807 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprItemWithCustomModelData.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprItemWithCustomModelData.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import org.bukkit.event.Event;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprItemWithEnchantmentGlint.java b/src/main/java/ch/njol/skript/expressions/ExprItemWithEnchantmentGlint.java
new file mode 100644
index 00000000000..9e245471f31
--- /dev/null
+++ b/src/main/java/ch/njol/skript/expressions/ExprItemWithEnchantmentGlint.java
@@ -0,0 +1,62 @@
+package ch.njol.skript.expressions;
+
+import org.bukkit.event.Event;
+import org.bukkit.inventory.meta.ItemMeta;
+import org.jetbrains.annotations.Nullable;
+
+import ch.njol.skript.Skript;
+import ch.njol.skript.aliases.ItemType;
+import ch.njol.skript.doc.*;
+import ch.njol.skript.expressions.base.PropertyExpression;
+import ch.njol.skript.lang.Expression;
+import ch.njol.skript.lang.ExpressionType;
+import ch.njol.skript.lang.SkriptParser.ParseResult;
+import ch.njol.util.Kleenean;
+
+@Name("Item with Enchantment Glint")
+@Description("Get an item with or without enchantment glint.")
+@Examples({
+	"set {_item with glint} to diamond with enchantment glint",
+	"set {_item without glint} to diamond without enchantment glint"
+})
+@RequiredPlugins("Spigot 1.20.5+")
+@Since("2.10")
+public class ExprItemWithEnchantmentGlint extends PropertyExpression<ItemType, ItemType> {
+
+	static {
+		if (Skript.methodExists(ItemMeta.class, "getEnchantmentGlintOverride"))
+			Skript.registerExpression(ExprItemWithEnchantmentGlint.class, ItemType.class, ExpressionType.PROPERTY, "%itemtypes% with[:out] [enchant[ment]] glint");
+	}
+
+	private boolean glint;
+
+	@Override
+	@SuppressWarnings("unchecked")
+	public boolean init(Expression<?>[] expressions, int matchedPattern, Kleenean isDelayed, ParseResult parseResult) {
+		setExpr((Expression<ItemType>) expressions[0]);
+		glint = !parseResult.hasTag("out");
+		return true;
+	}
+
+	@Override
+	protected ItemType[] get(Event event, ItemType[] source) {
+		return get(source, itemType -> {
+			itemType = itemType.clone();
+			ItemMeta meta = itemType.getItemMeta();
+			meta.setEnchantmentGlintOverride(glint);
+			itemType.setItemMeta(meta);
+			return itemType;
+        });
+	}
+
+	@Override
+	public Class<? extends ItemType> getReturnType() {
+		return ItemType.class;
+	}
+
+	@Override
+	public String toString(@Nullable Event event, boolean debug) {
+		return getExpr().toString(event, debug) + (glint ? " with" : " without") + " enchantment glint";
+	}
+
+}
diff --git a/src/main/java/ch/njol/skript/expressions/ExprItemWithLore.java b/src/main/java/ch/njol/skript/expressions/ExprItemWithLore.java
index 31df444794e..636e5ab8134 100755
--- a/src/main/java/ch/njol/skript/expressions/ExprItemWithLore.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprItemWithLore.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import java.util.Arrays;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprItemsIn.java b/src/main/java/ch/njol/skript/expressions/ExprItemsIn.java
index 9e76e01ed7a..4f24751430e 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprItemsIn.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprItemsIn.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import java.util.ArrayList;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprJoinSplit.java b/src/main/java/ch/njol/skript/expressions/ExprJoinSplit.java
index c58e13d2953..5ce55110756 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprJoinSplit.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprJoinSplit.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import java.util.regex.Pattern;
@@ -23,6 +5,7 @@
 
 import ch.njol.skript.SkriptConfig;
 import ch.njol.skript.lang.Literal;
+import ch.njol.skript.lang.SyntaxStringBuilder;
 import org.bukkit.event.Event;
 import org.jetbrains.annotations.Nullable;
 
@@ -44,21 +27,22 @@
 	"message \"Online players: %join all players' names with \"\" | \"\"%\" # %all players% would use the default \"x, y, and z\"",
 	"set {_s::*} to the string argument split at \",\""
 })
-@Since("2.1, 2.5.2 (regex support), 2.7 (case sensitivity)")
+@Since("2.1, 2.5.2 (regex support), 2.7 (case sensitivity), 2.10 (without trailing string)")
 public class ExprJoinSplit extends SimpleExpression<String> {
 
 	static {
 		Skript.registerExpression(ExprJoinSplit.class, String.class, ExpressionType.COMBINED,
 			"(concat[enate]|join) %strings% [(with|using|by) [[the] delimiter] %-string%]",
-			"split %string% (at|using|by) [[the] delimiter] %string% [case:with case sensitivity]",
-			"%string% split (at|using|by) [[the] delimiter] %string% [case:with case sensitivity]",
-			"regex split %string% (at|using|by) [[the] delimiter] %string%",
-			"regex %string% split (at|using|by) [[the] delimiter] %string%");
+			"split %string% (at|using|by) [[the] delimiter] %string% [case:with case sensitivity] [trailing:without [the] trailing [empty] (string|text)]",
+			"%string% split (at|using|by) [[the] delimiter] %string% [case:with case sensitivity] [trailing:without [the] trailing [empty] (string|text)]",
+			"regex split %string% (at|using|by) [[the] delimiter] %string% [trailing:without [the] trailing [empty] (string|text)]",
+			"regex %string% split (at|using|by) [[the] delimiter] %string% [trailing:without [the] trailing [empty] (string|text)]");
 	}
 
 	private boolean join;
 	private boolean regex;
 	private boolean caseSensitivity;
+	private boolean removeTrailing;
 
 	private Expression<String> strings;
 	private @Nullable Expression<String> delimiter;
@@ -70,12 +54,13 @@ public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelaye
 		join = matchedPattern == 0;
 		regex = matchedPattern >= 3;
 		caseSensitivity = SkriptConfig.caseSensitive.value() || parseResult.hasTag("case");
+		removeTrailing = parseResult.hasTag("trailing");
 		//noinspection unchecked
 		strings = (Expression<String>) exprs[0];
 		//noinspection unchecked
 		delimiter = (Expression<String>) exprs[1];
-		if (!join && delimiter instanceof Literal) {
-			String stringPattern = ((Literal<String>) delimiter).getSingle();
+		if (!join && delimiter instanceof Literal<String> literal) {
+			String stringPattern = literal.getSingle();
 			try {
 				this.pattern = compilePattern(stringPattern);
 			} catch (PatternSyntaxException e) {
@@ -90,15 +75,18 @@ public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelaye
 	protected String @Nullable [] get(Event event) {
 		String[] strings = this.strings.getArray(event);
 		String delimiter = this.delimiter != null ? this.delimiter.getSingle(event) : "";
+
 		if (strings.length == 0 || delimiter == null)
 			return new String[0];
+
 		if (join)
 			return new String[] {StringUtils.join(strings, delimiter)};
+
 		try {
 			Pattern pattern = this.pattern;
 			if (pattern == null)
 				pattern = compilePattern(delimiter);
-			return pattern.split(strings[0], -1);
+			return pattern.split(strings[0], removeTrailing ? 0 : -1);
 		} catch (PatternSyntaxException e) {
 			return new String[0];
 		}
@@ -116,23 +104,22 @@ public Class<? extends String> getReturnType() {
 
 	@Override
 	public String toString(@Nullable Event event, boolean debug) {
-		StringBuilder builder = new StringBuilder();
+		SyntaxStringBuilder builder = new SyntaxStringBuilder(event, debug);
 		if (join) {
-			builder.append("join ").append(strings.toString(event, debug));
+			builder.append("join", strings);
 			if (delimiter != null)
-				builder.append(" with ").append(delimiter.toString(event, debug));
+				builder.append("with", delimiter);
 			return builder.toString();
 		}
 
         assert delimiter != null;
 		if (regex)
-			builder.append("regex ");
-        builder.append("split ")
-			.append(strings.toString(event, debug))
-			.append(" at ")
-			.append(delimiter.toString(event, debug));
+			builder.append("regex");
+        builder.append("split", strings, "at", delimiter);
+		if (removeTrailing)
+			builder.append("without trailing text");
 		if (!regex)
-			builder.append(" (case sensitive: ").append(caseSensitivity).append(")");
+			builder.append("(case sensitive:", caseSensitivity + ")");
 		return builder.toString();
 	}
 
diff --git a/src/main/java/ch/njol/skript/expressions/ExprLanguage.java b/src/main/java/ch/njol/skript/expressions/ExprLanguage.java
index 8410c88230a..401f0757936 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprLanguage.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprLanguage.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import org.jetbrains.annotations.Nullable;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprLastAttacker.java b/src/main/java/ch/njol/skript/expressions/ExprLastAttacker.java
index 5c601412c01..7ff00b01eb5 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprLastAttacker.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprLastAttacker.java
@@ -1,22 +1,3 @@
-/**
- * This file is part of Skript.
- *
- * Skript is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Skript is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import org.bukkit.entity.Entity;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprLastColor.java b/src/main/java/ch/njol/skript/expressions/ExprLastColor.java
index 0de147257c0..4a1ff6c2b27 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprLastColor.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprLastColor.java
@@ -1,22 +1,3 @@
-/**
- * This file is part of Skript.
- *
- * Skript is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Skript is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import ch.njol.skript.doc.Description;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprLastDamage.java b/src/main/java/ch/njol/skript/expressions/ExprLastDamage.java
index ede427b156f..29fa9e87a4f 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprLastDamage.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprLastDamage.java
@@ -1,22 +1,3 @@
-/**
- * This file is part of Skript.
- *
- * Skript is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Skript is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import ch.njol.skript.classes.Changer.ChangeMode;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprLastDamageCause.java b/src/main/java/ch/njol/skript/expressions/ExprLastDamageCause.java
index c6c571745cf..0ec087b10f0 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprLastDamageCause.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprLastDamageCause.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import ch.njol.skript.bukkitutil.HealthUtils;
@@ -27,7 +9,6 @@
 import ch.njol.skript.expressions.base.PropertyExpression;
 import ch.njol.skript.lang.Expression;
 import ch.njol.skript.lang.SkriptParser.ParseResult;
-import ch.njol.skript.util.Getter;
 import ch.njol.util.Kleenean;
 import ch.njol.util.coll.CollectionUtils;
 import org.bukkit.entity.LivingEntity;
@@ -59,13 +40,10 @@ public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelaye
 	
 	@Override
 	protected DamageCause[] get(Event e, LivingEntity[] source) {
-		return get(source, new Getter<DamageCause, LivingEntity>() {
-			@Override
-			public DamageCause get(LivingEntity entity) {
-				EntityDamageEvent dmgEvt = entity.getLastDamageCause();
-				if (dmgEvt == null) return DamageCause.CUSTOM;
-				return dmgEvt.getCause();
-			}
+		return get(source, entity -> {
+			EntityDamageEvent dmgEvt = entity.getLastDamageCause();
+			if (dmgEvt == null) return DamageCause.CUSTOM;
+			return dmgEvt.getCause();
 		});
 	}
 	
diff --git a/src/main/java/ch/njol/skript/expressions/ExprLastDeathLocation.java b/src/main/java/ch/njol/skript/expressions/ExprLastDeathLocation.java
new file mode 100644
index 00000000000..937d5ce1e9f
--- /dev/null
+++ b/src/main/java/ch/njol/skript/expressions/ExprLastDeathLocation.java
@@ -0,0 +1,66 @@
+package ch.njol.skript.expressions;
+
+import ch.njol.skript.classes.Changer.ChangeMode;
+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.expressions.base.SimplePropertyExpression;
+import ch.njol.util.coll.CollectionUtils;
+import org.bukkit.Location;
+import org.bukkit.OfflinePlayer;
+import org.bukkit.entity.Player;
+import org.bukkit.event.Event;
+import org.jetbrains.annotations.Nullable;
+
+@Name("Last Death Location")
+@Description({
+	"Gets the last death location of a player, or offline player, if available.",
+	"Can also be set, reset, and deleted if the player is online."
+})
+@Examples({
+	"set {_loc} to the last death location of player",
+	"teleport player to last death location of (random element out of all players)"
+})
+@Since("2.10")
+public class ExprLastDeathLocation extends SimplePropertyExpression<OfflinePlayer, Location> {
+
+	static {
+		register(ExprLastDeathLocation.class, Location.class, "[last] death location[s]", "offlineplayers");
+	}
+
+	@Override
+	public @Nullable Location convert(OfflinePlayer offlinePlayer) {
+		return offlinePlayer instanceof Player player
+			? player.getLastDeathLocation()
+			: offlinePlayer.getLastDeathLocation();
+	}
+
+	@Override
+	public Class<?> @Nullable [] acceptChange(ChangeMode mode) {
+		return switch (mode) {
+			case SET, RESET, DELETE -> CollectionUtils.array(Location.class);
+			default -> null;
+		};
+	}
+
+	@Override
+	public void change(Event event, Object @Nullable [] delta, ChangeMode mode) {
+		Location loc = (delta != null && delta[0] instanceof Location location) ? location : null;
+		for (OfflinePlayer offlinePlayer : getExpr().getArray(event)) {
+			if (offlinePlayer instanceof Player player)
+				player.setLastDeathLocation(loc);
+		}
+	}
+
+	@Override
+	protected String getPropertyName() {
+		return "last death location";
+	}
+
+	@Override
+	public Class<? extends Location> getReturnType() {
+		return Location.class;
+	}
+
+}
diff --git a/src/main/java/ch/njol/skript/expressions/ExprLastLoadedServerIcon.java b/src/main/java/ch/njol/skript/expressions/ExprLastLoadedServerIcon.java
index 351e8d7ba7b..c8be04c1eae 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprLastLoadedServerIcon.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprLastLoadedServerIcon.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import org.bukkit.event.Event;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprLastLoginTime.java b/src/main/java/ch/njol/skript/expressions/ExprLastLoginTime.java
index 365ccaf83b0..25ab2ba82fc 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprLastLoginTime.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprLastLoginTime.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import org.bukkit.OfflinePlayer;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprLastResourcePackResponse.java b/src/main/java/ch/njol/skript/expressions/ExprLastResourcePackResponse.java
index 9359539afef..bcaad2b5bfa 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprLastResourcePackResponse.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprLastResourcePackResponse.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import org.bukkit.entity.Player;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprLastSpawnedEntity.java b/src/main/java/ch/njol/skript/expressions/ExprLastSpawnedEntity.java
index fc762672b11..3135c3d22fe 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprLastSpawnedEntity.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprLastSpawnedEntity.java
@@ -1,28 +1,10 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import java.lang.reflect.Array;
 
 import ch.njol.skript.effects.EffFireworkLaunch;
+import ch.njol.skript.sections.EffSecShoot;
 import ch.njol.skript.sections.EffSecSpawn;
-import ch.njol.util.coll.CollectionUtils;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Firework;
 import org.bukkit.entity.Item;
@@ -37,7 +19,6 @@
 import ch.njol.skript.doc.Since;
 import ch.njol.skript.effects.EffDrop;
 import ch.njol.skript.effects.EffLightning;
-import ch.njol.skript.effects.EffShoot;
 import ch.njol.skript.entity.EntityData;
 import ch.njol.skript.lang.Expression;
 import ch.njol.skript.lang.ExpressionType;
@@ -100,7 +81,7 @@ protected Entity[] get(Event event) {
 				en = EffSecSpawn.lastSpawned;
 				break;
 			case 1:
-				en = EffShoot.lastSpawned;
+				en = EffSecShoot.lastSpawned;
 				break;
 			case 2:
 				en = EffDrop.lastSpawned;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprLeashHolder.java b/src/main/java/ch/njol/skript/expressions/ExprLeashHolder.java
index 7a0db57d46b..7e223c2e3f7 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprLeashHolder.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprLeashHolder.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import org.bukkit.entity.Entity;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprLength.java b/src/main/java/ch/njol/skript/expressions/ExprLength.java
index f41ec0ec0d6..1b9e4641769 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprLength.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprLength.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import ch.njol.skript.doc.Description;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprLevel.java b/src/main/java/ch/njol/skript/expressions/ExprLevel.java
index baa5f110a36..b3273130b75 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprLevel.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprLevel.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import org.bukkit.entity.Player;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprLevelProgress.java b/src/main/java/ch/njol/skript/expressions/ExprLevelProgress.java
index c39e3b24c2a..7c682609082 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprLevelProgress.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprLevelProgress.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import org.bukkit.entity.Player;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprLightLevel.java b/src/main/java/ch/njol/skript/expressions/ExprLightLevel.java
index 69d24f7a9c0..4cd45e781fa 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprLightLevel.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprLightLevel.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import ch.njol.skript.Skript;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprLocation.java b/src/main/java/ch/njol/skript/expressions/ExprLocation.java
index 99c197db734..c4a61f0f58c 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprLocation.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprLocation.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import org.bukkit.Location;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprLocationAt.java b/src/main/java/ch/njol/skript/expressions/ExprLocationAt.java
index 3b77c8ef61a..a39d3181efa 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprLocationAt.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprLocationAt.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import org.bukkit.Location;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprLocationFromVector.java b/src/main/java/ch/njol/skript/expressions/ExprLocationFromVector.java
index 92aa68c0b4a..d4c2b0545ef 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprLocationFromVector.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprLocationFromVector.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import ch.njol.skript.Skript;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprLocationOf.java b/src/main/java/ch/njol/skript/expressions/ExprLocationOf.java
index ec460da961d..04a2050fbec 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprLocationOf.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprLocationOf.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import org.bukkit.Location;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprLocationVectorOffset.java b/src/main/java/ch/njol/skript/expressions/ExprLocationVectorOffset.java
index 84d1b90e9e2..1526165ecd7 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprLocationVectorOffset.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprLocationVectorOffset.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import org.bukkit.Location;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprLoopIteration.java b/src/main/java/ch/njol/skript/expressions/ExprLoopIteration.java
index fcee1e58f73..19c889ef00d 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprLoopIteration.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprLoopIteration.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import ch.njol.skript.Skript;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprLoopValue.java b/src/main/java/ch/njol/skript/expressions/ExprLoopValue.java
index 19bd01ecf5f..f66f761638d 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprLoopValue.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprLoopValue.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import ch.njol.skript.Skript;
@@ -48,7 +30,7 @@
  * Used to access a loop's current value.
  */
 @Name("Loop value")
-@Description("Returns the currently looped value.")
+@Description("Returns the previous, current, or next looped value.")
 @Examples({
 	"# Countdown",
 	"loop 10 times:",
@@ -63,11 +45,38 @@
 	"loop {top-balances::*}:",
 		"\tloop-iteration <= 10",
 		"\tsend \"#%loop-iteration% %loop-index% has $%loop-value%\"",
+	"",
+	"loop shuffled (integers between 0 and 8):",
+		"\tif all:",
+			"\t\tprevious loop-value = 1",
+			"\t\tloop-value = 4",
+			"\t\tnext loop-value = 8",
+		"\tthen:",
+			"\t\t kill all players"
 })
-@Since("1.0, 2.8.0 (loop-counter)")
+@Since("1.0, 2.8.0 (loop-counter), 2.10 (previous, next)")
 public class ExprLoopValue extends SimpleExpression<Object> {
+
+	enum LoopState {
+		CURRENT("[current]"),
+		NEXT("next"),
+		PREVIOUS("previous");
+
+		private String pattern;
+
+		LoopState(String pattern) {
+			this.pattern = pattern;
+		}
+	}
+
+	private static final LoopState[] loopStates = LoopState.values();
+
 	static {
-		Skript.registerExpression(ExprLoopValue.class, Object.class, ExpressionType.SIMPLE, "[the] loop-<.+>");
+		String[] patterns = new String[loopStates.length];
+		for (LoopState state : loopStates) {
+			patterns[state.ordinal()] = "[the] " + state.pattern + " loop-<.+>";
+		}
+		Skript.registerExpression(ExprLoopValue.class, Object.class, ExpressionType.SIMPLE, patterns);
 	}
 	
 	@SuppressWarnings("NotNullFieldNotInitialized")
@@ -81,10 +90,13 @@ public class ExprLoopValue extends SimpleExpression<Object> {
 	// if this loops a variable and isIndex is true, return the index of the variable instead of the value
 	boolean isIndex = false;
 
+	private LoopState selectedState;
+
 	private static final Pattern LOOP_PATTERN = Pattern.compile("^(.+)-(\\d+)$");
 
 	@Override
 	public boolean init(Expression<?>[] vars, int matchedPattern, Kleenean isDelayed, ParseResult parser) {
+		selectedState = loopStates[matchedPattern];
 		name = parser.expr;
 		String s = "" + parser.regexes.get(0).group();
 		int i = -1;
@@ -120,6 +132,10 @@ public boolean init(Expression<?>[] vars, int matchedPattern, Kleenean isDelayed
 			Skript.error("There's no loop that matches 'loop-" + s + "'");
 			return false;
 		}
+		if (selectedState == LoopState.NEXT && !loop.supportsPeeking()) {
+			Skript.error("The expression '" + loop.getExpression().toString() + "' does not allow the usage of 'next loop-" + s + "'.");
+			return false;
+		}
 		if (loop.getLoopedExpression() instanceof Variable) {
 			isVariableLoop = true;
 			if (((Variable<?>) loop.getLoopedExpression()).isIndexLoop(s))
@@ -161,35 +177,52 @@ public Class<? extends Object> getReturnType() {
 	}
 	
 	@Override
-	@Nullable
-	protected Object[] get(Event e) {
+	protected Object @Nullable [] get(Event event) {
 		if (isVariableLoop) {
-			@SuppressWarnings("unchecked") Entry<String, Object> current = (Entry<String, Object>) loop.getCurrent(e);
-			if (current == null)
+			//noinspection unchecked
+			Entry<String, Object> value = (Entry<String, Object>) switch (selectedState) {
+				case CURRENT ->  loop.getCurrent(event);
+				case NEXT -> loop.getNext(event);
+				case PREVIOUS -> loop.getPrevious(event);
+			};
+			if (value == null)
 				return null;
 			if (isIndex)
-				return new String[] {current.getKey()};
+				return new String[] {value.getKey()};
 			Object[] one = (Object[]) Array.newInstance(getReturnType(), 1);
-			one[0] = current.getValue();
+			one[0] = value.getValue();
 			return one;
 		}
 
 		Object[] one = (Object[]) Array.newInstance(getReturnType(), 1);
-		one[0] = loop.getCurrent(e);
+		one[0] = switch (selectedState) {
+			case CURRENT -> loop.getCurrent(event);
+			case NEXT -> loop.getNext(event);
+			case PREVIOUS -> loop.getPrevious(event);
+		};
 		return one;
 	}
 	
 	@Override
-	public String toString(@Nullable Event e, boolean debug) {
-		if (e == null)
+	public String toString(@Nullable Event event, boolean debug) {
+		if (event == null)
 			return name;
 		if (isVariableLoop) {
-			@SuppressWarnings("unchecked") Entry<String, Object> current = (Entry<String, Object>) loop.getCurrent(e);
-			if (current == null)
+			//noinspection unchecked
+			Entry<String, Object> value = (Entry<String, Object>) switch (selectedState) {
+				case CURRENT ->  loop.getCurrent(event);
+				case NEXT -> loop.getNext(event);
+				case PREVIOUS -> loop.getPrevious(event);
+			};
+			if (value == null)
 				return Classes.getDebugMessage(null);
-			return isIndex ? "\"" + current.getKey() + "\"" : Classes.getDebugMessage(current.getValue());
+			return isIndex ? "\"" + value.getKey() + "\"" : Classes.getDebugMessage(value.getValue());
 		}
-		return Classes.getDebugMessage(loop.getCurrent(e));
+		return Classes.getDebugMessage(switch (selectedState) {
+			case CURRENT -> loop.getCurrent(event);
+			case NEXT -> loop.getNext(event);
+			case PREVIOUS -> loop.getPrevious(event);
+		});
 	}
 	
 }
diff --git a/src/main/java/ch/njol/skript/expressions/ExprLore.java b/src/main/java/ch/njol/skript/expressions/ExprLore.java
index 30a0dbf2188..7b4c26361cf 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprLore.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprLore.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import java.util.ArrayList;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprLowestHighestSolidBlock.java b/src/main/java/ch/njol/skript/expressions/ExprLowestHighestSolidBlock.java
index a43f67d5026..599c142606b 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprLowestHighestSolidBlock.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprLowestHighestSolidBlock.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import ch.njol.skript.Skript;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprMOTD.java b/src/main/java/ch/njol/skript/expressions/ExprMOTD.java
index bf99a755d80..34e570c1d31 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprMOTD.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprMOTD.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import org.bukkit.Bukkit;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprMaxDurability.java b/src/main/java/ch/njol/skript/expressions/ExprMaxDurability.java
index 1287a8647f2..ba9359fb1a4 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprMaxDurability.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprMaxDurability.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import ch.njol.skript.aliases.ItemType;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprMaxFreezeTicks.java b/src/main/java/ch/njol/skript/expressions/ExprMaxFreezeTicks.java
index 4ff19a44791..cc0bda4172f 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprMaxFreezeTicks.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprMaxFreezeTicks.java
@@ -1,22 +1,4 @@
 
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import ch.njol.skript.Skript;
@@ -48,7 +30,7 @@ public class ExprMaxFreezeTicks extends SimplePropertyExpression<Entity, Timespa
 	@Override
 	@Nullable
 	public Timespan convert(Entity entity) {
-		return Timespan.fromTicks(entity.getMaxFreezeTicks());
+		return new Timespan(Timespan.TimePeriod.TICK, entity.getMaxFreezeTicks());
 	}
 
 	@Override
diff --git a/src/main/java/ch/njol/skript/expressions/ExprMaxHealth.java b/src/main/java/ch/njol/skript/expressions/ExprMaxHealth.java
index cf796aedcbf..cfe64906bf0 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprMaxHealth.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprMaxHealth.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import org.bukkit.entity.LivingEntity;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprMaxItemUseTime.java b/src/main/java/ch/njol/skript/expressions/ExprMaxItemUseTime.java
index aa199b7e0e5..a6c8b3f12bf 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprMaxItemUseTime.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprMaxItemUseTime.java
@@ -1,29 +1,7 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import ch.njol.skript.Skript;
-import ch.njol.skript.doc.Description;
-import ch.njol.skript.doc.Examples;
-import ch.njol.skript.doc.Name;
-import ch.njol.skript.doc.RequiredPlugins;
-import ch.njol.skript.doc.Since;
+import ch.njol.skript.doc.*;
 import ch.njol.skript.expressions.base.SimplePropertyExpression;
 import ch.njol.skript.util.Timespan;
 import org.bukkit.inventory.ItemStack;
@@ -49,9 +27,9 @@ public class ExprMaxItemUseTime extends SimplePropertyExpression<ItemStack, Time
 	}
 
 	@Override
-	@Nullable 
-	public Timespan convert(ItemStack item) {
-		return Timespan.fromTicks(item.getMaxItemUseDuration());
+	@SuppressWarnings("removal")
+	public @Nullable Timespan convert(ItemStack item) {
+		return new Timespan(Timespan.TimePeriod.TICK, item.getMaxItemUseDuration());
 	}
 
 	@Override
diff --git a/src/main/java/ch/njol/skript/expressions/ExprMaxMinecartSpeed.java b/src/main/java/ch/njol/skript/expressions/ExprMaxMinecartSpeed.java
index be6bf4e5112..27b8bf6e774 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprMaxMinecartSpeed.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprMaxMinecartSpeed.java
@@ -1,22 +1,3 @@
-/**
- * This file is part of Skript.
- *
- * Skript is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Skript is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import org.bukkit.entity.Entity;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprMaxPlayers.java b/src/main/java/ch/njol/skript/expressions/ExprMaxPlayers.java
index 9f497ad3d07..50c2bf5762f 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprMaxPlayers.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprMaxPlayers.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import ch.njol.skript.Skript;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprMaxStack.java b/src/main/java/ch/njol/skript/expressions/ExprMaxStack.java
index 77b65fa5191..360c202f753 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprMaxStack.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprMaxStack.java
@@ -1,57 +1,102 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
+import org.bukkit.Bukkit;
+import org.bukkit.Material;
+import org.bukkit.event.Event;
+import org.bukkit.inventory.Inventory;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.meta.ItemMeta;
+import org.jetbrains.annotations.Nullable;
+
+import ch.njol.skript.Skript;
 import ch.njol.skript.aliases.ItemType;
+import ch.njol.skript.classes.Changer.ChangeMode;
 import ch.njol.skript.doc.Description;
 import ch.njol.skript.doc.Examples;
 import ch.njol.skript.doc.Name;
+import ch.njol.skript.doc.RequiredPlugins;
 import ch.njol.skript.doc.Since;
 import ch.njol.skript.expressions.base.SimplePropertyExpression;
-import org.bukkit.Material;
-import org.bukkit.inventory.ItemStack;
+import ch.njol.util.Math2;
+import ch.njol.util.coll.CollectionUtils;
 
-/**
- * @author joeuguce99
- */
 @Name("Maximum Stack Size")
-@Description("The maximum stack size of the specified material, e.g. 64 for torches, 16 for buckets, and 1 for swords.")
-@Examples("send \"You can only pick up %max stack size of player's tool% of %type of (player's tool)%\" to player")
-@Since("2.1")
-public class ExprMaxStack extends SimplePropertyExpression<ItemType, Long> {
+@Description({
+	"The maximum stack size of an item (e.g. 64 for torches, 16 for buckets, 1 for swords, etc.) or inventory.",
+	"In 1.20.5+, the maximum stack size of items can be changed to any integer from 1 to 99, and stacked up to the maximum stack size of the inventory they're in."
+})
+@Examples({
+	"send \"You can hold %max stack size of player's tool% of %type of player's tool% in a slot.\" to player",
+	"set the maximum stack size of inventory of all players to 16",
+	"add 8 to the maximum stack size of player's tool",
+	"reset the maximum stack size of {_gui}"
+})
+@Since("2.1, 2.10 (changeable, inventories)")
+@RequiredPlugins("Spigot 1.20.5+ (changeable)")
+public class ExprMaxStack extends SimplePropertyExpression<Object, Integer> {
 
 	static {
-		register(ExprMaxStack.class, Long.class, "max[imum] stack[[ ]size]", "itemtype");
+		register(ExprMaxStack.class, Integer.class, "max[imum] stack[[ ]size]", "itemtypes/inventories");
 	}
-	
-	@SuppressWarnings("null")
+
+	private static final boolean CHANGEABLE_ITEM_STACK_SIZE = Skript.methodExists(ItemMeta.class, "setMaxStackSize", Integer.class);
+
 	@Override
-	public Long convert(ItemType itemType) {
-		Object random = itemType.getRandomStackOrMaterial();
-		if (random instanceof Material)
-			return (long) ((Material) random).getMaxStackSize();
-		return (long) ((ItemStack) random).getMaxStackSize();
+	public @Nullable Integer convert(Object from) {
+		if (from instanceof ItemType itemType)
+			return getMaxStackSize(itemType);
+		if (from instanceof Inventory inventory)
+			return inventory.getMaxStackSize();
+		return null;
 	}
 
 	@Override
-	public Class<? extends Long> getReturnType() {
-		return Long.class;
+	public @Nullable Class<?>[] acceptChange(ChangeMode mode) {
+        return switch (mode) {
+            case ADD, REMOVE, RESET, SET -> {
+                if (!CHANGEABLE_ITEM_STACK_SIZE && ItemType.class.isAssignableFrom(getExpr().getReturnType())) {
+                    Skript.error("Changing the maximum stack size of items requires Minecraft 1.20.5 or newer!");
+                    yield null;
+                }
+                yield CollectionUtils.array(Integer.class);
+            }
+            default -> null;
+        };
+	}
+
+	@Override
+	public void change(Event event, Object @Nullable [] delta, ChangeMode mode) {
+		int change = delta == null ? 0 : ((Number) delta[0]).intValue();
+		for (Object source : getExpr().getArray(event)) {
+			if (source instanceof ItemType itemType) {
+				if (!CHANGEABLE_ITEM_STACK_SIZE)
+					continue;
+				int size = getMaxStackSize(itemType);
+                switch (mode) {
+                    case ADD -> size += change;
+                    case SET -> size = change;
+                    case REMOVE -> size -= change;
+                }
+				ItemMeta meta = itemType.getItemMeta();
+				// Minecraft only accepts stack size from 1 to 99
+				meta.setMaxStackSize(mode != ChangeMode.RESET ? Math2.fit(1, size, 99) : null);
+				itemType.setItemMeta(meta);
+			} else if (source instanceof Inventory inventory) {
+                int size = inventory.getMaxStackSize();
+				switch (mode) {
+					case ADD -> size += change;
+					case SET -> size = change;
+					case REMOVE -> size -= change;
+					case RESET -> size = Bukkit.createInventory(null, inventory.getType()).getMaxStackSize();
+				}
+				inventory.setMaxStackSize(size);
+			}
+		}
+	}
+
+	@Override
+	public Class<? extends Integer> getReturnType() {
+		return Integer.class;
 	}
 
 	@Override
@@ -59,4 +104,13 @@ protected String getPropertyName() {
 		return "maximum stack size";
 	}
 
+	private static int getMaxStackSize(ItemType itemType) {
+		Object item = itemType.getRandomStackOrMaterial();
+		if (item instanceof ItemStack stack)
+			return stack.getMaxStackSize();
+		if (item instanceof Material material)
+			return material.getMaxStackSize();
+		throw new UnsupportedOperationException();
+	}
+
 }
diff --git a/src/main/java/ch/njol/skript/expressions/ExprMe.java b/src/main/java/ch/njol/skript/expressions/ExprMe.java
index 112259e4f2f..a365c38bea6 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprMe.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprMe.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import org.bukkit.command.CommandSender;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprMemory.java b/src/main/java/ch/njol/skript/expressions/ExprMemory.java
index 1ea10604b74..391ef7d73ce 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprMemory.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprMemory.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import java.util.Locale;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprMendingRepairAmount.java b/src/main/java/ch/njol/skript/expressions/ExprMendingRepairAmount.java
index b2e2e40169b..39368c412ec 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprMendingRepairAmount.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprMendingRepairAmount.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import org.bukkit.event.Event;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprMessage.java b/src/main/java/ch/njol/skript/expressions/ExprMessage.java
index 5147b3119a2..15c9dbc37de 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprMessage.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprMessage.java
@@ -1,39 +1,8 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
-import org.bukkit.event.Event;
-import org.bukkit.event.entity.EntityDeathEvent;
-import org.bukkit.event.entity.PlayerDeathEvent;
-import org.bukkit.event.player.AsyncPlayerChatEvent;
-import org.bukkit.event.player.PlayerJoinEvent;
-import org.bukkit.event.player.PlayerKickEvent;
-import org.bukkit.event.player.PlayerQuitEvent;
-import org.jetbrains.annotations.Nullable;
-
 import ch.njol.skript.Skript;
 import ch.njol.skript.classes.Changer.ChangeMode;
-import ch.njol.skript.doc.Description;
-import ch.njol.skript.doc.Events;
-import ch.njol.skript.doc.Examples;
-import ch.njol.skript.doc.Name;
-import ch.njol.skript.doc.Since;
+import ch.njol.skript.doc.*;
 import ch.njol.skript.lang.Expression;
 import ch.njol.skript.lang.ExpressionType;
 import ch.njol.skript.lang.SkriptParser.ParseResult;
@@ -41,13 +10,23 @@
 import ch.njol.skript.log.ErrorQuality;
 import ch.njol.util.Kleenean;
 import ch.njol.util.coll.CollectionUtils;
+import org.bukkit.event.Event;
+import org.bukkit.event.entity.EntityDeathEvent;
+import org.bukkit.event.entity.PlayerDeathEvent;
+import org.bukkit.event.player.AsyncPlayerChatEvent;
+import org.bukkit.event.player.PlayerJoinEvent;
+import org.bukkit.event.player.PlayerKickEvent;
+import org.bukkit.event.player.PlayerQuitEvent;
+import org.bukkit.event.server.BroadcastMessageEvent;
+import org.jetbrains.annotations.Nullable;
 
-/**
- * @author Peter Güttinger
- */
 @SuppressWarnings("deprecation")
 @Name("Message")
-@Description("The (chat) message of a chat event, the join message of a join event, the quit message of a quit event, or the death message on a death event. This expression is mostly useful for being changed.")
+@Description(
+	"The (chat) message of a chat event, the join message of a join event, the quit message of a quit event, " +
+	"the death message of a death event or the broadcasted message in a broadcast event. " +
+	"This expression is mostly useful for being changed."
+)
 @Examples({
 		"on chat:",
 			"\tplayer has permission \"admin\"",
@@ -67,9 +46,13 @@
 				"\t\tset quit message to \"%player% left this awesome server!\"",
 		"",
 		"on death:",
-			"\tset the death message to \"%player% died!\""})
-@Since("1.4.6 (chat message), 1.4.9 (join & quit messages), 2.0 (death message), 2.9.0 (clear message)")
-@Events({"chat", "join", "quit", "death"})
+			"\tset the death message to \"%player% died!\"",
+		"",
+		"on broadcast:",
+			"\tset broadcast message to \"&a[BROADCAST] %broadcast message%\""
+})
+@Since("1.4.6 (chat message), 1.4.9 (join & quit messages), 2.0 (death message), 2.9.0 (clear message), 2.10 (broadcasted message)")
+@Events({"chat", "join", "quit", "death", "broadcast"})
 public class ExprMessage extends SimpleExpression<String> {
 	
 	@SuppressWarnings("unchecked")
@@ -129,6 +112,20 @@ void set(final Event e, final String message) {
 				if (e instanceof PlayerDeathEvent)
 					((PlayerDeathEvent) e).setDeathMessage(message);
 			}
+		},
+		BROADCAST("broadcast", "broadcast(-|[ed] )message", BroadcastMessageEvent.class) {
+			@Override
+			@Nullable String get(Event event) {
+				if (event instanceof BroadcastMessageEvent broadcastMessageEvent)
+					return broadcastMessageEvent.getMessage();
+				return null;
+			}
+
+			@Override
+			void set(Event event, String message) {
+				if (event instanceof BroadcastMessageEvent broadcastMessageEvent)
+					broadcastMessageEvent.setMessage(message);
+			}
 		};
 		
 		final String name;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprMetadata.java b/src/main/java/ch/njol/skript/expressions/ExprMetadata.java
index 7608b73dc83..aa9d3de4e87 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprMetadata.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprMetadata.java
@@ -1,138 +1,148 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
-import java.lang.reflect.Array;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.bukkit.event.Event;
-import org.bukkit.metadata.FixedMetadataValue;
-import org.bukkit.metadata.MetadataValue;
-import org.bukkit.metadata.Metadatable;
-import org.jetbrains.annotations.Nullable;
-
 import ch.njol.skript.Skript;
-import ch.njol.skript.classes.Changer;
+import ch.njol.skript.classes.Changer.ChangeMode;
 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.SkriptParser;
+import ch.njol.skript.lang.SkriptParser.ParseResult;
 import ch.njol.skript.lang.util.SimpleExpression;
-import org.skriptlang.skript.lang.converter.Converters;
 import ch.njol.skript.util.Utils;
 import ch.njol.util.Kleenean;
 import ch.njol.util.coll.CollectionUtils;
+import org.bukkit.event.Event;
+import org.bukkit.metadata.FixedMetadataValue;
+import org.bukkit.metadata.MetadataValue;
+import org.bukkit.metadata.Metadatable;
+import org.jetbrains.annotations.Nullable;
+import org.jetbrains.annotations.UnknownNullability;
+import org.skriptlang.skript.lang.arithmetic.Arithmetics;
+import org.skriptlang.skript.lang.arithmetic.Operation;
+import org.skriptlang.skript.lang.arithmetic.OperationInfo;
+import org.skriptlang.skript.lang.arithmetic.Operator;
+import org.skriptlang.skript.lang.converter.Converters;
+
+import java.lang.reflect.Array;
+import java.util.ArrayList;
+import java.util.List;
 
 @Name("Metadata")
-@Description("Metadata is a way to store temporary data on entities, blocks and more that " +
-		"disappears after a server restart.")
-@Examples({"set metadata value \"healer\" of player to true",
-		"broadcast \"%metadata value \"\"healer\"\" of player%\"",
-		"clear metadata value \"healer\" of player"})
-@Since("2.2-dev36")
-@SuppressWarnings({"unchecked", "null"})
+@Description("Metadata is a way to store temporary data on entities, blocks and more that disappears after a server restart.")
+@Examples({
+	"set metadata value \"healer\" of player to true",
+	"broadcast \"%metadata value \"\"healer\"\" of player%\"",
+	"clear metadata value \"healer\" of player"
+})
+@Since("2.2-dev36, 2.10 (add, remove)")
 public class ExprMetadata<T> extends SimpleExpression<T> {
 
 	static {
+		//noinspection unchecked
 		Skript.registerExpression(ExprMetadata.class, Object.class, ExpressionType.PROPERTY,
 				"metadata [(value|tag)[s]] %strings% of %metadataholders%",
 				"%metadataholders%'[s] metadata [(value|tag)[s]] %string%"
 		);
 	}
 
-	private ExprMetadata<?> source;
-	@Nullable
-	private Expression<String> values;
-	@Nullable
-	private Expression<Metadatable> holders;
-	private Class<? extends T>[] types;
-	private Class<T> superType;
+	private final ExprMetadata<?> source;
+	private final Class<? extends T>[] types;
+	private final Class<T> superType;
+
+	private @UnknownNullability Expression<String> keys;
+	private @UnknownNullability Expression<Metadatable> holders;
 
 	public ExprMetadata() {
+		//noinspection unchecked
 		this(null, (Class<? extends T>) Object.class);
 	}
 
+	@SafeVarargs
 	private ExprMetadata(ExprMetadata<?> source, Class<? extends T>... types) {
 		this.source = source;
 		if (source != null) {
-			this.values = source.values;
+			this.keys = source.keys;
 			this.holders = source.holders;
 		}
 		this.types = types;
+		//noinspection unchecked
 		this.superType = (Class<T>) Utils.getSuperType(types);
 	}
 
 	@Override
-	public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelayed, SkriptParser.ParseResult parseResult) {
+	public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelayed, ParseResult parseResult) {
 		holders = (Expression<Metadatable>) exprs[matchedPattern ^ 1];
-		values = (Expression<String>) exprs[matchedPattern];
+		keys = (Expression<String>) exprs[matchedPattern];
 		return true;
 	}
 
 	@Override
-	@Nullable
-	protected T[] get(Event e) {
+	protected T @Nullable [] get(Event event) {
 		List<Object> values = new ArrayList<>();
-		for (String value : this.values.getArray(e)) {
-			for (Metadatable holder : holders.getArray(e)) {
-				List<MetadataValue> metadata = holder.getMetadata(value);
+		String[] keys = this.keys.getArray(event);
+		for (Metadatable holder : holders.getArray(event)) {
+			for (String key : keys) {
+				List<MetadataValue> metadata = holder.getMetadata(key);
 				if (!metadata.isEmpty())
 					values.add(metadata.get(metadata.size() - 1).value()); // adds the most recent metadata value
 			}
 		}
 		try {
 			return Converters.convert(values.toArray(), types, superType);
-		} catch (ClassCastException e1) {
+		} catch (ClassCastException exception) {
+			//noinspection unchecked
 			return (T[]) Array.newInstance(superType, 0);
 		}
 	}
 
 	@Override
-	@Nullable
-	public Class<?>[] acceptChange(Changer.ChangeMode mode) {
-		if (mode == Changer.ChangeMode.DELETE || mode == Changer.ChangeMode.SET)
-			return CollectionUtils.array(Object.class);
-		return null;
+	public Class<?> @Nullable [] acceptChange(ChangeMode mode) {
+		return switch (mode) {
+			case SET, ADD, REMOVE, DELETE -> CollectionUtils.array(Object.class);
+			default -> null;
+		};
 	}
 
 	@Override
-	public void change(Event e, @Nullable Object[] delta, Changer.ChangeMode mode) {
-		for (String value : values.getArray(e)) {
-			for (Metadatable holder : holders.getArray(e)) {
-				switch (mode) {
-					case SET:
-						holder.setMetadata(value, new FixedMetadataValue(Skript.getInstance(), delta[0]));
-						break;
-					case DELETE:
-						holder.removeMetadata(value, Skript.getInstance());
-				}
+	public void change(Event event, Object @Nullable [] delta, ChangeMode mode) {
+		String[] keys = this.keys.getArray(event);
+		for (Metadatable holder : holders.getArray(event)) {
+			for (String key : keys) {
+                switch (mode) {
+                    case SET -> holder.setMetadata(key, new FixedMetadataValue(Skript.getInstance(), delta[0]));
+					case ADD, REMOVE -> {
+						assert delta != null;
+						Operator operator = mode == ChangeMode.ADD ? Operator.ADDITION : Operator.SUBTRACTION;
+						List<MetadataValue> metadata = holder.getMetadata(key);
+						Object value = metadata.isEmpty() ? null : metadata.get(metadata.size() - 1).value();
+						OperationInfo<?, ?, ?> info;
+                        if (value != null) {
+                            info = Arithmetics.getOperationInfo(operator, value.getClass(), delta[0].getClass());
+                            if (info == null)
+                                continue;
+                        } else {
+                            info = Arithmetics.getOperationInfo(operator, delta[0].getClass(), delta[0].getClass());
+                            if (info == null)
+                                continue;
+                            value = Arithmetics.getDefaultValue(info.getLeft());
+                            if (value == null)
+                                continue;
+                        }
+                        //noinspection unchecked,rawtypes
+						Object newValue = ((Operation) info.getOperation()).calculate(value, delta[0]);
+						holder.setMetadata(key, new FixedMetadataValue(Skript.getInstance(), newValue));
+					}
+                    case DELETE -> holder.removeMetadata(key, Skript.getInstance());
+                }
 			}
 		}
 	}
 
 	@Override
 	public boolean isSingle() {
-		return holders.isSingle() && values.isSingle();
+		return holders.isSingle() && keys.isSingle();
 	}
 
 	@Override
@@ -141,7 +151,8 @@ public Class<? extends T> getReturnType() {
 	}
 
 	@Override
-	public <R> Expression<? extends R> getConvertedExpression(Class<R>... to) {
+	@SafeVarargs
+	public final <R> Expression<? extends R> getConvertedExpression(Class<R>... to) {
 		return new ExprMetadata<>(this, to);
 	}
 
@@ -151,8 +162,8 @@ public Expression<?> getSource() {
 	}
 
 	@Override
-	public String toString(@Nullable Event e, boolean debug) {
-		return "metadata values " + values.toString(e, debug) + " of " + holders.toString(e, debug);
+	public String toString(@Nullable Event event, boolean debug) {
+		return "metadata values " + keys.toString(event, debug) + " of " + holders.toString(event, debug);
 	}
 
-}
\ No newline at end of file
+}
diff --git a/src/main/java/ch/njol/skript/expressions/ExprMiddleOfLocation.java b/src/main/java/ch/njol/skript/expressions/ExprMiddleOfLocation.java
index 7f72db5c2ea..8e605106e46 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprMiddleOfLocation.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprMiddleOfLocation.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import ch.njol.skript.doc.Description;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprMinecartDerailedFlyingVelocity.java b/src/main/java/ch/njol/skript/expressions/ExprMinecartDerailedFlyingVelocity.java
index ba15473acc3..f109a65dc6f 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprMinecartDerailedFlyingVelocity.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprMinecartDerailedFlyingVelocity.java
@@ -1,22 +1,3 @@
-/**
- * This file is part of Skript.
- *
- * Skript is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Skript is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import org.bukkit.entity.Entity;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprMoonPhase.java b/src/main/java/ch/njol/skript/expressions/ExprMoonPhase.java
index 7fbe876571e..68211c6fe98 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprMoonPhase.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprMoonPhase.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import ch.njol.skript.Skript;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprName.java b/src/main/java/ch/njol/skript/expressions/ExprName.java
index fd43791f4aa..4501d11ac11 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprName.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprName.java
@@ -1,49 +1,7 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
-import java.util.ArrayList;
-import java.util.List;
-
-import ch.njol.skript.bukkitutil.InventoryUtils;
-import ch.njol.skript.bukkitutil.ItemUtils;
-import org.bukkit.Bukkit;
-import org.bukkit.GameRule;
-import org.bukkit.Nameable;
-import org.bukkit.OfflinePlayer;
-import org.bukkit.block.Block;
-import org.bukkit.block.BlockState;
-import org.bukkit.entity.Entity;
-import org.bukkit.entity.HumanEntity;
-import org.bukkit.entity.LivingEntity;
-import org.bukkit.entity.Player;
-import org.bukkit.event.Event;
-import org.bukkit.event.inventory.InventoryType;
-import org.bukkit.inventory.Inventory;
-import org.bukkit.inventory.InventoryHolder;
-import org.bukkit.inventory.ItemStack;
-import org.bukkit.inventory.meta.ItemMeta;
-import org.bukkit.World;
-import org.jetbrains.annotations.Nullable;
-
 import ch.njol.skript.Skript;
-import ch.njol.skript.aliases.ItemType;
+import ch.njol.skript.bukkitutil.InventoryUtils;
 import ch.njol.skript.classes.Changer.ChangeMode;
 import ch.njol.skript.doc.Description;
 import ch.njol.skript.doc.Examples;
@@ -51,59 +9,70 @@
 import ch.njol.skript.doc.Since;
 import ch.njol.skript.expressions.base.SimplePropertyExpression;
 import ch.njol.skript.lang.Expression;
+import ch.njol.skript.lang.ExpressionType;
 import ch.njol.skript.lang.SkriptParser.ParseResult;
+import ch.njol.skript.lang.function.DynamicFunctionReference;
+import ch.njol.skript.lang.util.common.AnyNamed;
+import ch.njol.skript.registrations.Feature;
 import ch.njol.skript.util.chat.BungeeConverter;
 import ch.njol.skript.util.chat.ChatMessages;
-import ch.njol.skript.util.slot.Slot;
 import ch.njol.util.Kleenean;
 import ch.njol.util.coll.CollectionUtils;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.serializer.bungeecord.BungeeComponentSerializer;
 import net.md_5.bungee.api.ChatColor;
 import net.md_5.bungee.api.chat.BaseComponent;
+import org.bukkit.Bukkit;
+import org.bukkit.Nameable;
+import org.bukkit.OfflinePlayer;
+import org.bukkit.World;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.HumanEntity;
+import org.bukkit.entity.LivingEntity;
+import org.bukkit.entity.Player;
+import org.bukkit.event.Event;
+import org.bukkit.event.inventory.InventoryType;
+import org.bukkit.inventory.Inventory;
+import org.bukkit.inventory.InventoryHolder;
+import org.jetbrains.annotations.Nullable;
+import org.skriptlang.skript.lang.script.Script;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
 
 @Name("Name / Display Name / Tab List Name")
 @Description({
-	"Represents the Minecraft account, display or tab list name of a player, or the custom name of an item, entity, block, inventory, gamerule or world.",
+	"Represents the Minecraft account, display or tab list name of a player, or the custom name of an item, entity, "
+        + "block, inventory, gamerule, world, script or function.",
+	"",
+	"<strong>Players:</strong>",
+	"\t<strong>Name:</strong> The Minecraft account name of the player. Can't be changed, but 'display name' can be changed.",
+	"\t<strong>Display Name:</strong> The name of the player that is displayed in messages. " +
+		"This name can be changed freely and can include color codes, and is shared among all plugins (e.g. chat plugins will use the display name).",
 	"",
-	"<ul>",
-	"\t<li><strong>Players</strong>",
-	"\t\t<ul>",
-	"\t\t\t<li><strong>Name:</strong> The Minecraft account name of the player. Can't be changed, but 'display name' can be changed.</li>",
-	"\t\t\t<li><strong>Display Name:</strong> The name of the player that is displayed in messages. " +
-		"This name can be changed freely and can include color codes, and is shared among all plugins (e.g. chat plugins will use the display name).</li>",
-	"\t\t</ul>",
-	"\t</li>",
-	"\t<li><strong>Entities</strong>",
-	"\t\t<ul>",
-	"\t\t\t<li><strong>Name:</strong> The custom name of the entity. Can be changed. But for living entities, " +
-		"the players will have to target the entity to see its name tag. For non-living entities, the name will not be visible at all. To prevent this, use 'display name'.</li>",
-	"\t\t\t<li><strong>Display Name:</strong> The custom name of the entity. Can be changed, " +
-		"which will also enable <em>custom name visibility</em> of the entity so name tag of the entity will be visible always.</li>",
-	"\t\t</ul>",
-	"\t</li>",
-	"\t<li><strong>Items</strong>",
-	"\t\t<ul>",
-	"\t\t\t<li><strong>Name and Display Name:</strong> The <em>custom</em> name of the item (not the Minecraft locale name). Can be changed.</li>",
-	"\t\t</ul>",
-	"\t</li>",
-	"\t<li><strong>Inventories</strong>",
-	"\t\t<ul>",
-	"\t\t\t<li><strong>Name and Display Name:</strong> The name/title of the inventory. " +
-		"Changing name of an inventory means opening the same inventory with the same contents but with a different name to its current viewers.</li>",
-	"\t\t</ul>",
-	"\t</li>",
-	"\t<li><strong>Gamerules (1.13+)</strong>",
-	"\t\t<ul>",
-	"\t\t\t<li><strong>Name:</strong> The name of the gamerule. Cannot be changed.</li>",
-	"\t\t</ul>",
-	"\t</li>",
-	"\t<li><strong>Worlds</strong>",
-	"\t\t<ul>",
-	"\t\t\t<li><strong>Name:</strong> The name of the world. Cannot be changed.</li>",
-	"\t\t</ul>",
-	"\t</li>",
-	"</ul>"
+	"<strong>Entities:</strong>",
+	"\t<strong>Name:</strong> The custom name of the entity. Can be changed. But for living entities, " +
+		"the players will have to target the entity to see its name tag. For non-living entities, the name will not be visible at all. To prevent this, use 'display name'.",
+	"\t<strong>Display Name:</strong> The custom name of the entity. Can be changed, " +
+		"which will also enable <em>custom name visibility</em> of the entity so name tag of the entity will be visible always.",
+	"",
+	"<strong>Items:</strong>",
+	"\t<strong>Name and Display Name:</strong> The <em>custom</em> name of the item (not the Minecraft locale name). Can be changed.",
+	"",
+	"<strong>Inventories:</strong>",
+	"\t<strong>Name and Display Name:</strong> The name/title of the inventory. " +
+		"Changing name of an inventory means opening the same inventory with the same contents but with a different name to its current viewers.",
+	"",
+	"<strong>Gamerules:</strong>",
+	"\t<strong>Name:</strong> The name of the gamerule. Cannot be changed.",
+	"",
+	"<strong>Worlds:</strong>",
+	"\t<strong>Name:</strong> The name of the world. Cannot be changed.",
+	"",
+	"<strong>Scripts:</strong>",
+	"\t<strong>Name:</strong> The name of a script, excluding its file extension."
 })
 @Examples({
 	"on join:",
@@ -112,22 +81,30 @@
 	"\tset the player's tab list name to \"&lt;green&gt;%player's name%\"",
 	"set the name of the player's tool to \"Legendary Sword of Awesomeness\""
 })
-@Since("before 2.1, 2.2-dev20 (inventory name), 2.4 (non-living entity support, changeable inventory name), 2.7 (worlds)")
+@Since({
+	"before 2.1",
+	"2.2-dev20 (inventory name)",
+	"2.4 (non-living entity support, changeable inventory name)",
+	"2.7 (worlds)"
+})
 public class ExprName extends SimplePropertyExpression<Object, String> {
 
 	@Nullable
 	private static BungeeComponentSerializer serializer;
-	static final boolean HAS_GAMERULES;
 
 	static {
 		// Check for Adventure API
 		if (Skript.classExists("net.kyori.adventure.text.Component") &&
-				Skript.methodExists(Bukkit.class, "createInventory", InventoryHolder.class, int.class, Component.class))
+			Skript.methodExists(Bukkit.class, "createInventory", InventoryHolder.class, int.class, Component.class))
 			serializer = BungeeComponentSerializer.get();
-		HAS_GAMERULES = Skript.classExists("org.bukkit.GameRule");
-		register(ExprName.class, String.class, "(1¦name[s]|2¦(display|nick|chat|custom)[ ]name[s])", "offlineplayers/entities/blocks/itemtypes/inventories/slots/worlds"
-			+ (HAS_GAMERULES ? "/gamerules" : ""));
-		register(ExprName.class, String.class, "(3¦(player|tab)[ ]list name[s])", "players");
+
+		List<String> patterns = new ArrayList<>();
+		patterns.addAll(Arrays.asList(getPatterns("name[s]", "offlineplayers/entities/inventories/nameds")));
+		patterns.addAll(Arrays.asList(getPatterns("(display|nick|chat|custom)[ ]name[s]", "offlineplayers/entities/inventories/nameds")));
+		patterns.addAll(Arrays.asList(getPatterns("(player|tab)[ ]list name[s]", "players")));
+
+		Skript.registerExpression(ExprName.class, String.class, ExpressionType.COMBINED, patterns.toArray(new String[0]));
+		// we keep the entity input because we want to do something special with entities
 	}
 
 	/*
@@ -136,59 +113,47 @@ public class ExprName extends SimplePropertyExpression<Object, String> {
 	 * 3 = "tablist name"
 	 */
 	private int mark;
+	private boolean scriptResolvedName;
 
 	@Override
 	public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelayed, ParseResult parseResult) {
-		mark = parseResult.mark;
-		setExpr(exprs[0]);
-		if (mark != 1 && World.class.isAssignableFrom(getExpr().getReturnType())) {
-			Skript.error("Can't use 'display name' with worlds. Use 'name' instead.");
-			return false;
-		}
+		this.mark = (matchedPattern / 2) + 1;
+		this.setExpr(exprs[0]);
+		this.scriptResolvedName = this.getParser().hasExperiment(Feature.SCRIPT_REFLECTION);
 		return true;
 	}
 
 	@Override
-	@Nullable
-	public String convert(Object object) {
-		if (object instanceof OfflinePlayer && ((OfflinePlayer) object).isOnline())
-			object = ((OfflinePlayer) object).getPlayer();
-
-		if (object instanceof Player) {
-			switch (mark) {
-				case 1:
-					return ((Player) object).getName();
-				case 2:
-					return ((Player) object).getDisplayName();
-				case 3:
-					return ((Player) object).getPlayerListName();
+	public @Nullable String convert(Object object) {
+		if (object instanceof OfflinePlayer offlinePlayer) {
+			if (offlinePlayer.isOnline()) { // Defer to player check below
+				object = offlinePlayer.getPlayer();
+			} else { // We can only support "name"
+				return mark == 1 ? offlinePlayer.getName() : null;
 			}
-		} else if (object instanceof OfflinePlayer) {
-			return mark == 1 ? ((OfflinePlayer) object).getName() : null;
-		} else if (object instanceof Entity) {
-			return ((Entity) object).getCustomName();
-		} else if (object instanceof Block) {
-			BlockState state = ((Block) object).getState();
-			if (state instanceof Nameable)
-				return ((Nameable) state).getCustomName();
-		} else if (object instanceof ItemType) {
-			ItemMeta m = ((ItemType) object).getItemMeta();
-			return m.hasDisplayName() ? m.getDisplayName() : null;
-		} else if (object instanceof Inventory) {
-			Inventory inventory = (Inventory) object;
+		}
+
+		if (!scriptResolvedName && object instanceof Script script) {
+			return script.nameAndPath();
+		}
+
+		if (object instanceof Player player) {
+			return switch (mark) {
+				case 1 -> player.getName();
+				case 2 -> player.getDisplayName();
+				case 3 -> player.getPlayerListName();
+				default -> throw new IllegalStateException("Unexpected value: " + mark);
+			};
+		} else if (object instanceof Nameable nameable) {
+			if (mark == 1 && nameable instanceof CommandSender sender)
+				return sender.getName();
+			return nameable.getCustomName();
+		} else if (object instanceof Inventory inventory) {
 			if (inventory.getViewers().isEmpty())
 				return null;
 			return InventoryUtils.getTitle(inventory.getViewers().get(0).getOpenInventory());
-		} else if (object instanceof Slot) {
-			ItemStack is = ((Slot) object).getItem();
-			if (is != null && is.hasItemMeta()) {
-				ItemMeta m = is.getItemMeta();
-				return m.hasDisplayName() ? m.getDisplayName() : null;
-			}
-		} else if (object instanceof World) {
-			return ((World) object).getName();
-		} else if (HAS_GAMERULES && object instanceof GameRule) {
-			return ((GameRule) object).getName();
+		} else if (object instanceof AnyNamed named) {
+			return named.name();
 		}
 		return null;
 	}
@@ -199,10 +164,15 @@ public Class<?>[] acceptChange(ChangeMode mode) {
 		if (mode == ChangeMode.SET || mode == ChangeMode.RESET) {
 			if (mark == 1) {
 				if (Player.class.isAssignableFrom(getExpr().getReturnType())) {
-					Skript.error("Can't change the Minecraft name of a player. Change the 'display name' or 'tab list name' instead.");
+					Skript.error("Can't change the Minecraft name of a player. Change the 'display name' or 'tab list "
+						+ "name' instead.");
 					return null;
 				} else if (World.class.isAssignableFrom(getExpr().getReturnType())) {
 					return null;
+				} else if (Script.class.isAssignableFrom(getExpr().getReturnType())) {
+					return null;
+				} else if (DynamicFunctionReference.class.isAssignableFrom(getExpr().getReturnType())) {
+					return null;
 				}
 			}
 			return CollectionUtils.array(String.class);
@@ -214,41 +184,32 @@ public Class<?>[] acceptChange(ChangeMode mode) {
 	public void change(Event event, @Nullable Object[] delta, ChangeMode mode) {
 		String name = delta != null ? (String) delta[0] : null;
 		for (Object object : getExpr().getArray(event)) {
-			if (object instanceof Player) {
+			if (object instanceof Player player) {
 				switch (mark) {
 					case 2:
-						((Player) object).setDisplayName(name != null ? name + ChatColor.RESET : ((Player) object).getName());
+						player.setDisplayName(name != null ? name + ChatColor.RESET : ((Player) object).getName());
 						break;
 					case 3: // Null check not necessary. This method will use the player's name if 'name' is null.
-						((Player) object).setPlayerListName(name);
+						player.setPlayerListName(name);
 						break;
 				}
-			} else if (object instanceof Entity) {
-				((Entity) object).setCustomName(name);
+			} else if (object instanceof Entity entity) {
+				entity.setCustomName(name);
 				if (mark == 2 || mode == ChangeMode.RESET) // Using "display name"
-					((Entity) object).setCustomNameVisible(name != null);
-				if (object instanceof LivingEntity)
-					((LivingEntity) object).setRemoveWhenFarAway(name == null);
-			} else if (object instanceof Block) {
-				BlockState state = ((Block) object).getState();
-				if (state instanceof Nameable) {
-					((Nameable) state).setCustomName(name);
-					state.update();
-				}
-			} else if (object instanceof ItemType) {
-				ItemType i = (ItemType) object;
-				ItemMeta m = i.getItemMeta();
-				m.setDisplayName(name);
-				i.setItemMeta(m);
-			} else if (object instanceof Inventory) {
-				Inventory inv = (Inventory) object;
+					entity.setCustomNameVisible(name != null);
+				if (object instanceof LivingEntity living)
+					living.setRemoveWhenFarAway(name == null);
+			} else if (object instanceof AnyNamed named) {
+				if (named.supportsNameChange())
+					named.setName(name);
+			} else if (object instanceof Inventory inventory) {
 
-				if (inv.getViewers().isEmpty())
+				if (inventory.getViewers().isEmpty())
 					return;
 				// Create a clone to avoid a ConcurrentModificationException
-				List<HumanEntity> viewers = new ArrayList<>(inv.getViewers());
+				List<HumanEntity> viewers = new ArrayList<>(inventory.getViewers());
 
-				InventoryType type = inv.getType();
+				InventoryType type = inventory.getType();
 				if (!type.isCreatable())
 					return;
 
@@ -257,9 +218,9 @@ public void change(Event event, @Nullable Object[] delta, ChangeMode mode) {
 					if (name == null)
 						name = type.getDefaultTitle();
 					if (type == InventoryType.CHEST) {
-						copy = Bukkit.createInventory(inv.getHolder(), inv.getSize(), name);
+						copy = Bukkit.createInventory(inventory.getHolder(), inventory.getSize(), name);
 					} else {
-						copy = Bukkit.createInventory(inv.getHolder(), type, name);
+						copy = Bukkit.createInventory(inventory.getHolder(), type, name);
 					}
 				} else {
 					Component component = type.defaultTitle();
@@ -268,22 +229,13 @@ public void change(Event event, @Nullable Object[] delta, ChangeMode mode) {
 						component = serializer.deserialize(components);
 					}
 					if (type == InventoryType.CHEST) {
-						copy = Bukkit.createInventory(inv.getHolder(), inv.getSize(), component);
+						copy = Bukkit.createInventory(inventory.getHolder(), inventory.getSize(), component);
 					} else {
-						copy = Bukkit.createInventory(inv.getHolder(), type, component);
+						copy = Bukkit.createInventory(inventory.getHolder(), type, component);
 					}
 				}
-				copy.setContents(inv.getContents());
+				copy.setContents(inventory.getContents());
 				viewers.forEach(viewer -> viewer.openInventory(copy));
-			} else if (object instanceof Slot) {
-				Slot s = (Slot) object;
-				ItemStack is = s.getItem();
-				if (is != null && !ItemUtils.isAir(is.getType())) {
-					ItemMeta m = is.hasItemMeta() ? is.getItemMeta() : Bukkit.getItemFactory().getItemMeta(is.getType());
-					m.setDisplayName(name);
-					is.setItemMeta(m);
-					s.setItem(is);
-				}
 			}
 		}
 	}
@@ -295,12 +247,11 @@ public Class<String> getReturnType() {
 
 	@Override
 	protected String getPropertyName() {
-		switch (mark) {
-			case 1: return "name";
-			case 2: return "display name";
-			case 3: return "tablist name";
-			default: return "name";
-		}
+		return switch (mark) {
+			case 2 -> "display name";
+			case 3 -> "tablist name";
+			default -> "name";
+		};
 	}
 
 }
diff --git a/src/main/java/ch/njol/skript/expressions/ExprNamed.java b/src/main/java/ch/njol/skript/expressions/ExprNamed.java
index 8ab9eac4825..a3a43aaa777 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprNamed.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprNamed.java
@@ -1,31 +1,5 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
-import org.bukkit.Bukkit;
-import org.bukkit.event.Event;
-import org.bukkit.event.inventory.InventoryType;
-import org.bukkit.inventory.Inventory;
-import org.bukkit.inventory.ItemStack;
-import org.bukkit.inventory.meta.ItemMeta;
-import org.jetbrains.annotations.Nullable;
-
 import ch.njol.skript.Skript;
 import ch.njol.skript.aliases.ItemType;
 import ch.njol.skript.doc.Description;
@@ -35,9 +9,17 @@
 import ch.njol.skript.expressions.base.PropertyExpression;
 import ch.njol.skript.lang.Expression;
 import ch.njol.skript.lang.ExpressionType;
+import ch.njol.skript.lang.Literal;
 import ch.njol.skript.lang.SkriptParser.ParseResult;
-import ch.njol.skript.util.Getter;
+import ch.njol.skript.registrations.Classes;
 import ch.njol.util.Kleenean;
+import org.bukkit.Bukkit;
+import org.bukkit.event.Event;
+import org.bukkit.event.inventory.InventoryType;
+import org.bukkit.inventory.Inventory;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.meta.ItemMeta;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * @author Peter Güttinger
@@ -63,43 +45,45 @@ public class ExprNamed extends PropertyExpression<Object, Object> {
 	@Override
 	public boolean init(final Expression<?>[] exprs, final int matchedPattern, final Kleenean isDelayed, final ParseResult parseResult) {
 		setExpr(exprs[0]);
+		if (exprs[0] instanceof Literal<?> lit && lit.getSingle() instanceof InventoryType inventoryType && !inventoryType.isCreatable()) {
+			Skript.error("Cannot create an inventory of type " + Classes.toString(inventoryType));
+			return false;
+		}
 		name = (Expression<String>) exprs[1];
 		return true;
 	}
 	
 	@Override
-	protected Object[] get(final Event e, final Object[] source) {
-		String name = this.name.getSingle(e);
+	protected Object[] get(Event event, Object[] source) {
+		String name = this.name.getSingle(event);
 		if (name == null)
 			return get(source, obj -> obj); // No name provided, do nothing
-		return get(source, new Getter<Object, Object>() {
-			@Override
-			@Nullable
-			public Object get(Object obj) {
-				if (obj instanceof InventoryType)
-					return Bukkit.createInventory(null, (InventoryType) obj, name);
-				if (obj instanceof ItemStack) {
-					ItemStack stack = (ItemStack) obj;
-					stack = stack.clone();
-					ItemMeta meta = stack.getItemMeta();
-					if (meta != null) {
-						meta.setDisplayName(name);
-						stack.setItemMeta(meta);
-					}
-					return new ItemType(stack);
+		return get(source, object -> {
+			if (object instanceof InventoryType inventoryType) {
+				if (!inventoryType.isCreatable())
+					return null;
+				return Bukkit.createInventory(null, inventoryType, name);
+			}
+			if (object instanceof ItemStack stack) {
+				stack = stack.clone();
+				ItemMeta meta = stack.getItemMeta();
+				if (meta != null) {
+					meta.setDisplayName(name);
+					stack.setItemMeta(meta);
 				}
-				ItemType item = (ItemType) obj;
-				item = item.clone();
-				ItemMeta meta = item.getItemMeta();
-				meta.setDisplayName(name);
-				item.setItemMeta(meta);
-				return item;
+				return new ItemType(stack);
 			}
+			ItemType item = (ItemType) object;
+			item = item.clone();
+			ItemMeta meta = item.getItemMeta();
+			meta.setDisplayName(name);
+			item.setItemMeta(meta);
+			return item;
 		});
 	}
 	
 	@Override
-	public Class<? extends Object> getReturnType() {
+	public Class<?> getReturnType() {
 		return getExpr().getReturnType() == InventoryType.class ? Inventory.class : ItemType.class;
 	}
 	
diff --git a/src/main/java/ch/njol/skript/expressions/ExprNearestEntity.java b/src/main/java/ch/njol/skript/expressions/ExprNearestEntity.java
index a06c3b886a8..3f5db26c97a 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprNearestEntity.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprNearestEntity.java
@@ -1,22 +1,3 @@
-/**
- * This file is part of Skript.
- *
- * Skript is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Skript is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import ch.njol.skript.Skript;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprNewBannerPattern.java b/src/main/java/ch/njol/skript/expressions/ExprNewBannerPattern.java
new file mode 100644
index 00000000000..cbbf8cf83d9
--- /dev/null
+++ b/src/main/java/ch/njol/skript/expressions/ExprNewBannerPattern.java
@@ -0,0 +1,83 @@
+package ch.njol.skript.expressions;
+
+import ch.njol.skript.Skript;
+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.SkriptParser.ParseResult;
+import ch.njol.skript.lang.util.SimpleExpression;
+import ch.njol.skript.util.Color;
+import ch.njol.util.Kleenean;
+import org.bukkit.block.banner.Pattern;
+import org.bukkit.block.banner.PatternType;
+import org.bukkit.event.Event;
+import org.jetbrains.annotations.Nullable;
+
+@Name("Banner Pattern")
+@Description("Creates a new banner pattern.")
+@Examples({
+	"set {_pattern} to a creeper banner pattern colored red",
+	"add {_pattern} to banner patterns of {_banneritem}",
+	"remove {_pattern} from banner patterns of {_banneritem}",
+	"set the 1st banner pattern of block at location(0,0,0) to {_pattern}",
+	"clear the 1st banner pattern of block at location(0,0,0)",
+	"",
+	"set {_pattern} to a red mojang banner pattern"
+})
+@Since("2.10")
+public class ExprNewBannerPattern extends SimpleExpression<Pattern> {
+
+	static {
+		Skript.registerExpression(ExprNewBannerPattern.class, Pattern.class, ExpressionType.PATTERN_MATCHES_EVERYTHING,
+			"[a] %bannerpatterntype% colo[u]red %color%",
+			"[a] %*color% %bannerpatterntype%");
+	}
+
+	private Expression<PatternType> selectedPattern;
+	private Expression<Color> selectedColor;
+
+	@Override
+	public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelayed, ParseResult parseResult) {
+		if (matchedPattern == 0) {
+			//noinspection unchecked
+			selectedPattern = (Expression<PatternType>) exprs[0];
+			//noinspection unchecked
+			selectedColor = (Expression<Color>) exprs[1];
+		} else {
+			//noinspection unchecked
+			selectedPattern = (Expression<PatternType>) exprs[1];
+			//noinspection unchecked
+			selectedColor = (Expression<Color>) exprs[0];
+		}
+		return true;
+	}
+
+	@Override
+	protected Pattern @Nullable [] get(Event event) {
+		Color color = selectedColor.getSingle(event);
+		PatternType patternType = selectedPattern.getSingle(event);
+		if (color == null || color.asDyeColor() == null || patternType == null)
+			return null;
+
+		return new Pattern[]{new Pattern(color.asDyeColor(), patternType)};
+	}
+
+	@Override
+	public boolean isSingle() {
+		return true;
+	}
+
+	@Override
+	public Class<Pattern> getReturnType() {
+		return Pattern.class;
+	}
+
+	@Override
+	public String toString(@Nullable Event event, boolean debug) {
+		return "a " + selectedPattern.toString(event, debug) + " colored " + selectedColor.toString(event, debug);
+	}
+
+}
diff --git a/src/main/java/ch/njol/skript/expressions/ExprNoDamageTicks.java b/src/main/java/ch/njol/skript/expressions/ExprNoDamageTicks.java
index bdf0aaf8036..1dd1fe22733 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprNoDamageTicks.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprNoDamageTicks.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import org.bukkit.entity.LivingEntity;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprNode.java b/src/main/java/ch/njol/skript/expressions/ExprNode.java
new file mode 100644
index 00000000000..9fe36a71baa
--- /dev/null
+++ b/src/main/java/ch/njol/skript/expressions/ExprNode.java
@@ -0,0 +1,134 @@
+package ch.njol.skript.expressions;
+
+import ch.njol.skript.Skript;
+import ch.njol.skript.classes.Changer.ChangeMode;
+import ch.njol.skript.config.Node;
+import ch.njol.skript.config.SectionNode;
+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.expressions.base.PropertyExpression;
+import ch.njol.skript.lang.Expression;
+import ch.njol.skript.lang.ExpressionType;
+import ch.njol.skript.lang.SkriptParser.ParseResult;
+import ch.njol.skript.registrations.Feature;
+import ch.njol.util.Kleenean;
+import ch.njol.util.coll.CollectionUtils;
+import org.bukkit.event.Event;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.Iterator;
+import java.util.LinkedHashSet;
+import java.util.Set;
+
+@Name("Node (Experimental)")
+@Description({
+	"Returns a node inside a config (or another section-node).",
+	"Nodes in Skript configs are written in the format `key: value`.",
+	"Section nodes can contain other nodes."
+})
+@Examples({
+	"""
+		set {_node} to node "language" in the skript config
+		if text value of {_node} is "french":
+			broadcast "Bonjour!"
+		""",
+	"""
+		set {_script} to the current script
+		loop nodes of the current script:
+			broadcast name of loop-value"""
+})
+@Since("2.10")
+public class ExprNode extends PropertyExpression<Node, Node> {
+
+	static {
+		Skript.registerExpression(ExprNode.class, Node.class, ExpressionType.PROPERTY,
+				"[the] node %string% (of|in) %node%",
+				"%node%'[s] node %string%",
+				"[the] nodes (of|in) %nodes%",
+				"%node%'[s] nodes"
+		);
+	}
+
+	private boolean isPath;
+	private Expression<String> pathExpression;
+
+	@Override
+	@SuppressWarnings("unchecked")
+	public boolean init(Expression<?>[] expressions, int pattern, Kleenean isDelayed, ParseResult parseResult) {
+		if (!this.getParser().hasExperiment(Feature.SCRIPT_REFLECTION))
+			return false;
+		this.isPath = pattern < 2;
+		switch (pattern) {
+			case 0:
+				this.pathExpression = (Expression<String>) expressions[0];
+				this.setExpr((Expression<? extends Node>) expressions[1]);
+				break;
+			case 1:
+				this.pathExpression = (Expression<String>) expressions[1];
+				this.setExpr((Expression<? extends Node>) expressions[0]);
+				break;
+			default:
+				this.setExpr((Expression<? extends Node>) expressions[0]);
+		}
+		return true;
+	}
+
+	@Override
+	public Class<?> @Nullable [] acceptChange(ChangeMode mode) {
+		return null; // todo editable configs in follow-up PR
+	}
+
+	@Override
+	protected Node[] get(Event event, Node[] source) {
+		if (source.length == 0)
+			return CollectionUtils.array();
+		if (isPath) {
+			String path = pathExpression.getSingle(event);
+			Node node = source[0];
+			if (node != null && (path == null || path.isBlank()))
+				return CollectionUtils.array(node);
+			if (path == null || node == null)
+				return CollectionUtils.array();
+			node = node.getNodeAt(path);
+			if (node == null)
+				return CollectionUtils.array();
+			return CollectionUtils.array(node);
+		} else {
+			Set<Node> nodes = new LinkedHashSet<>();
+			for (Node node : source) {
+				for (Node inner : node)
+					nodes.add(inner);
+			}
+			return nodes.toArray(new Node[0]);
+		}
+	}
+
+	@Override
+	public @Nullable Iterator<? extends Node> iterator(Event event) {
+		if (isPath)
+			return super.iterator(event);
+		if (this.getExpr().getSingle(event) instanceof SectionNode node)
+			return node.iterator();
+		return null;
+	}
+
+	@Override
+	public boolean isSingle() {
+		return isPath;
+	}
+
+	@Override
+	public Class<? extends Node> getReturnType() {
+		return Node.class;
+	}
+
+	@Override
+	public String toString(@Nullable Event event, boolean debug) {
+		if (isPath)
+			return "the node " + pathExpression.toString(event, debug) + " of " + this.getExpr().toString(event, debug);
+		return "the nodes of " + this.getExpr().toString(event, debug);
+	}
+
+}
diff --git a/src/main/java/ch/njol/skript/expressions/ExprNow.java b/src/main/java/ch/njol/skript/expressions/ExprNow.java
index 546bc9afb07..fc1e12739d5 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprNow.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprNow.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import org.bukkit.event.Event;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprNumberOfCharacters.java b/src/main/java/ch/njol/skript/expressions/ExprNumberOfCharacters.java
index 300a4e1f0bb..b394ef51162 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprNumberOfCharacters.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprNumberOfCharacters.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import org.bukkit.event.Event;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprNumbers.java b/src/main/java/ch/njol/skript/expressions/ExprNumbers.java
index 570f0405186..140be747f76 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprNumbers.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprNumbers.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import java.util.ArrayList;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprOfflinePlayers.java b/src/main/java/ch/njol/skript/expressions/ExprOfflinePlayers.java
index 585b09ff59e..d4a6f50c9b4 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprOfflinePlayers.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprOfflinePlayers.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import org.bukkit.Bukkit;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprOnlinePlayersCount.java b/src/main/java/ch/njol/skript/expressions/ExprOnlinePlayersCount.java
index d79907e760a..42a29b7e4cf 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprOnlinePlayersCount.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprOnlinePlayersCount.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import ch.njol.skript.Skript;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprOpenedInventory.java b/src/main/java/ch/njol/skript/expressions/ExprOpenedInventory.java
index 2b17f75a423..e4f4704a581 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprOpenedInventory.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprOpenedInventory.java
@@ -1,31 +1,7 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
-import ch.njol.skript.bukkitutil.InventoryUtils;
-import org.bukkit.entity.Player;
-import org.bukkit.event.Event;
-import org.bukkit.inventory.Inventory;
-import org.bukkit.inventory.InventoryView;
-import org.jetbrains.annotations.Nullable;
-
 import ch.njol.skript.Skript;
+import ch.njol.skript.bukkitutil.InventoryUtils;
 import ch.njol.skript.doc.Description;
 import ch.njol.skript.doc.Examples;
 import ch.njol.skript.doc.Name;
@@ -34,8 +10,11 @@
 import ch.njol.skript.lang.Expression;
 import ch.njol.skript.lang.ExpressionType;
 import ch.njol.skript.lang.SkriptParser.ParseResult;
-import ch.njol.skript.util.Getter;
 import ch.njol.util.Kleenean;
+import org.bukkit.entity.Player;
+import org.bukkit.event.Event;
+import org.bukkit.inventory.Inventory;
+import org.jetbrains.annotations.Nullable;
 
 @Name("Opened Inventory")
 @Description({"Return the currently opened inventory of a player.",
@@ -62,15 +41,7 @@ public boolean init(final Expression<?>[] exprs, final int matchedPattern, final
 
 	@Override
 	protected Inventory[] get(Event event, Player[] source) {
-		return get(source, new Getter<Inventory, Player>() {
-			@Override
-			public @Nullable Inventory get(final Player player) {
-				InventoryView openInventory = player.getOpenInventory();
-				if (openInventory == null)
-					return null;
-				return InventoryUtils.getTopInventory(openInventory);
-			}
-		});
+		return get(source, player -> InventoryUtils.getTopInventory(player.getOpenInventory()));
 	}
 
 	@Override
diff --git a/src/main/java/ch/njol/skript/expressions/ExprOps.java b/src/main/java/ch/njol/skript/expressions/ExprOps.java
index 440a341c682..554bf84544d 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprOps.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprOps.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import ch.njol.skript.Skript;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprParse.java b/src/main/java/ch/njol/skript/expressions/ExprParse.java
index b212f6a2660..d1da502924c 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprParse.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprParse.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import ch.njol.skript.Skript;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprParseError.java b/src/main/java/ch/njol/skript/expressions/ExprParseError.java
index 9b24bad4971..16607ccb64d 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprParseError.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprParseError.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import org.bukkit.event.Event;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprPassenger.java b/src/main/java/ch/njol/skript/expressions/ExprPassenger.java
index 50673f8c928..1be2b7d4c39 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprPassenger.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprPassenger.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import java.util.ArrayList;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprPercent.java b/src/main/java/ch/njol/skript/expressions/ExprPercent.java
index 985932fbaff..8ab15321af5 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprPercent.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprPercent.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import ch.njol.skript.Skript;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprPermissions.java b/src/main/java/ch/njol/skript/expressions/ExprPermissions.java
index 78bc0a96881..36a54f620ab 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprPermissions.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprPermissions.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import ch.njol.skript.Skript;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprPickupDelay.java b/src/main/java/ch/njol/skript/expressions/ExprPickupDelay.java
index 8cbd54eaf8f..98c41a54599 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprPickupDelay.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprPickupDelay.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import ch.njol.skript.classes.Changer.ChangeMode;
@@ -49,7 +31,7 @@ public class ExprPickupDelay extends SimplePropertyExpression<Entity, Timespan>
 	public Timespan convert(Entity entity) {
 		if (!(entity instanceof Item))
 			return null;
-		return Timespan.fromTicks(((Item) entity).getPickupDelay());
+		return new Timespan(Timespan.TimePeriod.TICK, ((Item) entity).getPickupDelay());
 	}
 
 
@@ -70,7 +52,7 @@ public Class<?>[] acceptChange(ChangeMode mode) {
 	@Override
 	public void change(Event event, @Nullable Object[] delta, ChangeMode mode) {
 		Entity[] entities = getExpr().getArray(event);
-		int change = delta == null ? 0 : (int) ((Timespan) delta[0]).getTicks();
+		int change = delta == null ? 0 : (int) ((Timespan) delta[0]).getAs(Timespan.TimePeriod.TICK);
 		switch (mode) {
 			case REMOVE:
 				change = -change;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprPing.java b/src/main/java/ch/njol/skript/expressions/ExprPing.java
index f09cdce45d9..855e435a05a 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprPing.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprPing.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import ch.njol.skript.Skript;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprPlain.java b/src/main/java/ch/njol/skript/expressions/ExprPlain.java
index 1b6c367496c..3ff04713e9a 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprPlain.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprPlain.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import ch.njol.skript.Skript;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprPlayerChatCompletions.java b/src/main/java/ch/njol/skript/expressions/ExprPlayerChatCompletions.java
new file mode 100644
index 00000000000..4dea12cdfbe
--- /dev/null
+++ b/src/main/java/ch/njol/skript/expressions/ExprPlayerChatCompletions.java
@@ -0,0 +1,93 @@
+package ch.njol.skript.expressions;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import org.bukkit.entity.Player;
+import org.bukkit.event.Event;
+import org.jetbrains.annotations.Nullable;
+
+import ch.njol.skript.Skript;
+import ch.njol.skript.classes.Changer.ChangeMode;
+import ch.njol.skript.doc.Description;
+import ch.njol.skript.doc.Examples;
+import ch.njol.skript.doc.Name;
+import ch.njol.skript.doc.RequiredPlugins;
+import ch.njol.skript.doc.Since;
+import ch.njol.skript.expressions.base.SimplePropertyExpression;
+import ch.njol.util.coll.CollectionUtils;
+
+@Name("Player Chat Completions")
+@Description({
+	"The custom chat completion suggestions. You can add, set, remove, and clear them. Removing the names of online players with this expression is ineffective.",
+	"This expression will not return anything due to Bukkit limitations."
+})
+@Examples({
+	"add \"Skript\" and \"Njol\" to chat completions of all players",
+	"remove \"text\" from {_p}'s chat completions",
+	"clear player's chat completions"
+})
+@RequiredPlugins("Spigot 1.19+")
+@Since("2.10")
+public class ExprPlayerChatCompletions extends SimplePropertyExpression<Player, String> {
+
+	static {
+		if (Skript.methodExists(Player.class, "addCustomChatCompletions", Collection.class))
+			register(ExprPlayerChatCompletions.class, String.class, "[custom] chat completion[s]", "players");
+	}
+
+	@Override
+	public @Nullable String convert(Player player) {
+		return null; // Due to Bukkit limitations
+	}
+
+	@Override
+	public @Nullable Class<?>[] acceptChange(ChangeMode mode) {
+        return switch (mode) {
+            case ADD, SET, REMOVE, DELETE, RESET -> CollectionUtils.array(String[].class);
+            default -> null;
+        };
+	}
+
+	@Override
+	public void change(Event event, Object @Nullable [] delta, ChangeMode mode) {
+		Player[] players = getExpr().getArray(event);
+		if (players.length == 0)
+			return;
+		List<String> completions = new ArrayList<>();
+		if (delta != null && (mode == ChangeMode.ADD || mode == ChangeMode.REMOVE || mode == ChangeMode.SET)) {
+			completions = Arrays.stream(delta)
+				.filter(String.class::isInstance)
+				.map(String.class::cast)
+				.collect(Collectors.toList());
+		}
+		switch (mode) {
+			case DELETE, RESET, SET -> {
+				for (Player player : players)
+					player.setCustomChatCompletions(completions);
+			}
+            case ADD -> {
+				for (Player player : players)
+					player.addCustomChatCompletions(completions);
+			}
+            case REMOVE -> {
+				for (Player player : players)
+					player.removeCustomChatCompletions(completions);
+			}
+        }
+	}
+
+	@Override
+	public Class<? extends String> getReturnType() {
+		return String.class;
+	}
+
+	@Override
+	protected String getPropertyName() {
+		return "custom chat completions";
+	}
+
+}
diff --git a/src/main/java/ch/njol/skript/expressions/ExprPlayerProtocolVersion.java b/src/main/java/ch/njol/skript/expressions/ExprPlayerProtocolVersion.java
index e64946919d2..0e2561bb7b6 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprPlayerProtocolVersion.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprPlayerProtocolVersion.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import ch.njol.skript.Skript;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprPlayerViewDistance.java b/src/main/java/ch/njol/skript/expressions/ExprPlayerViewDistance.java
index b912ec9df27..03389e13c80 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprPlayerViewDistance.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprPlayerViewDistance.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import ch.njol.skript.Skript;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprPlayerWeather.java b/src/main/java/ch/njol/skript/expressions/ExprPlayerWeather.java
index 3febd9fe2b4..5cb17f56877 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprPlayerWeather.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprPlayerWeather.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import ch.njol.skript.classes.Changer.ChangeMode;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprPlayerlistHeaderFooter.java b/src/main/java/ch/njol/skript/expressions/ExprPlayerlistHeaderFooter.java
index 17902858012..03dc81ba00b 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprPlayerlistHeaderFooter.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprPlayerlistHeaderFooter.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import org.bukkit.entity.Player;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprPlugins.java b/src/main/java/ch/njol/skript/expressions/ExprPlugins.java
index b38e0dd7593..6c6b4924e0e 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprPlugins.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprPlugins.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import ch.njol.skript.Skript;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprPortal.java b/src/main/java/ch/njol/skript/expressions/ExprPortal.java
index cbc03323789..a3c3011febe 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprPortal.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprPortal.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import java.util.Iterator;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprPortalCooldown.java b/src/main/java/ch/njol/skript/expressions/ExprPortalCooldown.java
index 722d423ca13..09762d8f437 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprPortalCooldown.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprPortalCooldown.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import ch.njol.skript.classes.Changer.ChangeMode;
@@ -59,7 +41,7 @@ public class ExprPortalCooldown extends SimplePropertyExpression<Entity, Timespa
 	@Override
 	@Nullable
 	public Timespan convert(Entity entity) {
-		return Timespan.fromTicks(entity.getPortalCooldown());
+		return new Timespan(Timespan.TimePeriod.TICK, entity.getPortalCooldown());
 	}
 
 	@Override
@@ -80,7 +62,7 @@ public Class<?>[] acceptChange(ChangeMode mode) {
 	@Override
 	public void change(Event event, @Nullable Object[] delta, ChangeMode mode) {
 		Entity[] entities = getExpr().getArray(event);
-		int change = delta == null ? 0 : (int) ((Timespan) delta[0]).getTicks_i();
+		int change = delta == null ? 0 : (int) ((Timespan) delta[0]).getAs(Timespan.TimePeriod.TICK);
 		switch (mode) {
 			case REMOVE:
 				change = -change; // allow fall-through to avoid duplicate code
diff --git a/src/main/java/ch/njol/skript/expressions/ExprPotionEffect.java b/src/main/java/ch/njol/skript/expressions/ExprPotionEffect.java
index c19972fc7c5..e067d7d0c52 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprPotionEffect.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprPotionEffect.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import org.bukkit.event.Event;
@@ -85,7 +67,7 @@ protected PotionEffect[] get(final Event e) {
 		if (this.timespan != null) {
 			Timespan timespan = this.timespan.getSingle(e);
 			if (timespan != null)
-				ticks = (int) timespan.getTicks();
+				ticks = (int) timespan.getAs(Timespan.TimePeriod.TICK);
 		}
 		return new PotionEffect[]{new PotionEffect(potionEffectType, ticks, tier, ambient, particles)};
 	}
diff --git a/src/main/java/ch/njol/skript/expressions/ExprPotionEffectTier.java b/src/main/java/ch/njol/skript/expressions/ExprPotionEffectTier.java
index ceef6bb07bb..42158ac6bb2 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprPotionEffectTier.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprPotionEffectTier.java
@@ -1,21 +1,3 @@
-/**
- * This file is part of Skript.
- *
- * Skript is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Skript is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import ch.njol.skript.Skript;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprPotionEffects.java b/src/main/java/ch/njol/skript/expressions/ExprPotionEffects.java
index 671296ecb48..89b66f570fa 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprPotionEffects.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprPotionEffects.java
@@ -1,21 +1,3 @@
-/**
- * This file is part of Skript.
- *
- * Skript is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Skript is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import java.util.ArrayList;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprProjectileCriticalState.java b/src/main/java/ch/njol/skript/expressions/ExprProjectileCriticalState.java
index 93eab3cdb27..51f194c997b 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprProjectileCriticalState.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprProjectileCriticalState.java
@@ -1,22 +1,3 @@
-/**
- * This file is part of Skript.
- *
- * Skript is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Skript is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import org.bukkit.entity.AbstractArrow;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprProtocolVersion.java b/src/main/java/ch/njol/skript/expressions/ExprProtocolVersion.java
index 2bcd0130f67..f2fb55d0dd1 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprProtocolVersion.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprProtocolVersion.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import org.bukkit.event.Event;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprPushedBlocks.java b/src/main/java/ch/njol/skript/expressions/ExprPushedBlocks.java
index a26ee0e00db..bdb6bb5a6bb 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprPushedBlocks.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprPushedBlocks.java
@@ -1,23 +1,6 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
+import ch.njol.skript.lang.EventRestrictedSyntax;
 import ch.njol.util.coll.CollectionUtils;
 import org.bukkit.block.Block;
 import org.bukkit.event.Event;
@@ -41,7 +24,7 @@
 @Description("Blocks which are moved in a piston event. Cannot be used outside of piston events.")
 @Examples("the moved blocks")
 @Since("2.2-dev27")
-public class ExprPushedBlocks extends SimpleExpression<Block> {
+public class ExprPushedBlocks extends SimpleExpression<Block> implements EventRestrictedSyntax {
 	
 	static {
 		Skript.registerExpression(ExprPushedBlocks.class, Block.class, ExpressionType.SIMPLE, "[the] moved blocks");
@@ -49,14 +32,14 @@ public class ExprPushedBlocks extends SimpleExpression<Block> {
 	
 	@Override
 	public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelayed, ParseResult parseResult) {
-		if (!getParser().isCurrentEvent(BlockPistonExtendEvent.class, BlockPistonRetractEvent.class)) {
-			Skript.error("The moved blocks are only usable in piston extend and retract events", ErrorQuality.SEMANTIC_ERROR);
-			return false;
-		}
-		
 		return true;
 	}
-	
+
+	@Override
+	public Class<? extends Event>[] supportedEvents() {
+		return CollectionUtils.array(BlockPistonExtendEvent.class, BlockPistonRetractEvent.class);
+	}
+
 	@Override
 	@Nullable
 	protected Block[] get(Event e) {
diff --git a/src/main/java/ch/njol/skript/expressions/ExprQueue.java b/src/main/java/ch/njol/skript/expressions/ExprQueue.java
new file mode 100644
index 00000000000..d3edce4e7c9
--- /dev/null
+++ b/src/main/java/ch/njol/skript/expressions/ExprQueue.java
@@ -0,0 +1,95 @@
+package ch.njol.skript.expressions;
+
+import ch.njol.skript.Skript;
+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.SkriptParser.ParseResult;
+import ch.njol.skript.lang.util.SimpleExpression;
+import ch.njol.skript.registrations.Feature;
+import ch.njol.skript.util.LiteralUtils;
+import ch.njol.util.Kleenean;
+import org.bukkit.event.Event;
+import org.jetbrains.annotations.Nullable;
+import org.skriptlang.skript.lang.util.SkriptQueue;
+
+import java.util.Iterator;
+
+@Name("Queue (Experimental)")
+@Description("""
+	Requires the <code>using queues</code> experimental feature flag to be enabled.
+	
+	Creates a new queue.
+	A queue is a set of elements that can have things removed from the start and added to the end.
+	
+	Any value can be added to a queue. Adding a non-existent value (e.g. `{variable that isn't set}`) will have no effect.
+	This means that removing an element from the queue will always return a value <i>unless the queue is empty</i>.
+	
+	Requesting an element from a queue (e.g. `the 1st element of {queue}`) also removes it from the queue.""")
+@Examples({
+	"""
+		set {queue} to a new queue
+		add "hello" and "there" to {queue}
+		broadcast the first element of {queue} # hello
+		broadcast the first element of {queue} # there
+		# queue is now empty""",
+	"""
+		set {queue} to a new queue of "hello" and "there"
+		broadcast the last element of {queue} # removes 'there'
+		add "world" to {queue}
+		broadcast the first 2 elements of {queue} # removes 'hello', 'world'"""
+})
+@Since("2.10 (experimental)")
+public class ExprQueue extends SimpleExpression<SkriptQueue> {
+
+	static {
+		Skript.registerExpression(ExprQueue.class, SkriptQueue.class, ExpressionType.COMBINED,
+			"[a] [new] queue [(of|with) %-objects%]");
+	}
+
+	private @Nullable Expression<?> contents;
+
+	@Override
+	public boolean init(Expression<?>[] expressions, int pattern, Kleenean delayed, ParseResult result) {
+		if (!this.getParser().hasExperiment(Feature.QUEUES))
+			return false;
+		if (expressions[0] != null)
+			this.contents = LiteralUtils.defendExpression(expressions[0]);
+		return contents == null || LiteralUtils.canInitSafely(contents);
+	}
+
+	@Override
+	protected SkriptQueue @Nullable [] get(Event event) {
+		SkriptQueue queue = new SkriptQueue();
+		SkriptQueue[] result = new SkriptQueue[]{queue};
+		if (contents == null)
+			return result;
+		Iterator<?> iterator = contents.iterator(event);
+		if (iterator == null)
+			return result;
+		while (iterator.hasNext())
+			queue.add(iterator.next());
+		return result;
+	}
+
+	@Override
+	public boolean isSingle() {
+		return true;
+	}
+
+	@Override
+	public Class<? extends SkriptQueue> getReturnType() {
+		return SkriptQueue.class;
+	}
+
+	@Override
+	public String toString(@Nullable Event event, boolean debug) {
+		if (contents == null)
+			return "a queue";
+		return "a queue of " + contents.toString(event, debug);
+	}
+
+}
diff --git a/src/main/java/ch/njol/skript/expressions/ExprQueueStartEnd.java b/src/main/java/ch/njol/skript/expressions/ExprQueueStartEnd.java
new file mode 100644
index 00000000000..6c87efe8af7
--- /dev/null
+++ b/src/main/java/ch/njol/skript/expressions/ExprQueueStartEnd.java
@@ -0,0 +1,116 @@
+package ch.njol.skript.expressions;
+
+import ch.njol.skript.classes.Changer;
+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.expressions.base.SimplePropertyExpression;
+import ch.njol.skript.lang.Expression;
+import ch.njol.skript.lang.SkriptParser.ParseResult;
+import ch.njol.skript.registrations.Feature;
+import ch.njol.util.Kleenean;
+import org.bukkit.event.Event;
+import org.jetbrains.annotations.Nullable;
+import org.skriptlang.skript.lang.util.SkriptQueue;
+
+import java.util.Arrays;
+
+@Name("Queue Start/End (Experimental)")
+@Description("""
+	Requires the <code>using queues</code> experimental feature flag to be enabled.
+	
+	The first or last element in a queue. Asking for this does <b>not</b> remove the element from the queue.
+	
+	This is designed for use with the <code>add</code> changer: to add or remove elements from the start or the end of the queue.
+	""")
+@Examples("""
+	set {queue} to a new queue
+	add "hello" to {queue}
+	add "foo" to the start of {queue}
+	broadcast the first element of {queue} # foo
+	broadcast the first element of {queue} # hello
+	# queue is now empty""")
+@Since("2.10 (experimental)")
+public class ExprQueueStartEnd extends SimplePropertyExpression<SkriptQueue, Object> {
+
+	static {
+		register(ExprQueueStartEnd.class, Object.class, "(:start|end)", "queue");
+	}
+
+	private boolean start;
+
+	@Override
+	public boolean init(Expression<?>[] expressions, int pattern, Kleenean delayed, ParseResult result) {
+		if (!this.getParser().hasExperiment(Feature.QUEUES))
+			return false;
+		this.start = result.hasTag("start");
+		return super.init(expressions, pattern, delayed, result);
+	}
+
+	@Override
+	public @Nullable Object convert(SkriptQueue from) {
+		return start ? from.peekFirst() : from.peekLast();
+	}
+
+	@Override
+	public Class<?> @Nullable [] acceptChange(Changer.ChangeMode mode) {
+		return switch (mode) {
+			case ADD, REMOVE, SET -> new Class<?>[] {Object.class};
+			case DELETE -> new Class[0];
+			default -> null;
+		};
+	}
+
+	@Override
+	public void change(Event event, Object @Nullable [] delta, Changer.ChangeMode mode) {
+		SkriptQueue queue = this.getExpr().getSingle(event);
+		if (queue == null)
+			return;
+		if (start) {
+			switch (mode) {
+				case DELETE -> queue.removeFirst();
+				case ADD -> queue.addAll(0, Arrays.asList(delta));
+				case SET -> {
+					assert delta != null && delta.length > 0;
+					queue.removeFirst();
+					queue.addFirst(delta[0]);
+				}
+				case REMOVE -> {
+					for (Object object : delta)
+						queue.removeFirstOccurrence(object);
+				}
+			}
+		} else {
+			switch (mode) {
+				case DELETE -> queue.removeLast();
+				case ADD -> queue.addAll(Arrays.asList(delta));
+				case SET -> {
+					assert delta != null && delta.length > 0;
+					queue.removeLast();
+					queue.addLast(delta[0]);
+				}
+				case REMOVE -> {
+					for (Object object : delta)
+						queue.removeLastOccurrence(object);
+				}
+			}
+		}
+	}
+
+	@Override
+	public boolean isSingle() {
+		return true;
+	}
+
+	@Override
+	public Class<?> getReturnType() {
+		return Object.class;
+	}
+
+	@Override
+	protected String getPropertyName() {
+		return start ? "start" : "end";
+	}
+
+}
diff --git a/src/main/java/ch/njol/skript/expressions/ExprQuitReason.java b/src/main/java/ch/njol/skript/expressions/ExprQuitReason.java
index 7f702758aa0..878cf26bcf9 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprQuitReason.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprQuitReason.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import org.bukkit.event.player.PlayerQuitEvent.QuitReason;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprRandom.java b/src/main/java/ch/njol/skript/expressions/ExprRandom.java
index bce326b39e6..16db494d587 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprRandom.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprRandom.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import java.lang.reflect.Array;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprRandomCharacter.java b/src/main/java/ch/njol/skript/expressions/ExprRandomCharacter.java
index 7a808da2c4a..00d1ca08f87 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprRandomCharacter.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprRandomCharacter.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import ch.njol.skript.Skript;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprRandomNumber.java b/src/main/java/ch/njol/skript/expressions/ExprRandomNumber.java
index 9cf189d5643..cc7df7c99bb 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprRandomNumber.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprRandomNumber.java
@@ -1,26 +1,10 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
+import java.util.Arrays;
 import java.util.Random;
 import java.util.concurrent.ThreadLocalRandom;
 
+import ch.njol.skript.lang.Literal;
 import ch.njol.util.Math2;
 import org.bukkit.event.Event;
 import org.jetbrains.annotations.Nullable;
@@ -36,62 +20,90 @@
 import ch.njol.skript.lang.util.SimpleExpression;
 import ch.njol.util.Kleenean;
 
-@Name("Random Number")
+@Name("Random Numbers")
 @Description({
-	"A random number or integer between two given numbers. Use 'number' if you want any number with decimal parts, or use use 'integer' if you only want whole numbers.",
-	"Please note that the order of the numbers doesn't matter, i.e. <code>random number between 2 and 1</code> will work as well as <code>random number between 1 and 2</code>."
+		"A given amount of random numbers or integers between two given numbers. Use 'number' if you want any number with decimal parts, or use use 'integer' if you only want whole numbers.",
+		"Please note that the order of the numbers doesn't matter, i.e. <code>random number between 2 and 1</code> will work as well as <code>random number between 1 and 2</code>."
 })
 @Examples({
-	"set the player's health to a random number between 5 and 10",
-	"send \"You rolled a %random integer from 1 to 6%!\" to the player"
+		"set the player's health to a random number between 5 and 10",
+		"send \"You rolled a %random integer from 1 to 6%!\" to the player",
+		"set {_chances::*} to 5 random integers between 5 and 96",
+		"set {_decimals::*} to 3 random numbers between 2.7 and -1.5"
 })
-@Since("1.4")
+@Since("1.4, 2.10 (Multiple random numbers)")
 public class ExprRandomNumber extends SimpleExpression<Number> {
 
 	static {
 		Skript.registerExpression(ExprRandomNumber.class, Number.class, ExpressionType.COMBINED,
-				"[a] random (:integer|number) (from|between) %number% (to|and) %number%");
+				"[a|%-integer%] random (:integer|number)[s] (from|between) %number% (to|and) %number%");
 	}
 
-	private Expression<Number> from, to;
+	@Nullable
+	private Expression<Integer> amount;
+	private Expression<Number> lower, upper;
 	private boolean isInteger;
 
 	@Override
 	@SuppressWarnings("unchecked")
-	public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelayed, ParseResult parser) {
-		from = (Expression<Number>) exprs[0];
-		to = (Expression<Number>) exprs[1];
-		isInteger = parser.hasTag("integer");
+	public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelayed, ParseResult parseResult) {
+		amount = (Expression<Integer>) exprs[0];
+		lower = (Expression<Number>) exprs[1];
+		upper = (Expression<Number>) exprs[2];
+		isInteger = parseResult.hasTag("integer");
 		return true;
 	}
 
 	@Override
 	@Nullable
 	protected Number[] get(Event event) {
-		Number from = this.from.getSingle(event);
-		Number to = this.to.getSingle(event);
+		Number lowerNumber = lower.getSingle(event);
+		Number upperNumber = upper.getSingle(event);
+		if (upperNumber == null || lowerNumber == null || !Double.isFinite(lowerNumber.doubleValue()) || !Double.isFinite(upperNumber.doubleValue()))
+			return new Number[0];
 
-		if (to == null || from == null || !Double.isFinite(from.doubleValue()) || !Double.isFinite(to.doubleValue()))
+		Integer amount = this.amount == null ? Integer.valueOf(1) : this.amount.getSingle(event);
+		if (amount == null || amount <= 0)
 			return new Number[0];
 
+		double lower = Math.min(lowerNumber.doubleValue(), upperNumber.doubleValue());
+		double upper = Math.max(lowerNumber.doubleValue(), upperNumber.doubleValue());
 		Random random = ThreadLocalRandom.current();
-		double min = Math.min(from.doubleValue(), to.doubleValue());
-		double max = Math.max(from.doubleValue(), to.doubleValue());
-
 		if (isInteger) {
-			long inf = Math2.ceil(min);
-			long sup = Math2.floor(max);
-			if (max - min < 1 && inf - sup <= 1) {
-				if (sup == inf || min == inf)
-					return new Long[] {inf};
-				if (max == sup)
-					return new Long[] {sup};
+			Long[] longs = new Long[amount];
+			long floored_upper = Math2.floor(upper);
+			long ceiled_lower = Math2.ceil(lower);
+
+			// catch issues like `integer between 0.5 and 0.6`
+			if (upper - lower < 1 && ceiled_lower - floored_upper <= 1) {
+				if (floored_upper == ceiled_lower || lower == ceiled_lower) {
+					Arrays.fill(longs, ceiled_lower);
+					return longs;
+				}
+				if (upper == floored_upper) {
+					Arrays.fill(longs, floored_upper);
+					return longs;
+				}
 				return new Long[0];
 			}
-			return new Long[] {inf + Math2.mod(random.nextLong(), sup - inf + 1)};
+
+			for (int i = 0; i < amount; i++)
+				longs[i] = Math2.ceil(lower) + Math2.mod(random.nextLong(), floored_upper - ceiled_lower + 1);
+			return longs;
+		// non-integers
+		} else {
+			Double[] doubles = new Double[amount];
+			for (int i = 0; i < amount; i++)
+				doubles[i] = Math.min(lower + random.nextDouble() * (upper - lower), upper);
+			return doubles;
 		}
+	}
 
-		return new Double[] {min + random.nextDouble() * (max - min)};
+	@Override
+	public boolean isSingle() {
+		if (amount instanceof Literal)
+			return ((Literal<Integer>) amount).getSingle() == 1;
+		return amount == null;
 	}
 
 	@Override
@@ -101,12 +113,8 @@ public Class<? extends Number> getReturnType() {
 
 	@Override
 	public String toString(@Nullable Event event, boolean debug) {
-		return "a random " + (isInteger ? "integer" : "number") + " between " + from.toString(event, debug) + " and " + to.toString(event, debug);
-	}
-
-	@Override
-	public boolean isSingle() {
-		return true;
+		return (amount == null ? "a" : amount.toString(event, debug)) + " random " + (isInteger ? "integer" : "number") +
+				(amount == null ? "" : "s") + " between " + lower.toString(event, debug) + " and " + upper.toString(event, debug);
 	}
 
 }
diff --git a/src/main/java/ch/njol/skript/expressions/ExprRandomUUID.java b/src/main/java/ch/njol/skript/expressions/ExprRandomUUID.java
index 38433a81e8e..8a75a30e5ad 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprRandomUUID.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprRandomUUID.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import java.util.UUID;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprRawName.java b/src/main/java/ch/njol/skript/expressions/ExprRawName.java
index 232410445ea..fec8a2d54b6 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprRawName.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprRawName.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import java.util.Arrays;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprRawString.java b/src/main/java/ch/njol/skript/expressions/ExprRawString.java
index abd9f4ac097..13bdf4075b2 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprRawString.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprRawString.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import ch.njol.skript.Skript;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprReadiedArrow.java b/src/main/java/ch/njol/skript/expressions/ExprReadiedArrow.java
index 61c7386d587..47a122dee40 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprReadiedArrow.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprReadiedArrow.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import ch.njol.skript.Skript;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprRedstoneBlockPower.java b/src/main/java/ch/njol/skript/expressions/ExprRedstoneBlockPower.java
index b056f4c53b8..4e6538dbff1 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprRedstoneBlockPower.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprRedstoneBlockPower.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import org.bukkit.block.Block;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprRepeat.java b/src/main/java/ch/njol/skript/expressions/ExprRepeat.java
index 6ec93cd2671..65b3f974dbe 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprRepeat.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprRepeat.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import ch.njol.skript.Skript;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprResonatingTime.java b/src/main/java/ch/njol/skript/expressions/ExprResonatingTime.java
index 8abd40edb43..55a527ee286 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprResonatingTime.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprResonatingTime.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import ch.njol.skript.Skript;
@@ -51,7 +33,7 @@ public class ExprResonatingTime extends SimplePropertyExpression<Block, Timespan
 	public Timespan convert(Block from) {
 		if (from.getState() instanceof Bell) {
 			int resonatingTicks = ((Bell) from.getState(false)).getResonatingTicks();
-			return resonatingTicks == 0 ? null : Timespan.fromTicks(resonatingTicks);
+			return resonatingTicks == 0 ? null : new Timespan(Timespan.TimePeriod.TICK, resonatingTicks);
 		}
 		return null;
 	}
diff --git a/src/main/java/ch/njol/skript/expressions/ExprRespawnLocation.java b/src/main/java/ch/njol/skript/expressions/ExprRespawnLocation.java
index 1e31cc19afd..f90fc8e9ac9 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprRespawnLocation.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprRespawnLocation.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import org.bukkit.Location;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprResult.java b/src/main/java/ch/njol/skript/expressions/ExprResult.java
new file mode 100644
index 00000000000..e4e9b47452a
--- /dev/null
+++ b/src/main/java/ch/njol/skript/expressions/ExprResult.java
@@ -0,0 +1,116 @@
+package ch.njol.skript.expressions;
+
+import ch.njol.skript.Skript;
+import ch.njol.skript.classes.Changer.ChangeMode;
+import ch.njol.skript.doc.*;
+import ch.njol.skript.expressions.base.PropertyExpression;
+import ch.njol.skript.lang.Expression;
+import ch.njol.skript.lang.ExpressionList;
+import ch.njol.skript.lang.ExpressionType;
+import ch.njol.skript.lang.SkriptParser.ParseResult;
+import ch.njol.skript.lang.function.DynamicFunctionReference;
+import ch.njol.skript.registrations.Feature;
+import ch.njol.skript.util.LiteralUtils;
+import ch.njol.util.Kleenean;
+import org.bukkit.event.Event;
+import org.jetbrains.annotations.Nullable;
+import org.skriptlang.skript.util.Executable;
+
+@Name("Result (Experimental)")
+@Description({
+	"Runs something (like a function) and returns its result.",
+	"If the thing is expected to return multiple values, use 'results' instead of 'result'."
+})
+@Examples({
+	"set {_function} to the function named \"myFunction\"",
+	"set {_result} to the result of {_function}",
+	"set {_list::*} to the results of {_function}",
+	"set {_result} to the result of {_function} with arguments 13 and true"
+})
+@Since("2.10")
+@Keywords({"run", "result", "execute", "function", "reflection"})
+public class ExprResult extends PropertyExpression<Executable<Event, Object>, Object> {
+
+	static {
+		Skript.registerExpression(ExprResult.class, Object.class, ExpressionType.COMBINED,
+			"[the] result[plural:s] of [running|executing] %executable% [arguments:with arg[ument]s %-objects%]");
+	}
+
+	private Expression<?> arguments;
+	private boolean hasArguments, isPlural;
+	private DynamicFunctionReference.Input input;
+
+	@Override
+	public boolean init(Expression<?>[] expressions, int matchedPattern, Kleenean isDelayed,
+						ParseResult result) {
+		if (!this.getParser().hasExperiment(Feature.SCRIPT_REFLECTION))
+			return false;
+		//noinspection unchecked
+		this.setExpr((Expression<? extends Executable<Event, Object>>) expressions[0]);
+		this.hasArguments = result.hasTag("arguments");
+		this.isPlural = result.hasTag("plural");
+		if (hasArguments) {
+			this.arguments = LiteralUtils.defendExpression(expressions[1]);
+			Expression<?>[] arguments;
+			if (this.arguments instanceof ExpressionList<?> list) {
+				arguments = list.getExpressions();
+			} else {
+				arguments = new Expression[] {this.arguments};
+			}
+			this.input = new DynamicFunctionReference.Input(arguments);
+			return LiteralUtils.canInitSafely(this.arguments);
+		} else {
+			this.input = new DynamicFunctionReference.Input();
+		}
+		return true;
+	}
+
+	@Override
+	protected Object[] get(Event event, Executable<Event, Object>[] source) {
+		for (Executable<Event, Object> task : source) {
+			Object[] arguments;
+			//noinspection rawtypes
+			if (task instanceof DynamicFunctionReference reference) {
+				Expression<?> validated = reference.validate(input);
+				if (validated == null)
+					return new Object[0];
+				arguments = validated.getArray(event);
+			} else if (hasArguments) {
+				arguments = this.arguments.getArray(event);
+			} else {
+				arguments = new Object[0];
+			}
+			Object execute = task.execute(event, arguments);
+			if (execute instanceof Object[] results)
+				return results;
+			return new Object[] {execute};
+		}
+		return new Object[0];
+	}
+
+	@Override
+	public Class<?> @Nullable [] acceptChange(ChangeMode mode) {
+		return null;
+	}
+
+	@Override
+	public Class<Object> getReturnType() {
+		return Object.class;
+	}
+
+	@Override
+	public boolean isSingle() {
+		return !isPlural;
+	}
+
+	@Override
+	public String toString(@Nullable Event event, final boolean debug) {
+		String text = "the result" + (isPlural ? "s" : "") + " of " + getExpr().toString(event, debug);
+		if (hasArguments)
+			text += " with arguments " + arguments.toString(event, debug);
+		return text;
+	}
+
+
+
+}
diff --git a/src/main/java/ch/njol/skript/expressions/ExprReversedList.java b/src/main/java/ch/njol/skript/expressions/ExprReversedList.java
index 2a99e1eecfe..b1fd4639cb1 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprReversedList.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprReversedList.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import ch.njol.skript.Skript;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprRingingTime.java b/src/main/java/ch/njol/skript/expressions/ExprRingingTime.java
index 2501cf30ca5..7fe43c41476 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprRingingTime.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprRingingTime.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import ch.njol.skript.Skript;
@@ -49,7 +31,7 @@ public class ExprRingingTime extends SimplePropertyExpression<Block, Timespan> {
 	public @Nullable Timespan convert(Block from) {
 		if (from.getState() instanceof Bell) {
 			int shakingTicks = ((Bell) from.getState(false)).getShakingTicks();
-			return shakingTicks == 0 ? null : Timespan.fromTicks(shakingTicks);
+			return shakingTicks == 0 ? null : new Timespan(Timespan.TimePeriod.TICK, shakingTicks);
 		}
 		return null;
 	}
diff --git a/src/main/java/ch/njol/skript/expressions/ExprRound.java b/src/main/java/ch/njol/skript/expressions/ExprRound.java
index b7cefbf5c04..5907bd47381 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprRound.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprRound.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import org.bukkit.event.Event;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprSaturation.java b/src/main/java/ch/njol/skript/expressions/ExprSaturation.java
index c9486c567fb..c5eb5a9a1f4 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprSaturation.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprSaturation.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import ch.njol.skript.classes.Changer;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprScoreboardTags.java b/src/main/java/ch/njol/skript/expressions/ExprScoreboardTags.java
index 80490af39e3..37782e9a0b5 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprScoreboardTags.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprScoreboardTags.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import java.util.Set;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprScript.java b/src/main/java/ch/njol/skript/expressions/ExprScript.java
index 7c14d7146eb..c217a5e5847 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprScript.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprScript.java
@@ -1,93 +1,144 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
+import ch.njol.skript.ScriptLoader;
 import ch.njol.skript.Skript;
 import ch.njol.skript.doc.Description;
-import ch.njol.skript.doc.Events;
 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.parser.ParserInstance;
+import org.jetbrains.annotations.Nullable;
 import org.skriptlang.skript.lang.script.Script;
 import ch.njol.skript.lang.SkriptParser.ParseResult;
 import ch.njol.skript.lang.util.SimpleExpression;
 import ch.njol.util.Kleenean;
 import org.bukkit.event.Event;
-import org.jetbrains.annotations.Nullable;
 
-@Name("Script Name")
-@Description("Holds the current script's name (the file name without '.sk').")
+import java.io.File;
+import java.io.FileFilter;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+
+@Name("Script")
+@Description({"The current script, or a script from its (file) name.",
+	"If the script is enabled or disabled (or reloaded) this reference will become invalid.",
+	"Therefore, it is recommended to obtain a script reference <em>when needed</em>."})
 @Examples({
+	"on script load:",
+	"\tbroadcast \"Loaded %the current script%\"",
 	"on script load:",
 	"\tset {running::%script%} to true",
 	"on script unload:",
-	"\tset {running::%script%} to false"
+	"\tset {running::%script%} to false",
+	"set {script} to the script named \"weather.sk\"",
+	"loop the scripts in directory \"quests/\":",
+	"\tenable loop-value"
 })
 @Since("2.0")
-@Events("Script Load/Unload")
-public class ExprScript extends SimpleExpression<String> {
-	
+public class ExprScript extends SimpleExpression<Script> {
+
 	static {
-		Skript.registerExpression(ExprScript.class, String.class, ExpressionType.SIMPLE,
-			"[the] script[['s] name]",
-			"name of [the] script"
+		Skript.registerExpression(ExprScript.class, Script.class, ExpressionType.SIMPLE,
+			"[the] [current] script",
+			"[the] script[s] [named] %strings%",
+			"[the] scripts in [directory|folder] %string%"
 		);
 	}
-	
-	@SuppressWarnings("NotNullFieldNotInitialized")
-	private String name;
-	
+
+	private @Nullable Script script;
+	private @Nullable Expression<String> name;
+	private boolean isDirectory;
+
 	@Override
 	public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelayed, ParseResult parseResult) {
-		ParserInstance parser = getParser();
-		if (!parser.isActive()) {
-			Skript.error("You can't use the script expression outside of scripts!");
-			return false;
+		this.isDirectory = matchedPattern == 2;
+		if (matchedPattern == 0) {
+			ParserInstance parser = this.getParser();
+			if (!parser.isActive()) {
+				Skript.error("'the current script' can only be used in a script.");
+				return false;
+			}
+			this.script = parser.getCurrentScript();
+		} else {
+			//noinspection unchecked
+			this.name = (Expression<String>) exprs[0];
 		}
-		String name = parser.getCurrentScript().getConfig().getFileName();
-		if (name.contains("."))
-			name = name.substring(0, name.lastIndexOf('.'));
-		this.name = name;
 		return true;
 	}
-	
+
 	@Override
-	protected String[] get(Event event) {
-		return new String[]{name};
+	protected Script[] get(Event event) {
+		if (script != null)
+			return new Script[]{script};
+		assert name != null;
+		if (isDirectory) {
+			@Nullable String string = name.getSingle(event);
+			if (string == null)
+				return new Script[0];
+			File folder = new File(Skript.getInstance().getScriptsFolder(), string);
+			List<Script> scripts = new ArrayList<>();
+			if (!folder.isDirectory())
+				return new Script[0];
+			this.getScripts(folder, scripts);
+			return scripts.toArray(new Script[0]);
+		}
+		return name.stream(event)
+				.map(ScriptLoader::getScriptFromName)
+				.map(ExprScript::getHandle)
+				.filter(Objects::nonNull)
+				.toArray(Script[]::new);
 	}
-	
+
+	private void getScripts(File folder, List<Script> scripts) {
+		File[] files = folder.listFiles();
+		if (files == null)
+			return;
+		FileFilter loaded = ScriptLoader.getLoadedScriptsFilter();
+		FileFilter disabled = ScriptLoader.getDisabledScriptsFilter();
+		FileFilter filter = f -> loaded.accept(f) || disabled.accept(f);
+		for (File file : files) {
+			if (file.isDirectory()) {
+				this.getScripts(file, scripts);
+			} else if (filter.accept(file)) {
+				@Nullable Script handle = ExprScript.getHandle(file);
+				if (handle != null)
+					scripts.add(handle);
+			}
+		}
+	}
+
 	@Override
 	public boolean isSingle() {
-		return true;
+		return script != null || name != null && name.isSingle() && !isDirectory;
 	}
-	
+
 	@Override
-	public Class<? extends String> getReturnType() {
-		return String.class;
+	public Class<? extends Script> getReturnType() {
+		return Script.class;
 	}
-	
+
 	@Override
 	public String toString(@Nullable Event event, boolean debug) {
-		return "the script's name";
+		if (script != null)
+			return "the current script";
+		assert name != null;
+		if (isDirectory)
+			return "the scripts in directory " + name.toString(event, debug);
+		if (name.isSingle())
+			return "the script named " + name.toString(event, debug);
+		return "the scripts named " + name.toString(event, debug);
+	}
+
+	static @Nullable Script getHandle(@Nullable File file) {
+		if (file == null || file.isDirectory())
+			return null;
+		Script script = ScriptLoader.getScript(file);
+		if (script != null)
+			return script;
+		return ScriptLoader.createDummyScript(file.getName(), file);
 	}
-	
+
 }
diff --git a/src/main/java/ch/njol/skript/expressions/ExprScripts.java b/src/main/java/ch/njol/skript/expressions/ExprScripts.java
index 862948da7da..e553219b5ff 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprScripts.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprScripts.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import ch.njol.skript.ScriptLoader;
@@ -26,24 +8,20 @@
 import ch.njol.skript.doc.Since;
 import ch.njol.skript.lang.Expression;
 import ch.njol.skript.lang.ExpressionType;
-import org.skriptlang.skript.lang.script.Script;
 import ch.njol.skript.lang.SkriptParser.ParseResult;
 import ch.njol.skript.lang.util.SimpleExpression;
+import ch.njol.skript.registrations.Feature;
 import ch.njol.util.Kleenean;
+import org.bukkit.event.Event;
+import org.jetbrains.annotations.Nullable;
+import org.skriptlang.skript.lang.script.Script;
 
-import java.io.File;
 import java.nio.file.Path;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
-import java.util.regex.Pattern;
-import java.util.stream.Collectors;
+import java.util.Objects;
 
-import org.bukkit.event.Event;
-
-import org.jetbrains.annotations.Nullable;
-
-@Name("All Scripts")
+@Name("All Scripts (Experimental)")
 @Description("Returns all of the scripts, or just the enabled or disabled ones.")
 @Examples({
 	"command /scripts:",
@@ -52,54 +30,39 @@
 	"\t\tsend \"Loaded Scripts: %enabled scripts%\" to player",
 	"\t\tsend \"Unloaded Scripts: %disabled scripts%\" to player"
 })
-@Since("2.5")
-public class ExprScripts extends SimpleExpression<String> {
+@Since("2.10")
+public class ExprScripts extends SimpleExpression<Script> {
 
 	static {
-		Skript.registerExpression(ExprScripts.class, String.class, ExpressionType.SIMPLE,
-				"[all [of the]|the] scripts [1:without ([subdirectory] paths|parents)]",
-				"[all [of the]|the] (enabled|loaded) scripts [1:without ([subdirectory] paths|parents)]",
-				"[all [of the]|the] (disabled|unloaded) scripts [1:without ([subdirectory] paths|parents)]");
+		Skript.registerExpression(ExprScripts.class, Script.class, ExpressionType.SIMPLE,
+				"[all [[of] the]|the] scripts",
+				"[all [[of] the]|the] (enabled|loaded) scripts",
+				"[all [[of] the]|the] (disabled|unloaded) scripts");
 	}
 
-	private static final Path SCRIPTS_PATH = Skript.getInstance().getScriptsFolder().getAbsoluteFile().toPath();
-
-	private boolean includeEnabled;
-	private boolean includeDisabled;
-	private boolean noPaths;
+	private int pattern;
 
 	@Override
 	public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelayed, ParseResult parseResult) {
-		includeEnabled = matchedPattern <= 1;
-		includeDisabled = matchedPattern != 1;
-		noPaths = parseResult.mark == 1;
+		if (!this.getParser().hasExperiment(Feature.SCRIPT_REFLECTION))
+			return false;
+		this.pattern = matchedPattern;
 		return true;
 	}
 
 	@Override
-	protected String[] get(Event event) {
-		List<Path> scripts = new ArrayList<>();
-		if (includeEnabled) {
-			for (Script script : ScriptLoader.getLoadedScripts())
-				scripts.add(script.getConfig().getPath());
-		}
-		if (includeDisabled)
+	protected Script[] get(Event event) {
+		List<Script> scripts = new ArrayList<>();
+		if (pattern <= 1)
+			scripts.addAll(ScriptLoader.getLoadedScripts());
+		if (pattern != 1) {
 			scripts.addAll(ScriptLoader.getDisabledScripts()
 					.stream()
-					.map(File::toPath)
-					.collect(Collectors.toList()));
-		return formatPaths(scripts);
-	}
-
-	@SuppressWarnings("null")
-	private String[] formatPaths(List<Path> paths) {
-		return paths.stream()
-			.map(path -> {
-				if (noPaths)
-					return path.getFileName();
-				return SCRIPTS_PATH.relativize(path.toAbsolutePath()).toString();
-			})
-			.toArray(String[]::new);
+					.map(ExprScript::getHandle)
+					.filter(Objects::nonNull)
+					.toList());
+		}
+		return scripts.toArray(new Script[0]);
 	}
 
 	@Override
@@ -108,13 +71,17 @@ public boolean isSingle() {
 	}
 
 	@Override
-	public Class<? extends String> getReturnType() {
-		return String.class;
+	public Class<? extends Script> getReturnType() {
+		return Script.class;
 	}
 
 	@Override
-	public String toString(@Nullable Event e, boolean debug) {
-		return "scripts";
+	public String toString(@Nullable Event event, boolean debug) {
+		if (pattern == 1)
+		    return "all enabled scripts";
+		else if (pattern == 2)
+			return "all disabled scripts";
+		return "all scripts";
 	}
 
 }
diff --git a/src/main/java/ch/njol/skript/expressions/ExprScriptsOld.java b/src/main/java/ch/njol/skript/expressions/ExprScriptsOld.java
new file mode 100644
index 00000000000..6e730746e80
--- /dev/null
+++ b/src/main/java/ch/njol/skript/expressions/ExprScriptsOld.java
@@ -0,0 +1,111 @@
+package ch.njol.skript.expressions;
+
+import ch.njol.skript.ScriptLoader;
+import ch.njol.skript.Skript;
+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.SkriptParser.ParseResult;
+import ch.njol.skript.lang.util.SimpleExpression;
+import ch.njol.skript.registrations.Feature;
+import ch.njol.util.Kleenean;
+import org.bukkit.event.Event;
+import org.jetbrains.annotations.Nullable;
+import org.skriptlang.skript.lang.script.Script;
+
+import java.io.File;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
+@Name("All Scripts")
+@Description("Returns all of the scripts, or just the enabled or disabled ones.")
+@Examples({
+	"command /scripts:",
+	"\ttrigger:",
+	"\t\tsend \"All Scripts: %scripts%\" to player",
+	"\t\tsend \"Loaded Scripts: %enabled scripts%\" to player",
+	"\t\tsend \"Unloaded Scripts: %disabled scripts%\" to player"
+})
+@Since("2.5")
+public class ExprScriptsOld extends SimpleExpression<String> {
+
+	static {
+		Skript.registerExpression(ExprScriptsOld.class, String.class, ExpressionType.SIMPLE,
+				"[all [of the]|the] scripts [1:without ([subdirectory] paths|parents)]",
+				"[all [of the]|the] (enabled|loaded) scripts [1:without ([subdirectory] paths|parents)]",
+				"[all [of the]|the] (disabled|unloaded) scripts [1:without ([subdirectory] paths|parents)]");
+	}
+
+	public static final Path SCRIPTS_PATH = Skript.getInstance().getScriptsFolder().getAbsoluteFile().toPath();
+
+	private boolean includeEnabled;
+	private boolean includeDisabled;
+	private boolean noPaths;
+
+	@Override
+	public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelayed, ParseResult parseResult) {
+		if (this.getParser().hasExperiment(Feature.SCRIPT_REFLECTION))
+			return false;
+		includeEnabled = matchedPattern <= 1;
+		includeDisabled = matchedPattern != 1;
+		noPaths = parseResult.mark == 1;
+		return true;
+	}
+
+	@Override
+	protected String[] get(Event event) {
+		List<Path> scripts = new ArrayList<>();
+		if (includeEnabled) {
+			for (Script script : ScriptLoader.getLoadedScripts())
+				scripts.add(script.getConfig().getPath());
+		}
+		if (includeDisabled)
+			scripts.addAll(ScriptLoader.getDisabledScripts()
+					.stream()
+					.map(File::toPath)
+					.collect(Collectors.toList()));
+		return formatPaths(scripts);
+	}
+
+	@SuppressWarnings("null")
+	private String[] formatPaths(List<Path> paths) {
+		return paths.stream()
+			.map(path -> {
+				if (noPaths)
+					return path.getFileName().toString();
+				return SCRIPTS_PATH.relativize(path.toAbsolutePath()).toString();
+			})
+			.toArray(String[]::new);
+	}
+
+	@Override
+	public boolean isSingle() {
+		return false;
+	}
+
+	@Override
+	public Class<? extends String> getReturnType() {
+		return String.class;
+	}
+
+	@Override
+	public String toString(@Nullable Event event, boolean debug) {
+		String text;
+		if (!includeEnabled) {
+			text = "all disabled scripts";
+		} else if (!includeDisabled) {
+			text = "all enabled scripts";
+		} else {
+			text = "all scripts";
+		}
+		if (noPaths)
+			text = text + " without paths";
+		return text;
+	}
+
+}
diff --git a/src/main/java/ch/njol/skript/expressions/ExprSeaLevel.java b/src/main/java/ch/njol/skript/expressions/ExprSeaLevel.java
index 216c6cd81a1..87a94b98c18 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprSeaLevel.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprSeaLevel.java
@@ -1,22 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import org.bukkit.World;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprSeaPickles.java b/src/main/java/ch/njol/skript/expressions/ExprSeaPickles.java
index a58e6cbbca3..414fa84878b 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprSeaPickles.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprSeaPickles.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import ch.njol.skript.classes.Changer.ChangeMode;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprSeed.java b/src/main/java/ch/njol/skript/expressions/ExprSeed.java
index cb260863fe8..30a84d9a610 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprSeed.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprSeed.java
@@ -1,27 +1,5 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
-import org.bukkit.World;
-import org.bukkit.event.Event;
-import org.jetbrains.annotations.Nullable;
-
 import ch.njol.skript.Skript;
 import ch.njol.skript.doc.Description;
 import ch.njol.skript.doc.Examples;
@@ -32,8 +10,11 @@
 import ch.njol.skript.lang.ExpressionType;
 import ch.njol.skript.lang.SkriptParser.ParseResult;
 import ch.njol.skript.registrations.Classes;
-import ch.njol.skript.util.Getter;
 import ch.njol.util.Kleenean;
+import org.bukkit.World;
+import org.bukkit.event.Event;
+import org.bukkit.generator.WorldInfo;
+import org.jetbrains.annotations.Nullable;
 
 @Name("World Seed")
 @Description("The seed of given world. Note that it will be returned as Minecraft internally treats seeds, not as you specified it in world configuration.")
@@ -54,12 +35,7 @@ public boolean init(final Expression<?>[] exprs, final int matchedPattern, final
 	
 	@Override
 	protected Long[] get(final Event event, final World[] source) {
-		return get(source, new Getter<Long, World>() {
-			@Override
-			public Long get(final World world) {
-				return world.getSeed();
-			}
-		});
+		return get(source, WorldInfo::getSeed);
 	}
 	
 	@Override
diff --git a/src/main/java/ch/njol/skript/expressions/ExprSentCommands.java b/src/main/java/ch/njol/skript/expressions/ExprSentCommands.java
index b4ece43c86c..3e6c3f4cebd 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprSentCommands.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprSentCommands.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import ch.njol.skript.Skript;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprServerIcon.java b/src/main/java/ch/njol/skript/expressions/ExprServerIcon.java
index d51a3f8c439..a6baaecacc5 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprServerIcon.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprServerIcon.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import org.bukkit.Bukkit;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprSets.java b/src/main/java/ch/njol/skript/expressions/ExprSets.java
index a49b589b875..29e5a617f5a 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprSets.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprSets.java
@@ -1,24 +1,8 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
+import java.lang.reflect.Array;
 import java.util.Iterator;
+import java.util.List;
 import java.util.function.Supplier;
 
 import org.bukkit.event.Event;
@@ -79,8 +63,8 @@ public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelaye
 
 	@Override
 	protected Object[] get(Event event) {
-		Iterator<?> iterator = supplier.get();
-		return Lists.newArrayList(iterator).toArray(new Object[0]);
+		List<?> objects = Lists.newArrayList(supplier.get());
+		return objects.toArray((Object[]) Array.newInstance(classInfo.getC(), objects.size()));
 	}
 
 	@Override
diff --git a/src/main/java/ch/njol/skript/expressions/ExprShooter.java b/src/main/java/ch/njol/skript/expressions/ExprShooter.java
index 98111d7b7f8..48da301d59a 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprShooter.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprShooter.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import ch.njol.skript.Skript;
@@ -28,6 +10,7 @@
 import ch.njol.skript.lang.Expression;
 import ch.njol.skript.lang.ExpressionType;
 import ch.njol.skript.lang.SkriptParser.ParseResult;
+import ch.njol.skript.sections.EffSecShoot;
 import ch.njol.util.Kleenean;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Projectile;
@@ -46,42 +29,46 @@ public class ExprShooter extends PropertyExpression<Projectile, LivingEntity> {
 	static {
 		Skript.registerExpression(ExprShooter.class, LivingEntity.class, ExpressionType.SIMPLE, "[the] shooter [of %projectile%]");
 	}
-	
-	@SuppressWarnings({"unchecked", "null"})
+
 	@Override
-	public boolean init(final Expression<?>[] exprs, final int matchedPattern, final Kleenean isDelayed, final ParseResult parseResult) {
+	public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelayed, ParseResult parseResult) {
+		//noinspection unchecked
 		setExpr((Expression<? extends Projectile>) exprs[0]);
 		return true;
 	}
 	
 	@Override
-	protected LivingEntity[] get(final Event e, final Projectile[] source) {
+	protected LivingEntity @Nullable [] get(Event event, Projectile[] source) {
+		if (event instanceof EffSecShoot.ShootEvent shootEvent && getExpr().isDefault() && !(shootEvent.getProjectile() instanceof Projectile)) {
+			return new LivingEntity[]{shootEvent.getShooter()};
+		}
+
 		return get(source, projectile -> {
 			Object shooter = projectile != null ? projectile.getShooter() : null;
-			if (shooter instanceof LivingEntity)
-				return (LivingEntity) shooter;
+			if (shooter instanceof LivingEntity livingShooter)
+				return livingShooter;
 			return null;
 		});
 	}
 	
 	@Override
-	@Nullable
-	public Class<?>[] acceptChange(final ChangeMode mode) {
+	public @Nullable Class<?>[] acceptChange(ChangeMode mode) {
 		if (mode == ChangeMode.SET)
 			return new Class[] {LivingEntity.class};
 		return super.acceptChange(mode);
 	}
 	
 	@Override
-	public void change(final Event e, final @Nullable Object[] delta, final ChangeMode mode) {
+	public void change(Event event, Object @Nullable [] delta, ChangeMode mode) {
 		if (mode == ChangeMode.SET) {
 			assert delta != null;
-			for (final Projectile p : getExpr().getArray(e)) {
-				assert p != null : getExpr();
-				p.setShooter((ProjectileSource) delta[0]);
+			ProjectileSource source = (ProjectileSource) delta[0];
+			for (Projectile projectile : getExpr().getArray(event)) {
+				assert projectile != null : getExpr();
+				projectile.setShooter(source);
 			}
 		} else {
-			super.change(e, delta, mode);
+			super.change(event, delta, mode);
 		}
 	}
 	
@@ -91,8 +78,8 @@ public Class<LivingEntity> getReturnType() {
 	}
 	
 	@Override
-	public String toString(final @Nullable Event e, final boolean debug) {
-		return "the shooter" + (getExpr().isDefault() ? "" : " of " + getExpr().toString(e, debug));
+	public String toString(@Nullable Event event, boolean debug) {
+		return "the shooter" + (getExpr().isDefault() ? "" : " of " + getExpr().toString(event, debug));
 	}
 	
 }
diff --git a/src/main/java/ch/njol/skript/expressions/ExprShuffledList.java b/src/main/java/ch/njol/skript/expressions/ExprShuffledList.java
index 5329dcb7210..342640bbb30 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprShuffledList.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprShuffledList.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import ch.njol.skript.Skript;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprSignText.java b/src/main/java/ch/njol/skript/expressions/ExprSignText.java
index b35fc88b7c5..eb5403025a4 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprSignText.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprSignText.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import ch.njol.skript.bukkitutil.ItemUtils;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprSkullOwner.java b/src/main/java/ch/njol/skript/expressions/ExprSkullOwner.java
index bc102126022..9e0e7673758 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprSkullOwner.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprSkullOwner.java
@@ -1,5 +1,6 @@
 package ch.njol.skript.expressions;
 
+import ch.njol.skript.aliases.ItemType;
 import ch.njol.skript.bukkitutil.ItemUtils;
 import ch.njol.skript.classes.Changer.ChangeMode;
 import ch.njol.skript.doc.Description;
@@ -7,39 +8,48 @@
 import ch.njol.skript.doc.Name;
 import ch.njol.skript.doc.Since;
 import ch.njol.skript.expressions.base.SimplePropertyExpression;
+import ch.njol.skript.util.slot.Slot;
 import ch.njol.util.coll.CollectionUtils;
 import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.block.Block;
-import org.bukkit.block.BlockState;
 import org.bukkit.block.Skull;
 import org.bukkit.event.Event;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.meta.SkullMeta;
+import org.bukkit.profile.PlayerProfile;
 import org.jetbrains.annotations.Nullable;
 
+import java.util.function.Consumer;
+
 @Name("Skull Owner")
 @Description("The skull owner of a player skull.")
 @Examples({
 	"set {_owner} to the skull owner of event-block",
-	"set skull owner of {_block} to \"Njol\" parsed as offlineplayer"
+	"set skull owner of {_block} to \"Njol\" parsed as offlineplayer",
+	"set head owner of player's tool to {_player}"
 })
-@Since("2.9.0")
-public class ExprSkullOwner extends SimplePropertyExpression<Block, OfflinePlayer> {
+@Since("2.9.0, 2.10 (of items)")
+public class ExprSkullOwner extends SimplePropertyExpression<Object, OfflinePlayer> {
 
 	static {
-		register(ExprSkullOwner.class, OfflinePlayer.class, "(head|skull) owner", "blocks");
+		register(ExprSkullOwner.class, OfflinePlayer.class, "(head|skull) owner", "slots/itemtypes/itemstacks/blocks");
 	}
 
 	@Override
-	public @Nullable OfflinePlayer convert(Block block) {
-		BlockState state = block.getState();
-		if (!(state instanceof Skull))
-			return null;
-		return ((Skull) state).getOwningPlayer();
+	public @Nullable OfflinePlayer convert(Object object) {
+		if (object instanceof Block block && block.getState() instanceof Skull skull) {
+			return skull.getOwningPlayer();
+		} else {
+			ItemStack skullItem = ItemUtils.asItemStack(object);
+			if (skullItem == null || !(skullItem.getItemMeta() instanceof SkullMeta skullMeta))
+				return null;
+			return skullMeta.getOwningPlayer();
+		}
 	}
 
 	@Override
-	@Nullable
-	public Class<?>[] acceptChange(ChangeMode mode) {
+	public Class<?> @Nullable [] acceptChange(ChangeMode mode) {
 		if (mode == ChangeMode.SET)
 			return CollectionUtils.array(OfflinePlayer.class);
 		return null;
@@ -48,25 +58,55 @@ public Class<?>[] acceptChange(ChangeMode mode) {
 	@Override
 	public void change(Event event, Object @Nullable [] delta, ChangeMode mode) {
 		OfflinePlayer offlinePlayer = (OfflinePlayer) delta[0];
-		for (Block block : getExpr().getArray(event)) {
-			BlockState state = block.getState();
-			if (!(state instanceof Skull))
-				continue;
-
-			Skull skull = (Skull) state;
-			if (offlinePlayer.getName() != null) {
-				skull.setOwningPlayer(offlinePlayer);
-			} else if (ItemUtils.CAN_CREATE_PLAYER_PROFILE) {
-				//noinspection deprecation
-				skull.setOwnerProfile(Bukkit.createPlayerProfile(offlinePlayer.getUniqueId(), ""));
+		Consumer<Skull> blockChanger = getBlockChanger(offlinePlayer);
+		Consumer<SkullMeta> metaChanger = getMetaChanger(offlinePlayer);
+		for (Object object : getExpr().getArray(event)) {
+			if (object instanceof Block block && block.getState() instanceof Skull skull) {
+				blockChanger.accept(skull);
+				skull.update(true, false);
 			} else {
-				//noinspection deprecation
-				skull.setOwner("");
+				ItemStack skullItem = ItemUtils.asItemStack(object);
+				if (skullItem == null || !(skullItem.getItemMeta() instanceof SkullMeta skullMeta))
+					continue;
+				metaChanger.accept(skullMeta);
+				if (object instanceof Slot slot) {
+					skullItem.setItemMeta(skullMeta);
+					slot.setItem(skullItem);
+				} else if (object instanceof ItemType itemType) {
+					itemType.setItemMeta(skullMeta);
+				} else if (object instanceof ItemStack itemStack) {
+					itemStack.setItemMeta(skullMeta);
+				}
 			}
-			skull.update(true, false);
 		}
 	}
 
+	private Consumer<Skull> getBlockChanger(OfflinePlayer offlinePlayer) {
+		if (offlinePlayer.getName() != null) {
+			return skull -> skull.setOwningPlayer(offlinePlayer);
+		} else if (ItemUtils.CAN_CREATE_PLAYER_PROFILE) {
+			//noinspection deprecation
+			PlayerProfile profile = Bukkit.createPlayerProfile(offlinePlayer.getUniqueId(), "");
+			//noinspection deprecation
+			return skull -> skull.setOwnerProfile(profile);
+		}
+		//noinspection deprecation
+		return skull -> skull.setOwner("");
+	}
+
+	private Consumer<SkullMeta> getMetaChanger(OfflinePlayer offlinePlayer) {
+		if (offlinePlayer.getName() != null) {
+			return skullMeta -> skullMeta.setOwningPlayer(offlinePlayer);
+		} else if (ItemUtils.CAN_CREATE_PLAYER_PROFILE) {
+			//noinspection deprecation
+			PlayerProfile profile = Bukkit.createPlayerProfile(offlinePlayer.getUniqueId(), "");
+			//noinspection deprecation
+			return skullMeta -> skullMeta.setOwnerProfile(profile);
+		}
+		//noinspection deprecation
+		return skullMeta -> skullMeta.setOwner("");
+	}
+
 	@Override
 	public Class<? extends OfflinePlayer> getReturnType() {
 		return OfflinePlayer.class;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprSlotIndex.java b/src/main/java/ch/njol/skript/expressions/ExprSlotIndex.java
index 005d31ed4e1..0acbc9d27e4 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprSlotIndex.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprSlotIndex.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import ch.njol.skript.lang.Expression;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprSortedList.java b/src/main/java/ch/njol/skript/expressions/ExprSortedList.java
index c1ffda82f46..93c7acab71b 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprSortedList.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprSortedList.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import ch.njol.skript.Skript;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprSourceBlock.java b/src/main/java/ch/njol/skript/expressions/ExprSourceBlock.java
index b75edb252a2..3533bb283cb 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprSourceBlock.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprSourceBlock.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 
 package ch.njol.skript.expressions;
 
@@ -41,7 +23,7 @@
 @Examples({
 	"on spread:",
 		"\tif the source block is a grass block:",
-			"\t\tset the source block to a dirt block"
+			"\t\tset the source block to dirt"
 })
 @Since("2.7")
 public class ExprSourceBlock extends SimpleExpression<Block> {
diff --git a/src/main/java/ch/njol/skript/expressions/ExprSpawn.java b/src/main/java/ch/njol/skript/expressions/ExprSpawn.java
index cf77fd9a714..b60ba5f4afb 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprSpawn.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprSpawn.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import ch.njol.skript.Skript;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprSpawnEggEntity.java b/src/main/java/ch/njol/skript/expressions/ExprSpawnEggEntity.java
new file mode 100644
index 00000000000..09ca9f873b6
--- /dev/null
+++ b/src/main/java/ch/njol/skript/expressions/ExprSpawnEggEntity.java
@@ -0,0 +1,106 @@
+package ch.njol.skript.expressions;
+
+import ch.njol.skript.Skript;
+import ch.njol.skript.aliases.ItemType;
+import ch.njol.skript.bukkitutil.ItemUtils;
+import ch.njol.skript.classes.Changer.ChangeMode;
+import ch.njol.skript.doc.*;
+import ch.njol.skript.entity.EntityData;
+import ch.njol.skript.expressions.base.SimplePropertyExpression;
+import ch.njol.skript.util.slot.Slot;
+import ch.njol.util.coll.CollectionUtils;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.EntitySnapshot;
+import org.bukkit.event.Event;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.meta.SpawnEggMeta;
+import org.jetbrains.annotations.Nullable;
+
+@Name("Spawn Egg Entity")
+@Description({
+	"Gets or sets the entity snapshot that the provided spawn eggs will spawn when used."
+})
+@Examples({
+	"set {_item} to a zombie spawn egg",
+	"broadcast the spawn egg entity of {_item}",
+	"",
+	"spawn a pig at location(0,0,0):",
+		"\tset the max health of entity to 20",
+		"\tset the health of entity to 20",
+		"\tset {_snapshot} to the entity snapshot of entity",
+		"\tclear entity",
+	"set the spawn egg entity of {_item} to {_snapshot}",
+	"if the spawn egg entity of {_item} is {_snapshot}: # Minecraft 1.20.5+",
+	"",
+	"set the spawn egg entity of {_item} to (random element out of all entities)",
+	"",
+	"set the spawn egg entity of {_item} to a zombie"
+})
+@RequiredPlugins("Minecraft 1.20.2+, Minecraft 1.20.5+ (comparisons)")
+@Since("2.10")
+public class ExprSpawnEggEntity extends SimplePropertyExpression<Object, EntitySnapshot> {
+
+	static {
+		if (Skript.classExists("org.bukkit.entity.EntitySnapshot"))
+			register(ExprSpawnEggEntity.class, EntitySnapshot.class, "spawn egg entity", "itemstacks/itemtypes/slots");
+	}
+
+	@Override
+	public @Nullable EntitySnapshot convert(Object object) {
+		ItemStack itemStack = ItemUtils.asItemStack(object);
+		if (itemStack == null || !(itemStack.getItemMeta() instanceof SpawnEggMeta eggMeta))
+			return null;
+		return eggMeta.getSpawnedEntity();
+	}
+
+	@Override
+	public Class<?> @Nullable [] acceptChange(ChangeMode mode) {
+		if (mode == ChangeMode.SET)
+			return CollectionUtils.array(EntitySnapshot.class, Entity.class, EntityData.class);
+		return null;
+	}
+
+	@Override
+	public void change(Event event, Object @Nullable [] delta, ChangeMode mode) {
+		if (delta == null)
+			return;
+		EntitySnapshot snapshot = null;
+		if (delta[0] instanceof EntitySnapshot entitySnapshot) {
+			snapshot = entitySnapshot;
+		} else if (delta[0] instanceof Entity entity) {
+			snapshot = entity.createSnapshot();
+		} else if (delta[0] instanceof EntityData<?> entityData) {
+			Entity entity = entityData.create();
+			snapshot = entity.createSnapshot();
+			entity.remove();
+		}
+		if (snapshot == null)
+			return;
+
+		for (Object object : getExpr().getArray(event)) {
+			ItemStack item = ItemUtils.asItemStack(object);
+			if (item == null || !(item.getItemMeta() instanceof SpawnEggMeta eggMeta))
+				continue;
+			eggMeta.setSpawnedEntity(snapshot);
+			if (object instanceof Slot slot) {
+				item.setItemMeta(eggMeta);
+				slot.setItem(item);
+			} else if (object instanceof ItemType itemType) {
+				itemType.setItemMeta(eggMeta);
+			} else if (object instanceof ItemStack itemStack) {
+				itemStack.setItemMeta(eggMeta);
+			}
+		}
+	}
+
+	@Override
+	public Class<EntitySnapshot> getReturnType() {
+		return EntitySnapshot.class;
+	}
+
+	@Override
+	protected String getPropertyName() {
+		return "spawn egg entity";
+	}
+
+}
diff --git a/src/main/java/ch/njol/skript/expressions/ExprSpawnReason.java b/src/main/java/ch/njol/skript/expressions/ExprSpawnReason.java
index b4b2d8378e4..7f3fccd055a 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprSpawnReason.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprSpawnReason.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprSpecialNumber.java b/src/main/java/ch/njol/skript/expressions/ExprSpecialNumber.java
index cfe8d9204d1..c1bc0db108b 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprSpecialNumber.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprSpecialNumber.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import ch.njol.skript.Skript;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprSpectatorTarget.java b/src/main/java/ch/njol/skript/expressions/ExprSpectatorTarget.java
index 0bd663bd4f2..e04fbef630e 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprSpectatorTarget.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprSpectatorTarget.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import ch.njol.skript.classes.Changer;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprSpeed.java b/src/main/java/ch/njol/skript/expressions/ExprSpeed.java
index 310a7212bf3..c98659184de 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprSpeed.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprSpeed.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import org.bukkit.entity.Player;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprStringCase.java b/src/main/java/ch/njol/skript/expressions/ExprStringCase.java
index c92fee8648a..7632aae0e75 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprStringCase.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprStringCase.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import org.apache.commons.lang.WordUtils;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprSubstring.java b/src/main/java/ch/njol/skript/expressions/ExprSubstring.java
index f3b7ed3e66b..fffc6561ab5 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprSubstring.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprSubstring.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import java.util.ArrayList;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprTPS.java b/src/main/java/ch/njol/skript/expressions/ExprTPS.java
index 99e0a3ce64c..7268c02e9f3 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprTPS.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprTPS.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import ch.njol.skript.Skript;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprTamer.java b/src/main/java/ch/njol/skript/expressions/ExprTamer.java
index a4e1ce667ea..01746157346 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprTamer.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprTamer.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import org.bukkit.entity.Player;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprTarget.java b/src/main/java/ch/njol/skript/expressions/ExprTarget.java
index 26e4a38596a..bb4a806dc62 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprTarget.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprTarget.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import java.util.function.Predicate;
@@ -170,20 +152,6 @@ public String toString(@Nullable Event event, boolean debug) {
 		return "target" + (type == null ? "" : "ed " + type) + (getExpr().isDefault() ? "" : " of " + getExpr().toString(event, debug));
 	}
 
-	/**
-	 * Gets an entity's target.
-	 *
-	 * @param origin The entity to get the target of.
-	 * @param type The exact EntityData to find. Can be null for any entity.
-	 * @return The entity's target.
-	 * @deprecated Use {@link #getTarget(LivingEntity, EntityData, double)} to include raysize.
-	 */
-	@Deprecated
-	@ScheduledForRemoval
-	public static <T extends Entity> T getTarget(LivingEntity origin, @Nullable EntityData<T> type) {
-		return getTarget(origin, type, 0.0D);
-	}
-
 	/**
 	 * Gets an entity's target entity.
 	 *
diff --git a/src/main/java/ch/njol/skript/expressions/ExprTargetedBlock.java b/src/main/java/ch/njol/skript/expressions/ExprTargetedBlock.java
index e9320c055ff..ee1c6aeacd3 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprTargetedBlock.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprTargetedBlock.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import ch.njol.skript.Skript;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprTeleportCause.java b/src/main/java/ch/njol/skript/expressions/ExprTeleportCause.java
index 537ad9d0707..66dc05d69ee 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprTeleportCause.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprTeleportCause.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprTemperature.java b/src/main/java/ch/njol/skript/expressions/ExprTemperature.java
index 80231e0201c..ba92d1bb3be 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprTemperature.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprTemperature.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import ch.njol.skript.doc.Description;
@@ -31,23 +13,23 @@
 @Since("2.2-dev35")
 public class ExprTemperature extends SimplePropertyExpression<Block, Number> {
 
-    static {
-        register(ExprTemperature.class, Number.class, "temperature[s]", "blocks");
-    }
+	static {
+		register(ExprTemperature.class, Number.class, "temperature[s]", "blocks");
+	}
 
-    @Override
-    public Number convert(Block block) {
-        return block.getTemperature();
-    }
+	@Override
+	public Number convert(Block block) {
+		return block.getTemperature();
+	}
 
-    @Override
-    protected String getPropertyName() {
-        return "temperature";
-    }
+	@Override
+	protected String getPropertyName() {
+		return "temperature";
+	}
 
-    @Override
-    public Class<? extends Number> getReturnType() {
-        return Number.class;
-    }
+	@Override
+	public Class<? extends Number> getReturnType() {
+		return Number.class;
+	}
 
 }
diff --git a/src/main/java/ch/njol/skript/expressions/ExprTernary.java b/src/main/java/ch/njol/skript/expressions/ExprTernary.java
index 8faaa0c72f7..8fa2fa71258 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprTernary.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprTernary.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import ch.njol.skript.Skript;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprTime.java b/src/main/java/ch/njol/skript/expressions/ExprTime.java
index e2199e18a80..c3a83a91ca1 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprTime.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprTime.java
@@ -74,7 +74,7 @@ public Class<?>[] acceptChange(final ChangeMode mode) {
 
 	@Override
 	public void change(Event event, Object @Nullable [] delta, ChangeMode mode) {
-		if (getExpr() == null || delta == null)
+		if (delta == null)
 			return;
 
 		Object time = delta[0];
diff --git a/src/main/java/ch/njol/skript/expressions/ExprTimePlayed.java b/src/main/java/ch/njol/skript/expressions/ExprTimePlayed.java
index 0ab6041da01..c78e842d667 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprTimePlayed.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprTimePlayed.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import ch.njol.skript.Skript;
@@ -75,7 +57,7 @@ public void change(Event event, @Nullable Object[] delta, ChangeMode mode) {
 		if (delta == null)
 			return;
 
-		long ticks = ((Timespan) delta[0]).getTicks();
+		long ticks = ((Timespan) delta[0]).getAs(Timespan.TimePeriod.TICK);
 		for (OfflinePlayer offlinePlayer : getExpr().getArray(event)) {
 			if (!IS_OFFLINE_SUPPORTED && !offlinePlayer.isOnline())
 				continue;
@@ -84,7 +66,7 @@ public void change(Event event, @Nullable Object[] delta, ChangeMode mode) {
 			if (playerTimespan == null)
 				continue;
 
-			long playerTicks = playerTimespan.getTicks();
+			long playerTicks = playerTimespan.getAs(Timespan.TimePeriod.TICK);
 			switch (mode) {
 				case ADD:
 					ticks = playerTicks + ticks;
@@ -115,9 +97,9 @@ protected String getPropertyName() {
 	@Nullable
 	private Timespan getTimePlayed(OfflinePlayer offlinePlayer) {
 		if (IS_OFFLINE_SUPPORTED) {
-			return Timespan.fromTicks(offlinePlayer.getStatistic(Statistic.PLAY_ONE_MINUTE));
+			return new Timespan(Timespan.TimePeriod.TICK, offlinePlayer.getStatistic(Statistic.PLAY_ONE_MINUTE));
 		} else if (offlinePlayer.isOnline()) {
-			return Timespan.fromTicks(offlinePlayer.getPlayer().getStatistic(Statistic.PLAY_ONE_MINUTE));
+			return new Timespan(Timespan.TimePeriod.TICK, offlinePlayer.getPlayer().getStatistic(Statistic.PLAY_ONE_MINUTE));
 		}
 		return null;
 	}
diff --git a/src/main/java/ch/njol/skript/expressions/ExprTimeSince.java b/src/main/java/ch/njol/skript/expressions/ExprTimeSince.java
index 058f95a239c..b6cafbbac58 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprTimeSince.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprTimeSince.java
@@ -1,61 +1,57 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
-import org.bukkit.event.Event;
-import org.jetbrains.annotations.Nullable;
-
 import ch.njol.skript.Skript;
 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.expressions.base.SimplePropertyExpression;
+import ch.njol.skript.lang.Expression;
 import ch.njol.skript.lang.ExpressionType;
+import ch.njol.skript.lang.SkriptParser.ParseResult;
 import ch.njol.skript.util.Date;
 import ch.njol.skript.util.Timespan;
+import ch.njol.util.Kleenean;
+import org.bukkit.event.Event;
+import org.jetbrains.annotations.Nullable;
 
-@Name("Time Since")
-@Description("The time that has passed since a date. If the given date is in the future, a value will not be returned.")
-@Examples("send \"%time since 5 minecraft days ago% has passed since 5 minecraft days ago!\" to player")
-@Since("2.5")
+@Name("Time Since/Until")
+@Description({
+	"The time since a date has passed or the time until a date will pass.",
+	"This expression will return 0 seconds if the time since or time until would be negative, e.g. if one tries to get the time since a future date."
+})
+@Examples({
+	"send \"%time since 5 minecraft days ago% has passed since 5 minecraft days ago!\" to player",
+	"send \"%time until {countdown::end}% until the game begins!\" to player"
+})
+@Since("2.5, 2.10 (time until)")
 public class ExprTimeSince extends SimplePropertyExpression<Date, Timespan> {
 
 	static {
-		Skript.registerExpression(ExprTimeSince.class, Timespan.class, ExpressionType.PROPERTY, "[the] time since %dates%");
+		Skript.registerExpression(ExprTimeSince.class, Timespan.class, ExpressionType.PROPERTY,
+				"[the] time since %dates%",
+				"[the] (time [remaining]|remaining time) until %dates%"
+		);
 	}
 
+	private boolean isSince;
+
 	@Override
-	@Nullable
-	public Timespan convert(Date date) {
-		Date now = Date.now();
+	public boolean init(Expression<?>[] expressions, int matchedPattern, Kleenean isDelayed, ParseResult parseResult) {
+		isSince = matchedPattern == 0;
+		return super.init(expressions, matchedPattern, isDelayed, parseResult);
+	}
+
 
-		/*
-		 * This condition returns whether the date the player is using is
-		 * before the current date, the same as the current date, or after the current date.
-		 * A value less than 0 indicates that the new date is BEFORE the current date.
-		 * A value of 0 indicates that the new date is the SAME as the current date.
-		 * A value greater than 0 indicates that the new date is AFTER the current date.
-		 */
-		if (date.compareTo(now) < 1)
+	@Override
+	public @Nullable Timespan convert(Date date) {
+		Date now = Date.now();
+		// Ensure that we have a valid date
+		// Since should have a date in the past ( -1 or 0 )
+		// Until should have a date in the future ( 0 or 1 )
+		if (isSince ? (date.compareTo(now) < 1) : (date.compareTo(now) > -1))
 			return date.difference(now);
-		return null;
+		return new Timespan();
 	}
 
 	@Override
@@ -65,12 +61,12 @@ public Class<? extends Timespan> getReturnType() {
 
 	@Override
 	protected String getPropertyName() {
-		return "time since";
+		return "time " + (isSince ? "since" : "until");
 	}
 
 	@Override
-	public String toString(final @Nullable Event e, final boolean debug) {
-		return "the time since " + getExpr().toString(e, debug);
+	public String toString(@Nullable Event event, boolean debug) {
+		return "the time " + (isSince ? "since " : "until ") + getExpr().toString(event, debug);
 	}
 
 }
diff --git a/src/main/java/ch/njol/skript/expressions/ExprTimes.java b/src/main/java/ch/njol/skript/expressions/ExprTimes.java
index f9d99e09abf..b8b6c8dcd34 100755
--- a/src/main/java/ch/njol/skript/expressions/ExprTimes.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprTimes.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import ch.njol.skript.Skript;
@@ -51,7 +33,7 @@ public class ExprTimes extends SimpleExpression<Long> {
 
 	static {
 		Skript.registerExpression(ExprTimes.class, Long.class, ExpressionType.SIMPLE,
-				"%number% time[s]", "once", "twice");
+				"%number% time[s]", "once", "twice", "thrice");
 	}
 
 	@SuppressWarnings("null")
diff --git a/src/main/java/ch/njol/skript/expressions/ExprTimespanDetails.java b/src/main/java/ch/njol/skript/expressions/ExprTimespanDetails.java
index 06f334e982b..6bafc7c1301 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprTimespanDetails.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprTimespanDetails.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import ch.njol.skript.doc.Description;
@@ -57,7 +39,7 @@ public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelaye
 	@Override
 	@Nullable
 	public Long convert(Timespan time) {
-		return time.getMilliSeconds() / type.getTime();
+		return time.getAs(Timespan.TimePeriod.MILLISECOND) / type.getTime();
 	}
 
 	@Override
diff --git a/src/main/java/ch/njol/skript/expressions/ExprTool.java b/src/main/java/ch/njol/skript/expressions/ExprTool.java
index ec66d6e5654..39b1eecee24 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprTool.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprTool.java
@@ -1,35 +1,5 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
-import org.bukkit.entity.LivingEntity;
-import org.bukkit.entity.Player;
-import org.bukkit.event.Event;
-import org.bukkit.event.player.PlayerBucketEmptyEvent;
-import org.bukkit.event.player.PlayerBucketEvent;
-import org.bukkit.event.player.PlayerBucketFillEvent;
-import org.bukkit.event.player.PlayerItemHeldEvent;
-import org.bukkit.inventory.EntityEquipment;
-import org.bukkit.inventory.ItemStack;
-import org.bukkit.inventory.PlayerInventory;
-import org.jetbrains.annotations.Nullable;
-
 import ch.njol.skript.Skript;
 import ch.njol.skript.doc.Description;
 import ch.njol.skript.doc.Examples;
@@ -41,11 +11,20 @@
 import ch.njol.skript.lang.ExpressionType;
 import ch.njol.skript.lang.SkriptParser.ParseResult;
 import ch.njol.skript.registrations.Classes;
-import ch.njol.skript.util.Getter;
 import ch.njol.skript.util.slot.EquipmentSlot;
 import ch.njol.skript.util.slot.InventorySlot;
 import ch.njol.skript.util.slot.Slot;
 import ch.njol.util.Kleenean;
+import org.bukkit.entity.LivingEntity;
+import org.bukkit.event.Event;
+import org.bukkit.event.player.PlayerBucketEmptyEvent;
+import org.bukkit.event.player.PlayerBucketEvent;
+import org.bukkit.event.player.PlayerBucketFillEvent;
+import org.bukkit.event.player.PlayerItemHeldEvent;
+import org.bukkit.inventory.EntityEquipment;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.PlayerInventory;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * @author Peter Güttinger
@@ -75,51 +54,49 @@ public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelaye
 	}
 
 	@Override
-	protected Slot[] get(final Event e, final LivingEntity[] source) {
-		final boolean delayed = Delay.isDelayed(e);
-		return get(source, new Getter<Slot, LivingEntity>() {
-			@Override
-			@Nullable
-			public Slot get(final LivingEntity ent) {
-				if (!delayed) {
-					if (!offHand && e instanceof PlayerItemHeldEvent && ((PlayerItemHeldEvent) e).getPlayer() == ent) {
-						final PlayerInventory i = ((PlayerItemHeldEvent) e).getPlayer().getInventory();
-						return new InventorySlot(i, getTime() >= 0 ? ((PlayerItemHeldEvent) e).getNewSlot() : ((PlayerItemHeldEvent) e).getPreviousSlot());
-					} else if (e instanceof PlayerBucketEvent && ((PlayerBucketEvent) e).getPlayer() == ent) {
-						final PlayerInventory i = ((PlayerBucketEvent) e).getPlayer().getInventory();
-						boolean isOffHand = ((PlayerBucketEvent) e).getHand() == org.bukkit.inventory.EquipmentSlot.OFF_HAND || offHand;
-						return new InventorySlot(i, isOffHand ? EquipmentSlot.EquipSlot.OFF_HAND.slotNumber
-							: ((PlayerBucketEvent) e).getPlayer().getInventory().getHeldItemSlot()) {
-							@Override
-							@Nullable
-							public ItemStack getItem() {
-								return getTime() <= 0 ? super.getItem() : ((PlayerBucketEvent) e).getItemStack();
-							}
+	protected Slot[] get(Event event, LivingEntity[] source) {
+		final boolean delayed = Delay.isDelayed(event);
+		return get(source, entity -> {
+			if (!delayed) {
+				if (!offHand && event instanceof PlayerItemHeldEvent playerItemHeldEvent
+					&& playerItemHeldEvent.getPlayer() == entity) {
+					final PlayerInventory i = playerItemHeldEvent.getPlayer().getInventory();
+					return new InventorySlot(i, getTime() >= 0 ? playerItemHeldEvent.getNewSlot() : playerItemHeldEvent.getPreviousSlot());
+				} else if (event instanceof PlayerBucketEvent playerBucketEvent
+					&& playerBucketEvent.getPlayer() == entity) {
+					final PlayerInventory i = playerBucketEvent.getPlayer().getInventory();
+					boolean isOffHand = playerBucketEvent.getHand() == org.bukkit.inventory.EquipmentSlot.OFF_HAND || offHand;
+					return new InventorySlot(i, isOffHand ? EquipmentSlot.EquipSlot.OFF_HAND.slotNumber
+						: playerBucketEvent.getPlayer().getInventory().getHeldItemSlot()) {
+						@Override
+						public ItemStack getItem() {
+							return getTime() <= 0 ? super.getItem() : playerBucketEvent.getItemStack();
+						}
 
-							@Override
-							public void setItem(final @Nullable ItemStack item) {
-								if (getTime() >= 0) {
-									((PlayerBucketEvent) e).setItemStack(item);
-								} else {
-									super.setItem(item);
-								}
+						@Override
+						public void setItem(final @Nullable ItemStack item) {
+							if (getTime() >= 0) {
+								playerBucketEvent.setItemStack(item);
+							} else {
+								super.setItem(item);
 							}
-						};
-					}
+						}
+					};
 				}
-				final EntityEquipment eq = ent.getEquipment();
-				if (eq == null)
-					return null;
-				return new EquipmentSlot(eq, offHand ? EquipmentSlot.EquipSlot.OFF_HAND : EquipmentSlot.EquipSlot.TOOL) {
-					@Override
-					public String toString(@Nullable Event event, boolean debug) {
-						String time = getTime() == 1 ? "future " : getTime() == -1 ? "former " : "";
-						String hand = offHand ? "off hand" : "";
-						String item = Classes.toString(getItem());
-						return String.format("%s %s tool of %s", time, hand, item);
-					}
-				};
 			}
+
+			EntityEquipment equipment = entity.getEquipment();
+			if (equipment == null)
+				return null;
+			return new EquipmentSlot(equipment, offHand ? EquipmentSlot.EquipSlot.OFF_HAND : EquipmentSlot.EquipSlot.TOOL) {
+				@Override
+				public String toString(@Nullable Event event, boolean debug) {
+					String time = getTime() == 1 ? "future " : getTime() == -1 ? "former " : "";
+					String hand = offHand ? "off hand" : "";
+					String item = Classes.toString(getItem());
+					return String.format("%s %s tool of %s", time, hand, item);
+				}
+			};
 		});
 	}
 
diff --git a/src/main/java/ch/njol/skript/expressions/ExprTotalExperience.java b/src/main/java/ch/njol/skript/expressions/ExprTotalExperience.java
index 52b201ab53a..fd851d7d6aa 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprTotalExperience.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprTotalExperience.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import ch.njol.skript.bukkitutil.PlayerUtils;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprTransform.java b/src/main/java/ch/njol/skript/expressions/ExprTransform.java
new file mode 100644
index 00000000000..58d9df26424
--- /dev/null
+++ b/src/main/java/ch/njol/skript/expressions/ExprTransform.java
@@ -0,0 +1,172 @@
+package ch.njol.skript.expressions;
+
+import ch.njol.skript.Skript;
+import ch.njol.skript.classes.ClassInfo;
+import ch.njol.skript.doc.Description;
+import ch.njol.skript.doc.Examples;
+import ch.njol.skript.doc.Keywords;
+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.InputSource;
+import ch.njol.skript.lang.SkriptParser;
+import ch.njol.skript.lang.SkriptParser.ParseResult;
+import ch.njol.skript.lang.Variable;
+import ch.njol.skript.lang.parser.ParserInstance;
+import ch.njol.skript.lang.util.SimpleExpression;
+import ch.njol.skript.registrations.Classes;
+import ch.njol.skript.util.LiteralUtils;
+import ch.njol.util.Kleenean;
+import ch.njol.util.Pair;
+import com.google.common.collect.Iterators;
+import org.bukkit.event.Event;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+import org.jetbrains.annotations.UnknownNullability;
+import org.skriptlang.skript.lang.converter.Converters;
+
+import java.lang.reflect.Array;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Set;
+import java.util.Spliterator;
+import java.util.Spliterators;
+import java.util.stream.StreamSupport;
+
+@Name("Transformed List")
+@Description({
+	"Transforms (or 'maps') a list's values using a given expression. This is akin to looping over the list and getting " +
+	"a modified version of each value.",
+	"Indices cannot be retained with this expression. To retain indices, see the transform effect."
+})
+@Examples({
+	"set {_a::*} to (1, 2, and 3) transformed using (input * 2 - 1, input * 2)",
+	"# {_a::*} is now 1, 2, 3, 4, 5, and 6",
+	"",
+	"# get a list of the sizes of all clans without manually looping",
+	"set {_clan-sizes::*} to indices of {clans::*} transformed using [{clans::%input%::size}]",
+})
+@Since("2.10")
+@Keywords("input")
+public class ExprTransform extends SimpleExpression<Object> implements InputSource {
+
+	static {
+		Skript.registerExpression(ExprTransform.class, Object.class, ExpressionType.PATTERN_MATCHES_EVERYTHING,
+				"%objects% (transformed|mapped) (using|with) \\[<.+>\\]",
+				"%objects% (transformed|mapped) (using|with) \\(<.+>\\)"
+			);
+		if (!ParserInstance.isRegistered(InputData.class))
+			ParserInstance.registerData(InputData.class, InputData::new);
+	}
+
+	private @UnknownNullability Expression<?> mappingExpr;
+	private @Nullable ClassInfo<?> returnClassInfo;
+	private @UnknownNullability Expression<?> unmappedObjects;
+
+	private final Set<ExprInput<?>> dependentInputs = new HashSet<>();
+
+	private @Nullable Object currentValue;
+	private @UnknownNullability String currentIndex;
+
+	@Override
+	public boolean init(Expression<?>[] expressions, int matchedPattern, Kleenean isDelayed, ParseResult parseResult) {
+		unmappedObjects = LiteralUtils.defendExpression(expressions[0]);
+		if (unmappedObjects.isSingle() || !LiteralUtils.canInitSafely(unmappedObjects))
+			return false;
+
+		//noinspection DuplicatedCode
+		if (!parseResult.regexes.isEmpty()) {
+			@Nullable String unparsedExpression = parseResult.regexes.get(0).group();
+			assert unparsedExpression != null;
+			mappingExpr = parseExpression(unparsedExpression, getParser(), SkriptParser.ALL_FLAGS);
+			return mappingExpr != null;
+		}
+		returnClassInfo = Classes.getExactClassInfo(mappingExpr.getReturnType());
+		return true;
+	}
+
+	@Override
+	public @NotNull Iterator<?> iterator(Event event) {
+		if (unmappedObjects instanceof Variable<?> variable) {
+			Iterator<Pair<String, Object>> variableIterator = variable.variablesIterator(event);
+			return StreamSupport.stream(Spliterators.spliteratorUnknownSize(variableIterator, Spliterator.ORDERED), false)
+				.flatMap(pair -> {
+					currentValue = pair.getValue();
+					currentIndex = pair.getKey();
+					return mappingExpr.stream(event);
+				})
+				.iterator();
+		}
+
+		// clear current index just to be safe
+		currentIndex = null;
+
+		Iterator<?> unfilteredObjectIterator = unmappedObjects.iterator(event);
+		if (unfilteredObjectIterator == null)
+			return Collections.emptyIterator();
+		return StreamSupport.stream(Spliterators.spliteratorUnknownSize(unfilteredObjectIterator, Spliterator.ORDERED), false)
+			.flatMap(value -> {
+				currentValue = value;
+				return mappingExpr.stream(event);
+			})
+			.iterator();
+	}
+
+	@Override
+	protected Object @Nullable [] get(Event event) {
+		try {
+			return Converters.convertStrictly(Iterators.toArray(iterator(event), Object.class), getReturnType());
+		} catch (ClassCastException e1) {
+			return (Object[]) Array.newInstance(getReturnType(), 0);
+		}
+	}
+
+	@Override
+	public boolean isSingle() {
+		return false;
+	}
+
+	@Override
+	public Class<?> getReturnType() {
+		return mappingExpr.getReturnType();
+	}
+
+	@Override
+	public boolean isLoopOf(String candidateString) {
+		return mappingExpr.isLoopOf(candidateString) || matchesReturnType(candidateString);
+	}
+
+	private boolean matchesReturnType(String candidateString) {
+		if (returnClassInfo == null)
+			return false;
+		return returnClassInfo.matchesUserInput(candidateString);
+	}
+
+	@Override
+	public Set<ExprInput<?>> getDependentInputs() {
+		return dependentInputs;
+	}
+
+	@Override
+	public @Nullable Object getCurrentValue() {
+		return currentValue;
+	}
+
+	@Override
+	public boolean hasIndices() {
+		return unmappedObjects instanceof Variable<?>;
+	}
+
+	@Override
+	public @UnknownNullability String getCurrentIndex() {
+		return currentIndex;
+	}
+
+	@Override
+	public String toString(@Nullable Event event, boolean debug) {
+		return unmappedObjects.toString(event, debug) + " transformed using " + mappingExpr.toString(event, debug);
+	}
+	
+}
diff --git a/src/main/java/ch/njol/skript/expressions/ExprTransformReason.java b/src/main/java/ch/njol/skript/expressions/ExprTransformReason.java
index b21e48d5085..7f8fc391150 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprTransformReason.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprTransformReason.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import org.bukkit.event.Event;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprTypeOf.java b/src/main/java/ch/njol/skript/expressions/ExprTypeOf.java
index 4b15464534b..d31c59e8f41 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprTypeOf.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprTypeOf.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import ch.njol.skript.aliases.ItemType;
@@ -26,6 +8,8 @@
 import ch.njol.skript.entity.EntityData;
 import ch.njol.skript.expressions.base.SimplePropertyExpression;
 import ch.njol.skript.lang.util.ConvertedExpression;
+import ch.njol.skript.util.EnchantmentType;
+import org.bukkit.enchantments.Enchantment;
 import org.skriptlang.skript.lang.converter.Converters;
 import org.bukkit.block.data.BlockData;
 import org.bukkit.inventory.Inventory;
@@ -35,19 +19,21 @@
 
 @Name("Type of")
 @Description({
-	"Type of a block, item, entity, inventory or potion effect.",
+	"Type of a block, item, entity, inventory, potion effect or enchantment type.",
 	"Types of items, blocks and block datas are item types similar to them but have amounts",
 	"of one, no display names and, on Minecraft 1.13 and newer versions, are undamaged.",
 	"Types of entities and inventories are entity types and inventory types known to Skript.",
-	"Types of potion effects are potion effect types."
+	"Types of potion effects are potion effect types.",
+	"Types of enchantment types are enchantments."
 })
 @Examples({"on rightclick on an entity:",
 	"\tmessage \"This is a %type of clicked entity%!\""})
-@Since("1.4, 2.5.2 (potion effect), 2.7 (block datas)")
+@Since("1.4, 2.5.2 (potion effect), 2.7 (block datas), 2.10 (enchantment type)")
 public class ExprTypeOf extends SimplePropertyExpression<Object, Object> {
 
 	static {
-		register(ExprTypeOf.class, Object.class, "type", "entitydatas/itemtypes/inventories/potioneffects/blockdatas");
+		register(ExprTypeOf.class, Object.class, "type",
+			"entitydatas/itemtypes/inventories/potioneffects/blockdatas/enchantmenttypes");
 	}
 
 	@Override
@@ -57,17 +43,19 @@ protected String getPropertyName() {
 
 	@Override
 	@Nullable
-	public Object convert(Object o) {
-		if (o instanceof EntityData) {
-			return ((EntityData<?>) o).getSuperType();
-		} else if (o instanceof ItemType) {
-			return ((ItemType) o).getBaseType();
-		} else if (o instanceof Inventory) {
-			return ((Inventory) o).getType();
-		} else if (o instanceof PotionEffect) {
-			return ((PotionEffect) o).getType();
-		} else if (o instanceof BlockData) {
-			return new ItemType(((BlockData) o).getMaterial());
+	public Object convert(Object object) {
+		if (object instanceof EntityData<?> entityData) {
+			return entityData.getSuperType();
+		} else if (object instanceof ItemType itemType) {
+			return itemType.getBaseType();
+		} else if (object instanceof Inventory inventory) {
+			return inventory.getType();
+		} else if (object instanceof PotionEffect potionEffect) {
+			return potionEffect.getType();
+		} else if (object instanceof BlockData blockData) {
+			return new ItemType(blockData.getMaterial());
+		} else if (object instanceof EnchantmentType enchantmentType) {
+			return enchantmentType.getType();
 		}
 		assert false;
 		return null;
@@ -79,6 +67,7 @@ public Class<?> getReturnType() {
 		return EntityData.class.isAssignableFrom(returnType) ? EntityData.class
 			: ItemType.class.isAssignableFrom(returnType) ? ItemType.class
 			: PotionEffectType.class.isAssignableFrom(returnType) ? PotionEffectType.class
+			: EnchantmentType.class.isAssignableFrom(returnType) ? Enchantment.class
 			: BlockData.class.isAssignableFrom(returnType) ? ItemType.class : Object.class;
 	}
 
@@ -89,4 +78,5 @@ public Class<?> getReturnType() {
 			return null;
 		return super.getConvertedExpr(to);
 	}
+
 }
diff --git a/src/main/java/ch/njol/skript/expressions/ExprUUID.java b/src/main/java/ch/njol/skript/expressions/ExprUUID.java
index 42912a72a86..4f0a0022a26 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprUUID.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprUUID.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import org.bukkit.OfflinePlayer;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprUnbreakable.java b/src/main/java/ch/njol/skript/expressions/ExprUnbreakable.java
index bda14bb13a0..8795130c8bb 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprUnbreakable.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprUnbreakable.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import ch.njol.skript.Skript;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprUnixDate.java b/src/main/java/ch/njol/skript/expressions/ExprUnixDate.java
index 160c45d0ea4..be0c74743b9 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprUnixDate.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprUnixDate.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import org.jetbrains.annotations.Nullable;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprUnixTicks.java b/src/main/java/ch/njol/skript/expressions/ExprUnixTicks.java
index 205e8a1ac7e..c97aeaec865 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprUnixTicks.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprUnixTicks.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import org.jetbrains.annotations.Nullable;
@@ -40,7 +22,7 @@ public class ExprUnixTicks extends SimplePropertyExpression<Date, Number> {
 	@Override
 	@Nullable
 	public Number convert(Date f) {
-		return f.getTimestamp() / 1000.0;
+		return f.getTime() / 1000.0;
 	}
 
 	@Override
diff --git a/src/main/java/ch/njol/skript/expressions/ExprUnleashReason.java b/src/main/java/ch/njol/skript/expressions/ExprUnleashReason.java
new file mode 100644
index 00000000000..674895edbac
--- /dev/null
+++ b/src/main/java/ch/njol/skript/expressions/ExprUnleashReason.java
@@ -0,0 +1,65 @@
+package ch.njol.skript.expressions;
+
+import org.bukkit.event.Event;
+import org.bukkit.event.entity.EntityUnleashEvent;
+import org.bukkit.event.entity.EntityUnleashEvent.UnleashReason;
+import org.jetbrains.annotations.Nullable;
+
+import ch.njol.skript.Skript;
+import ch.njol.skript.doc.*;
+import ch.njol.skript.expressions.base.EventValueExpression;
+import ch.njol.skript.lang.Expression;
+import ch.njol.skript.lang.ExpressionType;
+import ch.njol.skript.lang.SkriptParser.ParseResult;
+import ch.njol.util.Kleenean;
+
+@Name("Unleash Reason")
+@Description("The unleash reason in an unleash event.")
+@Examples({
+	"if the unleash reason is distance:",
+		"\tbroadcast \"The leash was snapped in half.\""
+})
+@Events("Unleash")
+@Since("2.10")
+public class ExprUnleashReason extends EventValueExpression<UnleashReason> {
+
+	public ExprUnleashReason() {
+		super(UnleashReason.class);
+	}
+
+	static {
+		Skript.registerExpression(ExprUnleashReason.class, EntityUnleashEvent.UnleashReason.class, ExpressionType.SIMPLE, "[the] unleash[ing] reason");
+	}
+
+	@Override
+	public boolean init(Expression<?>[] expressions, int matchedPattern, Kleenean isDelayed, ParseResult parseResult) {
+		if (!getParser().isCurrentEvent(EntityUnleashEvent.class)) {
+			Skript.error("The 'unleash reason' expression can only be used in an 'unleash' event");
+			return false;
+		}
+		return true;
+	}
+
+	@Override
+	protected UnleashReason[] get(Event event) {
+		if (!(event instanceof EntityUnleashEvent unleashEvent))
+			return new UnleashReason[0];
+		return new UnleashReason[] {unleashEvent.getReason()};
+	}
+
+	@Override
+	public boolean isSingle() {
+		return true;
+	}
+
+	@Override
+	public Class<? extends UnleashReason> getReturnType() {
+		return UnleashReason.class;
+	}
+
+	@Override
+	public String toString(@Nullable Event event, boolean debug) {
+		return "the unleash reason";
+	}
+
+}
diff --git a/src/main/java/ch/njol/skript/expressions/ExprValue.java b/src/main/java/ch/njol/skript/expressions/ExprValue.java
index 6e331dfccb9..6f71462cc69 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprValue.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprValue.java
@@ -1,82 +1,164 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
-import java.lang.reflect.Array;
-
-import org.bukkit.event.Event;
-import org.jetbrains.annotations.Nullable;
-
+import ch.njol.skript.Skript;
+import ch.njol.skript.classes.Changer.ChangeMode;
+import ch.njol.skript.classes.ClassInfo;
+import ch.njol.skript.config.Node;
+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.expressions.base.SimplePropertyExpression;
 import ch.njol.skript.lang.Expression;
+import ch.njol.skript.lang.ExpressionType;
 import ch.njol.skript.lang.Literal;
 import ch.njol.skript.lang.SkriptParser.ParseResult;
-import ch.njol.skript.lang.Unit;
-import ch.njol.skript.lang.util.SimpleExpression;
+import ch.njol.skript.lang.util.common.AnyValued;
+import ch.njol.skript.registrations.Feature;
 import ch.njol.util.Kleenean;
+import org.bukkit.event.Event;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.lang.reflect.Array;
+
+@Name("Value")
+@Description({
+	"Returns the value of something that has a value, e.g. a node in a config.",
+	"The value is automatically converted to the specified type (e.g. text, number) where possible."
+})
+@Examples({
+	"""
+		set {_node} to node "language" in the skript config
+		broadcast the text value of {_node}""",
+	"""
+		set {_node} to node "update check interval" in the skript config
+		
+		broadcast text value of {_node}
+		# text value of {_node} = "12 hours" (text)
+		
+		wait for {_node}'s timespan value
+		# timespan value of {_node} = 12 hours (duration)""",
+
+})
+@Since("2.10 (Nodes), 2.10 (Any)")
+public class ExprValue extends SimplePropertyExpression<Object, Object> {
+
+	static {
+		Skript.registerExpression(ExprValue.class, Object.class, ExpressionType.PROPERTY,
+			"[the] %*classinfo% value [at] %string% (from|in) %node%",
+			"[the] %*classinfo% value of %valued%",
+			"[the] %*classinfo% values of %valueds%",
+			"%valued%'s %*classinfo% value",
+			"%valueds%'[s] %*classinfo% values"
+		);
+	}
+
+	private boolean isSingle;
+	private ClassInfo<?> classInfo;
+	private @Nullable Expression<String> pathExpression;
 
-/**
- * @author Peter Güttinger
- */
-public class ExprValue extends SimpleExpression<Unit> {
-//	static { // REMIND add this (>2.0)
-//		Skript.registerExpression(ExprValue.class, Unit.class, ExpressionType.PATTERN_MATCHES_EVERYTHING, "%~number% %*unit%");
-//	}
-	
-	@SuppressWarnings("null")
-	private Expression<Number> amount;
-	@SuppressWarnings("null")
-	private Unit unit;
-	
-	@SuppressWarnings({"unchecked", "null"})
 	@Override
-	public boolean init(final Expression<?>[] exprs, final int matchedPattern, final Kleenean isDelayed, final ParseResult parseResult) {
-		amount = (Expression<Number>) exprs[0];
-		unit = ((Literal<Unit>) exprs[1]).getSingle();
+	@SuppressWarnings("unchecked")
+	public boolean init(Expression<?>[] expressions, int pattern, Kleenean isDelayed, ParseResult parseResult) {
+		@NotNull Literal<ClassInfo<?>> format;
+		switch (pattern) {
+			case 0:
+				if (!this.getParser().hasExperiment(Feature.SCRIPT_REFLECTION))
+					return false;
+				this.isSingle = true;
+				format = (Literal<ClassInfo<?>>) expressions[0];
+				this.pathExpression = (Expression<String>) expressions[1];
+				this.setExpr(expressions[2]);
+				break;
+			case 1:
+				this.isSingle = true;
+			case 2:
+				format = (Literal<ClassInfo<?>>) expressions[0];
+				this.setExpr(expressions[1]);
+				break;
+			case 3:
+				this.isSingle = true;
+			default:
+				format = (Literal<ClassInfo<?>>) expressions[1];
+				this.setExpr(expressions[0]);
+		}
+		this.classInfo = format.getSingle();
 		return true;
 	}
-	
+
 	@Override
-	@Nullable
-	protected Unit[] get(final Event e) {
-		final Number a = amount.getSingle(e);
-		if (a == null)
+	public @Nullable Object convert(@Nullable Object object) {
+		if (object == null)
 			return null;
-		final Unit u = unit.clone();
-		u.setAmount(a.doubleValue());
-		final Unit[] one = (Unit[]) Array.newInstance(unit.getClass(), 1);
-		one[0] = u;
-		return one;
+		if (object instanceof AnyValued<?> valued)
+			return valued.convertedValue(classInfo);
+		return null;
 	}
-	
+
+	@Override
+	protected Object[] get(Event event, Object[] source) {
+		if (pathExpression != null) {
+			if (!(source[0] instanceof Node main))
+				return (Object[]) Array.newInstance(this.getReturnType(), 0);
+			String path = pathExpression.getSingle(event);
+			Node node = main.getNodeAt(path);
+			Object[] array = (Object[]) Array.newInstance(this.getReturnType(), 1);
+			if (!(node instanceof AnyValued<?> valued))
+				return (Object[]) Array.newInstance(this.getReturnType(), 0);
+			array[0] = this.convert(valued);
+			return array;
+		}
+		return super.get(source, this);
+	}
+
+	@Override
+	public Class<?> @Nullable [] acceptChange(ChangeMode mode) {
+		if (pathExpression != null) // todo editable configs soon
+			return null;
+		return switch (mode) {
+			case SET -> new Class<?>[] {Object.class};
+			case RESET, DELETE -> new Class<?>[0];
+			default -> null;
+		};
+	}
+
+	@Override
+	public void change(Event event, Object @Nullable [] delta, ChangeMode mode) {
+		if (pathExpression != null)
+			return;
+		Object newValue = delta != null ? delta[0] : null;
+		for (Object object : getExpr().getArray(event)) {
+			if (!(object instanceof AnyValued<?> valued))
+				continue;
+			if (valued.supportsValueChange())
+				valued.changeValueSafely(newValue);
+		}
+	}
+
+	@Override
+	public Class<?> getReturnType() {
+		return classInfo.getC();
+	}
+
 	@Override
 	public boolean isSingle() {
-		return true;
+		return isSingle;
 	}
-	
+
 	@Override
-	public Class<? extends Unit> getReturnType() {
-		return unit.getClass();
+	protected String getPropertyName() {
+		return classInfo.getCodeName() + " value" + (isSingle ? "" : "s");
 	}
-	
+
 	@Override
-	public String toString(final @Nullable Event e, final boolean debug) {
-		return amount.toString(e, debug) + " " + unit.toString();
+	public String toString(@Nullable Event event, boolean debug) {
+		if (pathExpression != null) {
+			return "the " + this.getPropertyName()
+				+ " at " + pathExpression.toString(event, debug)
+				+ " in " + this.getExpr().toString(event, debug);
+		}
+		return super.toString(event, debug);
 	}
-	
+
 }
diff --git a/src/main/java/ch/njol/skript/expressions/ExprValueWithin.java b/src/main/java/ch/njol/skript/expressions/ExprValueWithin.java
index ba4283f9aa6..3e5e898b38c 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprValueWithin.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprValueWithin.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import ch.njol.skript.Skript;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprVectorAngleBetween.java b/src/main/java/ch/njol/skript/expressions/ExprVectorAngleBetween.java
index 420b8a742e9..126260c1abf 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprVectorAngleBetween.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprVectorAngleBetween.java
@@ -1,27 +1,5 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
-import org.bukkit.event.Event;
-import org.bukkit.util.Vector;
-import org.jetbrains.annotations.Nullable;
-
 import ch.njol.skript.Skript;
 import ch.njol.skript.doc.Description;
 import ch.njol.skript.doc.Examples;
@@ -32,8 +10,10 @@
 import ch.njol.skript.lang.SkriptParser.ParseResult;
 import ch.njol.skript.lang.util.SimpleExpression;
 import ch.njol.util.Kleenean;
-import ch.njol.util.VectorMath;
 import ch.njol.util.coll.CollectionUtils;
+import org.bukkit.event.Event;
+import org.bukkit.util.Vector;
+import org.jetbrains.annotations.Nullable;
 
 @Name("Vectors - Angle Between")
 @Description("Gets the angle between two vectors.")
@@ -41,6 +21,8 @@
 @Since("2.2-dev28")
 public class ExprVectorAngleBetween extends SimpleExpression<Number> {
 
+	private static final float RAD_TO_DEG = (float) (180 / Math.PI);
+
 	static {
 		Skript.registerExpression(ExprVectorAngleBetween.class, Number.class, ExpressionType.COMBINED,
 				"[the] angle between [[the] vectors] %vector% and %vector%");
@@ -64,7 +46,7 @@ protected Number[] get(Event event) {
 		Vector second = this.second.getSingle(event);
 		if (first == null || second == null)
 			return null;
-		return CollectionUtils.array(first.angle(second) * (float) VectorMath.RAD_TO_DEG);
+		return CollectionUtils.array(first.angle(second) * RAD_TO_DEG);
 	}
 
 	@Override
diff --git a/src/main/java/ch/njol/skript/expressions/ExprVectorBetweenLocations.java b/src/main/java/ch/njol/skript/expressions/ExprVectorBetweenLocations.java
index 8770cd342c8..fbc7b37165d 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprVectorBetweenLocations.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprVectorBetweenLocations.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import org.bukkit.Location;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprVectorCrossProduct.java b/src/main/java/ch/njol/skript/expressions/ExprVectorCrossProduct.java
index 267af53382b..03f7f70b148 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprVectorCrossProduct.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprVectorCrossProduct.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import org.bukkit.event.Event;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprVectorCylindrical.java b/src/main/java/ch/njol/skript/expressions/ExprVectorCylindrical.java
index c349b907669..3f2a3822aff 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprVectorCylindrical.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprVectorCylindrical.java
@@ -1,27 +1,5 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
-import org.bukkit.event.Event;
-import org.bukkit.util.Vector;
-import org.jetbrains.annotations.Nullable;
-
 import ch.njol.skript.Skript;
 import ch.njol.skript.doc.Description;
 import ch.njol.skript.doc.Examples;
@@ -32,8 +10,10 @@
 import ch.njol.skript.lang.SkriptParser.ParseResult;
 import ch.njol.skript.lang.util.SimpleExpression;
 import ch.njol.util.Kleenean;
-import ch.njol.util.VectorMath;
 import ch.njol.util.coll.CollectionUtils;
+import org.bukkit.event.Event;
+import org.bukkit.util.Vector;
+import org.jetbrains.annotations.Nullable;
 
 @Name("Vectors - Cylindrical Shape")
 @Description("Forms a 'cylindrical shaped' vector using yaw to manipulate the current point.")
@@ -45,6 +25,8 @@
 @Since("2.2-dev28")
 public class ExprVectorCylindrical extends SimpleExpression<Vector> {
 
+	private static final double DEG_TO_RAD = Math.PI / 180;
+
 	static {
 		Skript.registerExpression(ExprVectorCylindrical.class, Vector.class, ExpressionType.SIMPLE,
 				"[a] [new] cylindrical vector [from|with] [radius] %number%, [yaw] %number%(,[ and]| and) [height] %number%");
@@ -70,7 +52,7 @@ protected Vector[] get(Event event) {
 		Number height = this.height.getSingle(event);
 		if (radius == null || yaw == null || height == null)
 			return null;
-		return CollectionUtils.array(VectorMath.fromCylindricalCoordinates(radius.doubleValue(), VectorMath.fromSkriptYaw(yaw.floatValue()), height.doubleValue()));
+		return CollectionUtils.array(fromCylindricalCoordinates(radius.doubleValue(), ExprYawPitch.fromSkriptYaw(yaw.floatValue()), height.doubleValue()));
 	}
 
 	@Override
@@ -89,4 +71,12 @@ public String toString(@Nullable Event event, boolean debug) {
 				yaw.toString(event, debug) + " and height " + height.toString(event, debug);
 	}
 
+	public static Vector fromCylindricalCoordinates(double radius, double phi, double height) {
+		double r = Math.abs(radius);
+		double p = phi * DEG_TO_RAD;
+		double x = r * Math.cos(p);
+		double z = r * Math.sin(p);
+		return new Vector(x, height, z);
+	}
+
 }
diff --git a/src/main/java/ch/njol/skript/expressions/ExprVectorDotProduct.java b/src/main/java/ch/njol/skript/expressions/ExprVectorDotProduct.java
index cdc9d78b2b6..b4a860b0d63 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprVectorDotProduct.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprVectorDotProduct.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import org.bukkit.event.Event;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprVectorFromDirection.java b/src/main/java/ch/njol/skript/expressions/ExprVectorFromDirection.java
index e458b54bbf9..7c02614f8aa 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprVectorFromDirection.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprVectorFromDirection.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import ch.njol.skript.Skript;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprVectorFromXYZ.java b/src/main/java/ch/njol/skript/expressions/ExprVectorFromXYZ.java
index 51686f096d4..cfc5d67de21 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprVectorFromXYZ.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprVectorFromXYZ.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import org.bukkit.event.Event;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprVectorFromYawAndPitch.java b/src/main/java/ch/njol/skript/expressions/ExprVectorFromYawAndPitch.java
index 139e7b50638..5bfe334e027 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprVectorFromYawAndPitch.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprVectorFromYawAndPitch.java
@@ -1,27 +1,5 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
-import org.bukkit.event.Event;
-import org.bukkit.util.Vector;
-import org.jetbrains.annotations.Nullable;
-
 import ch.njol.skript.Skript;
 import ch.njol.skript.doc.Description;
 import ch.njol.skript.doc.Examples;
@@ -32,10 +10,14 @@
 import ch.njol.skript.lang.SkriptParser.ParseResult;
 import ch.njol.skript.lang.util.SimpleExpression;
 import ch.njol.util.Kleenean;
-import ch.njol.util.VectorMath;
 import ch.njol.util.coll.CollectionUtils;
+import org.bukkit.event.Event;
+import org.bukkit.util.Vector;
+import org.jetbrains.annotations.Nullable;
+
+import static ch.njol.skript.expressions.ExprYawPitch.fromYawAndPitch;
 
-@Name("Vectors - Vector from Pitch and Yaw")
+@Name("Vectors - Vector from Yaw and Pitch")
 @Description("Creates a vector from a yaw and pitch value.")
 @Examples("set {_v} to vector from yaw 45 and pitch 45")
 @Since("2.2-dev28")
@@ -43,30 +25,29 @@ public class ExprVectorFromYawAndPitch extends SimpleExpression<Vector> {
 
 	static {
 		Skript.registerExpression(ExprVectorFromYawAndPitch.class, Vector.class, ExpressionType.COMBINED,
-				"[a] [new] vector (from|with) yaw %number% and pitch %number%");
+			"[a] [new] vector (from|with) yaw %number% and pitch %number%",
+			"[a] [new] vector (from|with) pitch %number% and yaw %number%");
 	}
 
-	@SuppressWarnings("null")
 	private Expression<Number> pitch, yaw;
 
 	@Override
-	@SuppressWarnings({"unchecked", "null"})
+	@SuppressWarnings("unchecked")
 	public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelayed, ParseResult parseResult) {
-		yaw = (Expression<Number>) exprs[0];
-		pitch = (Expression<Number>) exprs[1];
+		pitch = (Expression<Number>) exprs[matchedPattern ^ 1];
+		yaw = (Expression<Number>) exprs[matchedPattern];
 		return true;
 	}
 
 	@Override
-	@SuppressWarnings("null")
 	protected Vector[] get(Event event) {
 		Number skriptYaw = yaw.getSingle(event);
 		Number skriptPitch = pitch.getSingle(event);
 		if (skriptYaw == null || skriptPitch == null)
 			return null;
-		float yaw = VectorMath.fromSkriptYaw(VectorMath.wrapAngleDeg(skriptYaw.floatValue()));
-		float pitch = VectorMath.fromSkriptPitch(VectorMath.wrapAngleDeg(skriptPitch.floatValue()));
-		return CollectionUtils.array(VectorMath.fromYawAndPitch(yaw, pitch));
+		float yaw = ExprYawPitch.fromSkriptYaw(wrapAngleDeg(skriptYaw.floatValue()));
+		float pitch = ExprYawPitch.fromSkriptPitch(wrapAngleDeg(skriptPitch.floatValue()));
+		return CollectionUtils.array(fromYawAndPitch(yaw, pitch));
 	}
 
 	@Override
@@ -84,4 +65,15 @@ public String toString(@Nullable Event event, boolean debug) {
 		return "vector from yaw " + yaw.toString(event, debug) + " and pitch " + pitch.toString(event, debug);
 	}
 
+	public static float wrapAngleDeg(float angle) {
+		angle %= 360f;
+		if (angle <= -180) {
+			return angle + 360;
+		} else if (angle > 180) {
+			return angle - 360;
+		} else {
+			return angle;
+		}
+	}
+
 }
diff --git a/src/main/java/ch/njol/skript/expressions/ExprVectorLength.java b/src/main/java/ch/njol/skript/expressions/ExprVectorLength.java
index 62e5696e098..6311d02579f 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprVectorLength.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprVectorLength.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import ch.njol.skript.classes.Changer.ChangeMode;
@@ -25,7 +7,6 @@
 import ch.njol.skript.doc.Since;
 import ch.njol.skript.expressions.base.SimplePropertyExpression;
 import ch.njol.skript.lang.Expression;
-import ch.njol.util.VectorMath;
 import ch.njol.util.coll.CollectionUtils;
 import org.bukkit.event.Event;
 import org.bukkit.util.Vector;
@@ -76,7 +57,7 @@ public void change(Event event, Object @Nullable [] delta, ChangeMode mode) {
 				final double finalDeltaLength = deltaLength;
 				final double finalDeltaLengthSquared = deltaLength * deltaLength;
 				changeFunction = vector -> {
-					if (VectorMath.isZero(vector) || (finalDeltaLength < 0 && vector.lengthSquared() < finalDeltaLengthSquared)) {
+					if (vector.isZero() || (finalDeltaLength < 0 && vector.lengthSquared() < finalDeltaLengthSquared)) {
 						vector.zero();
 					} else {
 						double newLength = finalDeltaLength + vector.length();
@@ -90,7 +71,7 @@ public void change(Event event, Object @Nullable [] delta, ChangeMode mode) {
 			case SET:
 				final double finalDeltaLength1 = deltaLength;
 				changeFunction = vector -> {
-					if (finalDeltaLength1 < 0 || VectorMath.isZero(vector)) {
+					if (finalDeltaLength1 < 0 || vector.isZero()) {
 						vector.zero();
 					} else {
 						if (!vector.isNormalized())
diff --git a/src/main/java/ch/njol/skript/expressions/ExprVectorNormalize.java b/src/main/java/ch/njol/skript/expressions/ExprVectorNormalize.java
index 98fe029f88a..a320b92ddae 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprVectorNormalize.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprVectorNormalize.java
@@ -1,28 +1,5 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
-import ch.njol.util.VectorMath;
-import org.bukkit.event.Event;
-import org.bukkit.util.Vector;
-import org.jetbrains.annotations.Nullable;
-
 import ch.njol.skript.Skript;
 import ch.njol.skript.doc.Description;
 import ch.njol.skript.doc.Examples;
@@ -34,6 +11,9 @@
 import ch.njol.skript.lang.util.SimpleExpression;
 import ch.njol.util.Kleenean;
 import ch.njol.util.coll.CollectionUtils;
+import org.bukkit.event.Event;
+import org.bukkit.util.Vector;
+import org.jetbrains.annotations.Nullable;
 
 @Name("Vectors - Normalized")
 @Description("Returns the same vector but with length 1.")
@@ -64,7 +44,7 @@ protected Vector[] get(Event event) {
 		if (vector == null)
 			return null;
 		vector = vector.clone();
-		if (!VectorMath.isZero(vector) && !vector.isNormalized())
+		if (!vector.isZero() && !vector.isNormalized())
 			vector.normalize();
 		return CollectionUtils.array(vector);
 	}
diff --git a/src/main/java/ch/njol/skript/expressions/ExprVectorOfLocation.java b/src/main/java/ch/njol/skript/expressions/ExprVectorOfLocation.java
index 9c4697a4135..ccb29c5386f 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprVectorOfLocation.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprVectorOfLocation.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import org.bukkit.Location;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprVectorProjection.java b/src/main/java/ch/njol/skript/expressions/ExprVectorProjection.java
index 8e1378e5ab3..7fff00f8846 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprVectorProjection.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprVectorProjection.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import ch.njol.skript.Skript;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprVectorRandom.java b/src/main/java/ch/njol/skript/expressions/ExprVectorRandom.java
index 458b33a31da..fe8bbd9380a 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprVectorRandom.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprVectorRandom.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import ch.njol.skript.Skript;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprVectorSpherical.java b/src/main/java/ch/njol/skript/expressions/ExprVectorSpherical.java
index 881d36a532b..877b1c0bd64 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprVectorSpherical.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprVectorSpherical.java
@@ -1,27 +1,5 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
-import org.bukkit.event.Event;
-import org.bukkit.util.Vector;
-import org.jetbrains.annotations.Nullable;
-
 import ch.njol.skript.Skript;
 import ch.njol.skript.doc.Description;
 import ch.njol.skript.doc.Examples;
@@ -32,8 +10,10 @@
 import ch.njol.skript.lang.SkriptParser.ParseResult;
 import ch.njol.skript.lang.util.SimpleExpression;
 import ch.njol.util.Kleenean;
-import ch.njol.util.VectorMath;
 import ch.njol.util.coll.CollectionUtils;
+import org.bukkit.event.Event;
+import org.bukkit.util.Vector;
+import org.jetbrains.annotations.Nullable;
 
 @Name("Vectors - Spherical Shape")
 @Description("Forms a 'spherical shaped' vector using yaw and pitch to manipulate the current point.")
@@ -45,6 +25,8 @@
 @Since("2.2-dev28")
 public class ExprVectorSpherical extends SimpleExpression<Vector> {
 
+	private static final double DEG_TO_RAD = Math.PI / 180;
+
 	static {
 		Skript.registerExpression(ExprVectorSpherical.class, Vector.class, ExpressionType.SIMPLE,
 				"[a] [new] spherical vector [(from|with)] [radius] %number%, [yaw] %number%(,[ and]| and) [pitch] %number%");
@@ -70,7 +52,8 @@ protected Vector[] get(Event event) {
 		Number pitch = this.pitch.getSingle(event);
 		if (radius == null || yaw == null || pitch == null)
 			return null;
-		return CollectionUtils.array(VectorMath.fromSphericalCoordinates(radius.doubleValue(), VectorMath.fromSkriptYaw(yaw.floatValue()), pitch.floatValue() + 90));
+		return CollectionUtils.array(fromSphericalCoordinates(radius.doubleValue(),
+			ExprYawPitch.fromSkriptYaw(yaw.floatValue()), pitch.floatValue() + 90));
 	}
 
 	@Override
@@ -89,4 +72,15 @@ public String toString(@Nullable Event event, boolean debug) {
 				" and pitch" + pitch.toString(event, debug);
 	}
 
+	public static Vector fromSphericalCoordinates(double radius, double theta, double phi) {
+		double r = Math.abs(radius);
+		double t = theta * DEG_TO_RAD;
+		double p = phi * DEG_TO_RAD;
+		double sinp = Math.sin(p);
+		double x = r * sinp * Math.cos(t);
+		double y = r * Math.cos(p);
+		double z = r * sinp * Math.sin(t);
+		return new Vector(x, y, z);
+	}
+
 }
diff --git a/src/main/java/ch/njol/skript/expressions/ExprVectorSquaredLength.java b/src/main/java/ch/njol/skript/expressions/ExprVectorSquaredLength.java
index bdfeeb33b74..3812f910bd8 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprVectorSquaredLength.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprVectorSquaredLength.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import org.bukkit.util.Vector;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprVectorXYZ.java b/src/main/java/ch/njol/skript/expressions/ExprVectorXYZ.java
deleted file mode 100644
index cc2b5deb9cb..00000000000
--- a/src/main/java/ch/njol/skript/expressions/ExprVectorXYZ.java
+++ /dev/null
@@ -1,138 +0,0 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
-package ch.njol.skript.expressions;
-
-import ch.njol.skript.classes.Changer;
-import ch.njol.skript.classes.Changer.ChangeMode;
-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.expressions.base.SimplePropertyExpression;
-import ch.njol.skript.lang.Expression;
-import ch.njol.skript.lang.SkriptParser.ParseResult;
-import ch.njol.util.Kleenean;
-import ch.njol.util.coll.CollectionUtils;
-import org.bukkit.event.Event;
-import org.bukkit.util.Vector;
-import org.jetbrains.annotations.Nullable;
-
-import java.util.function.Function;
-
-@Name("Vectors - XYZ Component")
-@Description("Gets or changes the x, y or z component of a vector.")
-@Examples({
-	"set {_v} to vector 1, 2, 3",
-	"send \"%x of {_v}%, %y of {_v}%, %z of {_v}%\"",
-	"add 1 to x of {_v}",
-	"add 2 to y of {_v}",
-	"add 3 to z of {_v}",
-	"send \"%x of {_v}%, %y of {_v}%, %z of {_v}%\"",
-	"set x component of {_v::*} to 1",
-	"set y component of {_v::*} to 2",
-	"set z component of {_v::*} to 3",
-	"send \"%x component of {_v::*}%, %y component of {_v::*}%, %z component of {_v::*}%\""
-})
-@Since("2.2-dev28")
-public class ExprVectorXYZ extends SimplePropertyExpression<Vector, Number> {
-	
-	static {
-		// TODO: Combine with ExprCoordinates for 2.9
-		register(ExprVectorXYZ.class, Number.class, "[vector] (0:x|1:y|2:z) [component[s]]", "vectors");
-	}
-	
-	private final static Character[] axes = new Character[] {'x', 'y', 'z'};
-	
-	private int axis;
-	
-	@Override
-	public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelayed, ParseResult parseResult) {
-		super.init(exprs, matchedPattern, isDelayed, parseResult);
-		axis = parseResult.mark;
-		return true;
-	}
-	
-	@Override
-	public Number convert(Vector vector) {
-		return axis == 0 ? vector.getX() : (axis == 1 ? vector.getY() : vector.getZ());
-	}
-	
-	@Override
-	@SuppressWarnings("null")
-	public Class<?>[] acceptChange(ChangeMode mode) {
-		if ((mode == ChangeMode.ADD || mode == ChangeMode.REMOVE || mode == ChangeMode.SET)
-				&& Changer.ChangerUtils.acceptsChange(getExpr(), ChangeMode.SET, Vector.class))
-			return CollectionUtils.array(Number.class);
-		return null;
-	}
-	
-	@Override
-	public void change(Event event, @Nullable Object[] delta, ChangeMode mode) {
-		assert delta != null;
-		double deltaValue = ((Number) delta[0]).doubleValue();
-		Function<Vector, Vector> changeFunction;
-		switch (mode) {
-			case REMOVE:
-				deltaValue = -deltaValue;
-				//$FALL-THROUGH$
-			case ADD:
-				final double finalDeltaValue1 = deltaValue;
-				changeFunction = vector -> {
-					if (axis == 0) {
-						vector.setX(vector.getX() + finalDeltaValue1);
-					} else if (axis == 1) {
-						vector.setY(vector.getY() + finalDeltaValue1);
-					} else {
-						vector.setZ(vector.getZ() + finalDeltaValue1);
-					}
-					return vector;
-				};
-				break;
-			case SET:
-				final double finalDeltaValue = deltaValue;
-				changeFunction = vector -> {
-					if (axis == 0) {
-						vector.setX(finalDeltaValue);
-					} else if (axis == 1) {
-						vector.setY(finalDeltaValue);
-					} else {
-						vector.setZ(finalDeltaValue);
-					}
-					return vector;
-				};
-				break;
-			default:
-				assert false;
-				return;
-		}
-
-		//noinspection unchecked,DataFlowIssue
-		((Expression<Vector>) getExpr()).changeInPlace(event, changeFunction);
-	}
-
-	@Override
-	public Class<Number> getReturnType() {
-		return Number.class;
-	}
-
-	@Override
-	protected String getPropertyName() {
-		return axes[axis] + " component";
-	}
-}
diff --git a/src/main/java/ch/njol/skript/expressions/ExprVehicle.java b/src/main/java/ch/njol/skript/expressions/ExprVehicle.java
index db27bffa076..b45da85eedd 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprVehicle.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprVehicle.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import org.bukkit.entity.Entity;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprVelocity.java b/src/main/java/ch/njol/skript/expressions/ExprVelocity.java
index 9292f2ed30c..3cea900ab22 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprVelocity.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprVelocity.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import org.bukkit.entity.Entity;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprVersion.java b/src/main/java/ch/njol/skript/expressions/ExprVersion.java
index 27793fbdf36..9c28e31b989 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprVersion.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprVersion.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import org.bukkit.Bukkit;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprVersionString.java b/src/main/java/ch/njol/skript/expressions/ExprVersionString.java
index 32427bc0747..407dfec0d0b 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprVersionString.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprVersionString.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import ch.njol.skript.Skript;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprVillagerLevel.java b/src/main/java/ch/njol/skript/expressions/ExprVillagerLevel.java
new file mode 100644
index 00000000000..4d28c6e35ce
--- /dev/null
+++ b/src/main/java/ch/njol/skript/expressions/ExprVillagerLevel.java
@@ -0,0 +1,120 @@
+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;
+import ch.njol.skript.doc.Name;
+import ch.njol.skript.doc.Since;
+import ch.njol.skript.expressions.base.SimplePropertyExpression;
+import ch.njol.skript.lang.Expression;
+import ch.njol.skript.lang.SkriptParser;
+import ch.njol.util.Kleenean;
+import ch.njol.util.Math2;
+import ch.njol.util.coll.CollectionUtils;
+import org.bukkit.entity.LivingEntity;
+import org.bukkit.entity.Villager;
+import org.bukkit.event.Event;
+import org.jetbrains.annotations.Nullable;
+
+@Name("Villager Level/Experience")
+@Description({
+	"Represents the level/experience of a villager.",
+	"The level will determine which trades are available to players (value between 1 and 5, defaults to 1).",
+	"When a villager's level is 1, they may lose their profession if they don't have a workstation.",
+	"Experience works along with the leveling system, determining which level the villager will move to.",
+	"Experience must be greater than or equal to 0.",
+	"Learn more about villager levels on <a href='https://minecraft.wiki/w/Trading#Level'>Minecraft Wiki</a>"
+})
+@Examples({
+	"set {_level} to villager level of {_villager}",
+	"set villager level of last spawned villager to 2",
+	"add 1 to villager level of target entity",
+	"remove 1 from villager level of event-entity",
+	"reset villager level of event-entity",
+	"set villager experience of last spawned entity to 100"
+})
+@Since("2.10")
+public class ExprVillagerLevel extends SimplePropertyExpression<LivingEntity, Number> {
+
+	private static final boolean HAS_INCREASE_METHOD = Skript.methodExists(Villager.class, "increaseLevel", int.class);
+
+	static {
+		register(ExprVillagerLevel.class, Number.class, "villager (level|:experience)", "livingentities");
+	}
+
+	private boolean experience;
+
+	@Override
+	public boolean init(Expression<?>[] expressions, int matchedPattern, Kleenean isDelayed, SkriptParser.ParseResult parseResult) {
+		this.experience = parseResult.hasTag("experience");
+		return super.init(expressions, matchedPattern, isDelayed, parseResult);
+	}
+
+	@Override
+	public @Nullable Number convert(LivingEntity from) {
+		if (from instanceof Villager villager)
+			return experience ? villager.getVillagerExperience() : villager.getVillagerLevel();
+		return null;
+	}
+
+	@Override
+	public Class<?> @Nullable [] acceptChange(ChangeMode mode) {
+		return switch (mode) {
+			case SET, ADD, REMOVE, RESET -> CollectionUtils.array(Number.class);
+			default -> null;
+		};
+	}
+
+	@Override
+	public void change(Event event, Object @Nullable [] delta, ChangeMode mode) {
+		Number number = delta != null && delta[0] instanceof Number num ? num : 1;
+		int changeValue = number.intValue();
+
+		for (LivingEntity livingEntity : getExpr().getArray(event)) {
+			if (!(livingEntity instanceof Villager villager)) continue;
+
+			int minLevel;
+			int maxLevel;
+			int previousAmount;
+			if (experience) {
+				minLevel = 0;
+				maxLevel = Integer.MAX_VALUE;
+				previousAmount = villager.getVillagerExperience();
+			} else {
+				minLevel = 1;
+				maxLevel = 5;
+				previousAmount = villager.getVillagerLevel();
+			}
+			int newLevel = switch (mode) {
+				case SET -> changeValue;
+				case ADD -> previousAmount + changeValue;
+				case REMOVE -> previousAmount - changeValue;
+				default -> minLevel;
+			};
+			newLevel = Math2.fit(minLevel, newLevel, maxLevel);
+			if (experience) {
+				villager.setVillagerExperience(newLevel);
+			} else if (newLevel > previousAmount && HAS_INCREASE_METHOD) {
+				int increase = Math2.fit(minLevel, newLevel - previousAmount, maxLevel);
+				// According to the docs for this method:
+				// Increases the level of this villager.
+				// The villager will also unlock new recipes unlike the raw 'setVillagerLevel' method
+				villager.increaseLevel(increase);
+			} else {
+				villager.setVillagerLevel(newLevel);
+			}
+		}
+	}
+
+	@Override
+	protected String getPropertyName() {
+		return "villager " + (experience ? "experience" : "level");
+	}
+
+	@Override
+	public Class<? extends Number> getReturnType() {
+		return Number.class;
+	}
+
+}
diff --git a/src/main/java/ch/njol/skript/expressions/ExprVillagerProfession.java b/src/main/java/ch/njol/skript/expressions/ExprVillagerProfession.java
new file mode 100644
index 00000000000..07d52e88617
--- /dev/null
+++ b/src/main/java/ch/njol/skript/expressions/ExprVillagerProfession.java
@@ -0,0 +1,71 @@
+package ch.njol.skript.expressions;
+
+import ch.njol.skript.classes.Changer.ChangeMode;
+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.expressions.base.SimplePropertyExpression;
+import ch.njol.util.coll.CollectionUtils;
+import org.bukkit.entity.LivingEntity;
+import org.bukkit.entity.Villager;
+import org.bukkit.entity.Villager.Profession;
+import org.bukkit.entity.ZombieVillager;
+import org.bukkit.event.Event;
+import org.jetbrains.annotations.Nullable;
+
+@Name("Villager Profession")
+@Description("Represents the profession of a villager/zombie villager.")
+@Examples({
+	"set {_p} to villager profession of event-entity",
+	"villager profession of event-entity = nitwit profession",
+	"set villager profession of {_villager} to librarian profession",
+	"delete villager profession of event-entity"
+})
+@Since("2.10")
+public class ExprVillagerProfession extends SimplePropertyExpression<LivingEntity, Profession> {
+
+	static {
+		register(ExprVillagerProfession.class, Profession.class, "villager profession", "livingentities");
+	}
+
+	@Override
+	public @Nullable Profession convert(LivingEntity from) {
+		if (from instanceof Villager villager)
+			return villager.getProfession();
+		else if (from instanceof ZombieVillager zombie)
+			return zombie.getVillagerProfession();
+		return null;
+	}
+
+	@Override
+	public Class<?> @Nullable [] acceptChange(ChangeMode mode) {
+		return switch (mode) {
+			case SET, DELETE -> CollectionUtils.array(Profession.class);
+			default -> null;
+		};
+	}
+
+	@Override
+	public void change(Event event, Object @Nullable [] delta, ChangeMode mode) {
+		Profession profession = delta != null && delta[0] instanceof Profession pro ? pro : Profession.NONE;
+
+		for (LivingEntity livingEntity : getExpr().getArray(event)) {
+			if (livingEntity instanceof Villager villager)
+				villager.setProfession(profession);
+			else if (livingEntity instanceof ZombieVillager zombie)
+				zombie.setVillagerProfession(profession);
+		}
+	}
+
+	@Override
+	protected String getPropertyName() {
+		return "villager profession";
+	}
+
+	@Override
+	public Class<? extends Profession> getReturnType() {
+		return Profession.class;
+	}
+
+}
diff --git a/src/main/java/ch/njol/skript/expressions/ExprVillagerType.java b/src/main/java/ch/njol/skript/expressions/ExprVillagerType.java
new file mode 100644
index 00000000000..8eca303a881
--- /dev/null
+++ b/src/main/java/ch/njol/skript/expressions/ExprVillagerType.java
@@ -0,0 +1,71 @@
+package ch.njol.skript.expressions;
+
+import ch.njol.skript.classes.Changer.ChangeMode;
+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.expressions.base.SimplePropertyExpression;
+import ch.njol.util.coll.CollectionUtils;
+import org.bukkit.entity.LivingEntity;
+import org.bukkit.entity.Villager;
+import org.bukkit.entity.Villager.Type;
+import org.bukkit.entity.ZombieVillager;
+import org.bukkit.event.Event;
+import org.jetbrains.annotations.Nullable;
+
+@Name("Villager Type")
+@Description("Represents the type of a villager/zombie villager. This usually represents the biome the villager is from.")
+@Examples({
+	"set {_type} to villager type of {_villager}",
+	"villager type of {_villager} = plains",
+	"set villager type of event-entity to plains"
+})
+@Since("2.10")
+public class ExprVillagerType extends SimplePropertyExpression<LivingEntity, Type> {
+
+	static {
+		register(ExprVillagerType.class, Type.class, "villager type", "livingentities");
+	}
+
+	@Override
+	public @Nullable Type convert(LivingEntity from) {
+		if (from instanceof Villager villager)
+			return villager.getVillagerType();
+		else if (from instanceof ZombieVillager zombie)
+			return zombie.getVillagerType();
+		return null;
+	}
+
+	@Override
+	public Class<?> @Nullable [] acceptChange(ChangeMode mode) {
+		if (mode == ChangeMode.SET)
+			return CollectionUtils.array(Type.class);
+		return null;
+	}
+
+	@Override
+	public void change(Event event, Object @Nullable [] delta, ChangeMode mode) {
+		Type type = delta != null && delta[0] instanceof Type t ? t : null;
+		if (type == null)
+			return;
+
+		for (LivingEntity livingEntity : getExpr().getArray(event)) {
+			if (livingEntity instanceof Villager villager)
+				villager.setVillagerType(type);
+			else if (livingEntity instanceof ZombieVillager zombie)
+				zombie.setVillagerType(type);
+		}
+	}
+
+	@Override
+	protected String getPropertyName() {
+		return "villager type";
+	}
+
+	@Override
+	public Class<? extends Type> getReturnType() {
+		return Type.class;
+	}
+
+}
diff --git a/src/main/java/ch/njol/skript/expressions/ExprWeather.java b/src/main/java/ch/njol/skript/expressions/ExprWeather.java
index 7c332d7fc0e..e56d2b722b2 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprWeather.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprWeather.java
@@ -1,46 +1,22 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
-import org.bukkit.World;
-import org.bukkit.event.Event;
-import org.bukkit.event.weather.ThunderChangeEvent;
-import org.bukkit.event.weather.WeatherChangeEvent;
-import org.bukkit.event.weather.WeatherEvent;
-import org.jetbrains.annotations.Nullable;
-
 import ch.njol.skript.Skript;
 import ch.njol.skript.classes.Changer.ChangeMode;
-import ch.njol.skript.doc.Description;
-import ch.njol.skript.doc.Events;
-import ch.njol.skript.doc.Examples;
-import ch.njol.skript.doc.Name;
-import ch.njol.skript.doc.Since;
+import ch.njol.skript.doc.*;
 import ch.njol.skript.effects.Delay;
 import ch.njol.skript.expressions.base.PropertyExpression;
 import ch.njol.skript.lang.Expression;
 import ch.njol.skript.lang.ExpressionType;
 import ch.njol.skript.lang.SkriptParser.ParseResult;
-import ch.njol.skript.util.Getter;
 import ch.njol.skript.util.WeatherType;
 import ch.njol.util.Kleenean;
 import ch.njol.util.coll.CollectionUtils;
+import org.bukkit.World;
+import org.bukkit.event.Event;
+import org.bukkit.event.weather.ThunderChangeEvent;
+import org.bukkit.event.weather.WeatherChangeEvent;
+import org.bukkit.event.weather.WeatherEvent;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * @author Peter Güttinger
@@ -64,15 +40,13 @@ public boolean init(final Expression<?>[] exprs, final int matchedPattern, final
 	}
 
 	@Override
-	protected WeatherType[] get(final Event e, final World[] source) {
-		return get(source, new Getter<WeatherType, World>() {
-			@Override
-			public WeatherType get(final World w) {
-				if (getTime() >= 0 && e instanceof WeatherEvent && w.equals(((WeatherEvent) e).getWorld()) && !Delay.isDelayed(e))
-					return WeatherType.fromEvent((WeatherEvent) e);
-				else
-					return WeatherType.fromWorld(w);
-			}
+	protected WeatherType[] get(Event event, World[] source) {
+		return get(source, world -> {
+			if (getTime() >= 0 && event instanceof WeatherEvent weatherEvent
+				&& world.equals(weatherEvent.getWorld()) && !Delay.isDelayed(event))
+				return WeatherType.fromEvent(weatherEvent);
+			else
+				return WeatherType.fromWorld(world);
 		});
 	}
 	
diff --git a/src/main/java/ch/njol/skript/expressions/ExprWhether.java b/src/main/java/ch/njol/skript/expressions/ExprWhether.java
index 1b4050f0068..823042bbae3 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprWhether.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprWhether.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import ch.njol.skript.Skript;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprWhitelist.java b/src/main/java/ch/njol/skript/expressions/ExprWhitelist.java
index e14334a4a3e..355070c268f 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprWhitelist.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprWhitelist.java
@@ -1,22 +1,3 @@
-/**
- * This file is part of Skript.
- *
- * Skript is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Skript is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import ch.njol.skript.effects.EffEnforceWhitelist;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprWithFireResistance.java b/src/main/java/ch/njol/skript/expressions/ExprWithFireResistance.java
index 5c257a68e86..1c57ba189dc 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprWithFireResistance.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprWithFireResistance.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import ch.njol.skript.Skript;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprWithItemFlags.java b/src/main/java/ch/njol/skript/expressions/ExprWithItemFlags.java
new file mode 100644
index 00000000000..bad4322c782
--- /dev/null
+++ b/src/main/java/ch/njol/skript/expressions/ExprWithItemFlags.java
@@ -0,0 +1,80 @@
+package ch.njol.skript.expressions;
+
+import ch.njol.skript.Skript;
+import ch.njol.skript.aliases.ItemType;
+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.SkriptParser.ParseResult;
+import ch.njol.skript.lang.util.SimpleExpression;
+import ch.njol.util.Kleenean;
+import org.bukkit.event.Event;
+import org.bukkit.inventory.ItemFlag;
+import org.bukkit.inventory.meta.ItemMeta;
+import org.jetbrains.annotations.Nullable;
+
+@Name("Item with Item Flags")
+@Description("Creates a new item with the specified item flags.")
+@Examples({
+	"give player diamond sword with item flags hide enchants and hide attributes",
+	"set {_item} to player's tool with item flag hide additional tooltip",
+	"give player torch with hide placed on item flag",
+	"set {_item} to diamond sword with all item flags"
+})
+@Since("2.10")
+public class ExprWithItemFlags extends SimpleExpression<ItemType> {
+
+	static {
+		Skript.registerExpression(ExprWithItemFlags.class, ItemType.class, ExpressionType.COMBINED,
+			"%itemtypes% with [the] item flag[s] %itemflags%",
+			"%itemtypes% with [the] %itemflags% item flag[s]");
+	}
+
+	private Expression<ItemFlag> itemFlags;
+	private Expression<ItemType> itemTypes;
+
+	@Override
+	public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelayed, ParseResult parseResult) {
+		itemTypes = (Expression<ItemType>) exprs[0];
+		itemFlags = (Expression<ItemFlag>) exprs[1];
+		return true;
+	}
+
+	@Override
+	protected ItemType[] get(Event event) {
+		ItemType[] types = itemTypes.getArray(event);
+		ItemFlag[] flags = itemFlags.getArray(event);
+
+		ItemType[] result = new ItemType[types.length];
+		for (int i = 0; i < types.length; i++) {
+			ItemType clonedType = types[i].clone();
+			ItemMeta meta = clonedType.getItemMeta();
+			if (meta != null) {
+				meta.addItemFlags(flags);
+				clonedType.setItemMeta(meta);
+			}
+			result[i] = clonedType;
+		}
+
+		return result;
+	}
+
+	@Override
+	public boolean isSingle() {
+		return itemTypes.isSingle();
+	}
+
+	@Override
+	public Class<? extends ItemType> getReturnType() {
+		return ItemType.class;
+	}
+
+	@Override
+	public String toString(@Nullable Event event, boolean debug) {
+		return itemTypes.toString(event, debug) + " with item flags " + itemFlags.toString(event, debug);
+	}
+
+}
diff --git a/src/main/java/ch/njol/skript/expressions/ExprWorld.java b/src/main/java/ch/njol/skript/expressions/ExprWorld.java
index dd1fa865b77..90cfc779697 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprWorld.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprWorld.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import org.bukkit.Chunk;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprWorldEnvironment.java b/src/main/java/ch/njol/skript/expressions/ExprWorldEnvironment.java
index c713b8d9e62..ce0635a217b 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprWorldEnvironment.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprWorldEnvironment.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import ch.njol.skript.doc.Description;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprWorldFromName.java b/src/main/java/ch/njol/skript/expressions/ExprWorldFromName.java
index c99b1a27903..436498f4c91 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprWorldFromName.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprWorldFromName.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import ch.njol.skript.Skript;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprWorlds.java b/src/main/java/ch/njol/skript/expressions/ExprWorlds.java
index b33b5f65eda..d067294a374 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprWorlds.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprWorlds.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import java.util.Iterator;
diff --git a/src/main/java/ch/njol/skript/expressions/ExprXOf.java b/src/main/java/ch/njol/skript/expressions/ExprXOf.java
index 06393a0423a..00fd8fe63d3 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprXOf.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprXOf.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import ch.njol.skript.Skript;
@@ -36,6 +18,8 @@
 import org.bukkit.inventory.ItemStack;
 import org.jetbrains.annotations.Nullable;
 
+import java.lang.reflect.Array;
+
 @Name("X of Item")
 @Description("An expression to be able to use a certain amount of items where the amount can be any expression. Please note that this expression is not stable and might be replaced in the future.")
 @Examples("give level of player of pickaxes to the player")
@@ -62,7 +46,7 @@ public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelaye
 	protected Object[] get(Event e, Object[] source) {
 		Number a = amount.getSingle(e);
 		if (a == null)
-			return new Object[0];
+			return (Object[]) Array.newInstance(getReturnType(), 0);
 
 		return get(source, o -> {
 			if (o instanceof ItemStack) {
diff --git a/src/main/java/ch/njol/skript/expressions/ExprXYZComponent.java b/src/main/java/ch/njol/skript/expressions/ExprXYZComponent.java
new file mode 100644
index 00000000000..336009020d1
--- /dev/null
+++ b/src/main/java/ch/njol/skript/expressions/ExprXYZComponent.java
@@ -0,0 +1,201 @@
+package ch.njol.skript.expressions;
+
+import ch.njol.skript.Skript;
+import ch.njol.skript.classes.Changer;
+import ch.njol.skript.classes.Changer.ChangeMode;
+import ch.njol.skript.classes.Changer.ChangerUtils;
+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.expressions.base.SimplePropertyExpression;
+import ch.njol.skript.lang.Expression;
+import ch.njol.skript.lang.SkriptParser.ParseResult;
+import ch.njol.util.Kleenean;
+import ch.njol.util.coll.CollectionUtils;
+import org.bukkit.event.Event;
+import org.bukkit.util.Vector;
+import org.jetbrains.annotations.Nullable;
+import org.jetbrains.annotations.UnknownNullability;
+import org.joml.Quaternionf;
+
+import java.util.Locale;
+
+@Name("Vector/Quaternion - WXYZ Component")
+@Description({
+	"Gets or changes the W, X, Y or Z component of <a href='classes.html#vector'>vectors</a>/<a href='classes.html#quaternion'>quaternions</a>.",
+	"You cannot use the W component with vectors; it is for quaternions only."
+})
+@Examples({
+	"set {_v} to vector 1, 2, 3",
+	"send \"%x of {_v}%, %y of {_v}%, %z of {_v}%\"",
+	"add 1 to x of {_v}",
+	"add 2 to y of {_v}",
+	"add 3 to z of {_v}",
+	"send \"%x of {_v}%, %y of {_v}%, %z of {_v}%\"",
+	"set x component of {_v} to 1",
+	"set y component of {_v} to 2",
+	"set z component of {_v} to 3",
+	"send \"%x component of {_v}%, %y component of {_v}%, %z component of {_v}%\""
+})
+@Since("2.2-dev28, 2.10 (quaternions)")
+public class ExprXYZComponent extends SimplePropertyExpression<Object, Number> {
+
+	private static final boolean IS_RUNNING_1194 = Skript.isRunningMinecraft(1, 19, 4);
+
+	static {
+		String types = "vectors";
+		if (IS_RUNNING_1194)
+			types += "/quaternions";
+		register(ExprXYZComponent.class, Number.class, "[vector|quaternion] (:w|:x|:y|:z) [component[s]]", types);
+	}
+
+	private enum Axis {
+		W,
+		X,
+		Y,
+		Z;
+	}
+
+	private ExprXYZComponent.@UnknownNullability Axis axis;
+
+	@Override
+	public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelayed, ParseResult parseResult) {
+		axis = Axis.valueOf(parseResult.tags.get(0).toUpperCase(Locale.ENGLISH));
+		return super.init(exprs, matchedPattern, isDelayed, parseResult);
+	}
+
+	@Override
+	public @Nullable Number convert(Object object) {
+		if (object instanceof Vector vector) {
+			return switch (axis) {
+				case W -> null;
+				case X -> vector.getX();
+				case Y -> vector.getY();
+				case Z -> vector.getZ();
+			};
+		} else if (object instanceof Quaternionf quaternion) {
+			return switch (axis) {
+				case W -> quaternion.w();
+				case X -> quaternion.x();
+				case Y -> quaternion.y();
+				case Z -> quaternion.z();
+			};
+		}
+		return null;
+	}
+
+	@Override
+	public Class<?> @Nullable [] acceptChange(ChangeMode mode) {
+		if ((mode == ChangeMode.ADD || mode == ChangeMode.REMOVE || mode == ChangeMode.SET)) {
+			boolean acceptsChange;
+			if (IS_RUNNING_1194) {
+				acceptsChange = ChangerUtils.acceptsChange(getExpr(), ChangeMode.SET, Vector.class, Quaternionf.class);
+			} else {
+				acceptsChange = ChangerUtils.acceptsChange(getExpr(), ChangeMode.SET, Vector.class);
+			}
+			if (acceptsChange)
+				return CollectionUtils.array(Number.class);
+		}
+		return null;
+	}
+
+	@Override
+	public void change(Event event, Object @Nullable [] delta, ChangeMode mode) {
+		assert delta != null; // reset/delete not supported
+		final double value = ((Number) delta[0]).doubleValue();
+
+		// for covering the edge cases such as an expression that returns a Vector but can only be set to a Quaternions
+		boolean acceptsVectors = ChangerUtils.acceptsChange(getExpr(), ChangeMode.SET, Vector.class);
+		boolean acceptsQuaternions = ChangerUtils.acceptsChange(getExpr(), ChangeMode.SET, Quaternionf.class);
+
+		getExpr().changeInPlace(event, object -> {
+			if (acceptsVectors && object instanceof Vector vector) {
+				changeVector(vector, axis, value, mode);
+			} else if (acceptsQuaternions && object instanceof Quaternionf quaternion) {
+				changeQuaternion(quaternion, axis, (float) value, mode);
+			}
+			return object;
+		});
+	}
+
+	/**
+	 * Helper method to modify a single vector's component. Does not call .change().
+	 *
+	 * @param vector the vector to modify
+	 * @param value the value to modify by
+	 * @param mode the change mode to determine the modification type
+	 */
+	private static void changeVector(Vector vector, Axis axis, double value, ChangeMode mode) {
+		if (axis == Axis.W)
+			return;
+		switch (mode) {
+			case REMOVE:
+				value = -value;
+				//$FALL-THROUGH$
+			case ADD:
+				switch (axis) {
+					case X -> vector.setX(vector.getX() + value);
+					case Y -> vector.setY(vector.getY() + value);
+					case Z -> vector.setZ(vector.getZ() + value);
+				}
+				break;
+			case SET:
+				switch (axis) {
+					case X -> vector.setX(value);
+					case Y -> vector.setY(value);
+					case Z -> vector.setZ(value);
+				}
+				break;
+			default:
+				assert false;
+		}
+	}
+
+	/**
+	 * Helper method to modify a single quaternion's component. Does not call .change().
+	 *
+	 * @param quaternion the vector to modify
+	 * @param value the value to modify by
+	 * @param mode the change mode to determine the modification type
+	 */
+	private static void changeQuaternion(Quaternionf quaternion, Axis axis, float value, ChangeMode mode) {
+		float x = quaternion.x();
+		float y = quaternion.y();
+		float z = quaternion.z();
+		float w = quaternion.w();
+		switch (mode) {
+			case REMOVE:
+				value = -value;
+				//$FALL-THROUGH$
+			case ADD:
+				switch (axis) {
+					case W -> w += value;
+					case X -> x += value;
+					case Y -> y += value;
+					case Z -> z += value;
+				}
+				break;
+			case SET:
+				switch (axis) {
+					case W -> w = value;
+					case X -> x = value;
+					case Y -> y = value;
+					case Z -> z = value;
+				}
+				break;
+		}
+		quaternion.set(x, y, z, w);
+	}
+
+	@Override
+	public Class<Number> getReturnType() {
+		return Number.class;
+	}
+
+	@Override
+	protected String getPropertyName() {
+		return axis.name().toLowerCase(Locale.ENGLISH) + " component";
+	}
+
+}
diff --git a/src/main/java/ch/njol/skript/expressions/ExprYawPitch.java b/src/main/java/ch/njol/skript/expressions/ExprYawPitch.java
index 65dffb4f600..b28558338b5 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprYawPitch.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprYawPitch.java
@@ -1,63 +1,43 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import ch.njol.skript.ServerPlatform;
 import ch.njol.skript.Skript;
-import ch.njol.skript.doc.RequiredPlugins;
-import ch.njol.util.VectorMath;
-import org.bukkit.Location;
-import org.bukkit.entity.Entity;
-import org.bukkit.entity.Player;
-import org.bukkit.event.Event;
-
 import ch.njol.skript.classes.Changer.ChangeMode;
-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.doc.*;
 import ch.njol.skript.expressions.base.SimplePropertyExpression;
 import ch.njol.skript.lang.Expression;
 import ch.njol.skript.lang.SkriptParser.ParseResult;
 import ch.njol.util.Kleenean;
 import ch.njol.util.coll.CollectionUtils;
+import org.bukkit.Location;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.Player;
+import org.bukkit.event.Event;
 import org.bukkit.util.Vector;
+import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.Nullable;
 
 @Name("Yaw / Pitch")
 @Description({
-		"The yaw or pitch of a location or vector.",
-		"A yaw of 0 or 360 represents the positive z direction. Adding a positive number to the yaw of a player will rotate it clockwise.",
-		"A pitch of 90 represents the negative y direction, or downward facing. A pitch of -90 represents upward facing. Adding a positive number to the pitch will rotate the direction downwards.",
-		"Only Paper 1.19+ users may directly change the yaw/pitch of players."
+	"The yaw or pitch of a location or vector.",
+	"A yaw of 0 or 360 represents the positive z direction. Adding a positive number to the yaw of a player will rotate it clockwise.",
+	"A pitch of 90 represents the negative y direction, or downward facing. A pitch of -90 represents upward facing. Adding a positive number to the pitch will rotate the direction downwards.",
+	"Only Paper 1.19+ users may directly change the yaw/pitch of players."
 })
 @Examples({
-		"log \"%player%: %location of player%, %player's yaw%, %player's pitch%\" to \"playerlocs.log\"",
-		"set {_yaw} to yaw of player",
-		"set {_p} to pitch of target entity",
-		"set pitch of player to -90 # Makes the player look upwards, Paper 1.19+ only",
-		"add 180 to yaw of target of player # Makes the target look behind themselves"
+	"log \"%player%: %location of player%, %player's yaw%, %player's pitch%\" to \"playerlocs.log\"",
+	"set {_yaw} to yaw of player",
+	"set {_p} to pitch of target entity",
+	"set pitch of player to -90 # Makes the player look upwards, Paper 1.19+ only",
+	"add 180 to yaw of target of player # Makes the target look behind themselves"
 })
 @Since("2.0, 2.2-dev28 (vector yaw/pitch), 2.9.0 (entity changers)")
 @RequiredPlugins("Paper 1.19+ (player changers)")
 public class ExprYawPitch extends SimplePropertyExpression<Object, Float> {
 
+	private static final double DEG_TO_RAD = Math.PI / 180;
+	private static final double RAD_TO_DEG =  180 / Math.PI;
+
 	static {
 		register(ExprYawPitch.class, Float.class, "(:yaw|pitch)", "entities/locations/vectors");
 	}
@@ -78,18 +58,16 @@ public Float convert(Object object) {
 		if (object instanceof Entity) {
 			Location location = ((Entity) object).getLocation();
 			return usesYaw
-					? normalizeYaw(location.getYaw())
-					: location.getPitch();
-		} else if (object instanceof Location) {
-			Location location = (Location) object;
+				? normalizeYaw(location.getYaw())
+				: location.getPitch();
+		} else if (object instanceof Location location) {
 			return usesYaw
-					? normalizeYaw(location.getYaw())
-					: location.getPitch();
-		} else if (object instanceof Vector) {
-			Vector vector = (Vector) object;
+				? normalizeYaw(location.getYaw())
+				: location.getPitch();
+		} else if (object instanceof Vector vector) {
 			return usesYaw
-					? VectorMath.skriptYaw((VectorMath.getYaw(vector)))
-					: VectorMath.skriptPitch(VectorMath.getPitch(vector));
+				? skriptYaw((getYaw(vector)))
+				: skriptPitch(getPitch(vector));
 		}
 		return null;
 	}
@@ -119,7 +97,7 @@ public void change(Event event, @Nullable Object[] delta, ChangeMode mode) {
 		for (Object object : getExpr().getArray(event)) {
 			if (object instanceof Player && !SUPPORTS_PLAYERS)
 				continue;
-				
+
 			if (object instanceof Entity) {
 				changeForEntity((Entity) object, value, mode);
 			} else if (object instanceof Location) {
@@ -193,8 +171,8 @@ private void changeForLocation(Location location, float value, ChangeMode mode)
 	}
 
 	private void changeForVector(Vector vector, float value, ChangeMode mode) {
-		float yaw = VectorMath.getYaw(vector);
-		float pitch = VectorMath.getPitch(vector);
+		float yaw = getYaw(vector);
+		float pitch = getPitch(vector);
 		switch (mode) {
 			case REMOVE:
 				value = -value;
@@ -209,12 +187,12 @@ private void changeForVector(Vector vector, float value, ChangeMode mode) {
 				break;
 			case SET:
 				if (usesYaw)
-					yaw = VectorMath.fromSkriptYaw(value);
+					yaw = fromSkriptYaw(value);
 				else
-					pitch = VectorMath.fromSkriptPitch(value);
+					pitch = fromSkriptPitch(value);
 		}
-		Vector newVector = VectorMath.fromYawAndPitch(yaw, pitch).multiply(vector.length());
-		VectorMath.copyVector(vector, newVector);
+		Vector newVector = fromYawAndPitch(yaw, pitch).multiply(vector.length());
+		vector.copy(newVector);
 	}
 
 	private static float normalizeYaw(float yaw) {
@@ -232,4 +210,55 @@ protected String getPropertyName() {
 		return usesYaw ? "yaw" : "pitch";
 	}
 
+	// TODO Mark as private next version after VectorMath deletion
+	@ApiStatus.Internal
+	public static Vector fromYawAndPitch(float yaw, float pitch) {
+		double y = Math.sin(pitch * DEG_TO_RAD);
+		double div = Math.cos(pitch * DEG_TO_RAD);
+		double x = Math.cos(yaw * DEG_TO_RAD);
+		double z = Math.sin(yaw * DEG_TO_RAD);
+		x *= div;
+		z *= div;
+		return new Vector(x,y,z);
+	}
+
+	// TODO Mark as private next version after VectorMath deletion
+	@ApiStatus.Internal
+	public static float getYaw(Vector vector) {
+		if (((Double) vector.getX()).equals((double) 0) && ((Double) vector.getZ()).equals((double) 0)){
+			return 0;
+		}
+		return (float) (Math.atan2(vector.getZ(), vector.getX()) * RAD_TO_DEG);
+	}
+
+	// TODO Mark as private next version after VectorMath deletion
+	@ApiStatus.Internal
+	public static float getPitch(Vector vector) {
+		double xy = Math.sqrt(vector.getX() * vector.getX() + vector.getZ() * vector.getZ());
+		return (float) (Math.atan(vector.getY() / xy) * RAD_TO_DEG);
+	}
+
+	// TODO Mark as private next version after VectorMath deletion
+	@ApiStatus.Internal
+	public static float skriptYaw(float yaw) {
+		return yaw < 90
+			? yaw + 270
+			: yaw - 90;
+	}
+
+	// TODO Mark as private next version after VectorMath deletion
+	@ApiStatus.Internal
+	public static float skriptPitch(float pitch) {
+		return -pitch;
+	}
+
+	public static float fromSkriptYaw(float yaw) {
+		return yaw > 270
+			? yaw - 270
+			: yaw + 90;
+	}
+
+	public static float fromSkriptPitch(float pitch) {
+		return -pitch;
+	}
 }
diff --git a/src/main/java/ch/njol/skript/expressions/LitAt.java b/src/main/java/ch/njol/skript/expressions/LitAt.java
index f26b1db7143..fba2b58b59c 100644
--- a/src/main/java/ch/njol/skript/expressions/LitAt.java
+++ b/src/main/java/ch/njol/skript/expressions/LitAt.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import org.bukkit.event.Event;
diff --git a/src/main/java/ch/njol/skript/expressions/LitConsole.java b/src/main/java/ch/njol/skript/expressions/LitConsole.java
index 237cdb1dd06..23cac44ba93 100644
--- a/src/main/java/ch/njol/skript/expressions/LitConsole.java
+++ b/src/main/java/ch/njol/skript/expressions/LitConsole.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import org.bukkit.Bukkit;
diff --git a/src/main/java/ch/njol/skript/expressions/LitNewLine.java b/src/main/java/ch/njol/skript/expressions/LitNewLine.java
index fbe845946a3..8281f216be7 100644
--- a/src/main/java/ch/njol/skript/expressions/LitNewLine.java
+++ b/src/main/java/ch/njol/skript/expressions/LitNewLine.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import org.bukkit.event.Event;
diff --git a/src/main/java/ch/njol/skript/expressions/LitPi.java b/src/main/java/ch/njol/skript/expressions/LitPi.java
index b1c6fe4c976..b4dfdf30f5b 100644
--- a/src/main/java/ch/njol/skript/expressions/LitPi.java
+++ b/src/main/java/ch/njol/skript/expressions/LitPi.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions;
 
 import ch.njol.skript.Skript;
diff --git a/src/main/java/ch/njol/skript/expressions/arithmetic/ArithmeticChain.java b/src/main/java/ch/njol/skript/expressions/arithmetic/ArithmeticChain.java
index df80686010b..4625fb37726 100644
--- a/src/main/java/ch/njol/skript/expressions/arithmetic/ArithmeticChain.java
+++ b/src/main/java/ch/njol/skript/expressions/arithmetic/ArithmeticChain.java
@@ -1,38 +1,19 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions.arithmetic;
 
-import java.util.List;
-import java.util.function.Function;
-
-import org.bukkit.event.Event;
-
 import ch.njol.skript.lang.Expression;
 import ch.njol.skript.util.Utils;
-import ch.njol.util.Checker;
+import org.bukkit.event.Event;
 import org.jetbrains.annotations.Nullable;
+import org.skriptlang.skript.lang.arithmetic.Arithmetics;
 import org.skriptlang.skript.lang.arithmetic.Operation;
 import org.skriptlang.skript.lang.arithmetic.OperationInfo;
 import org.skriptlang.skript.lang.arithmetic.Operator;
-import org.skriptlang.skript.lang.arithmetic.Arithmetics;
 import org.skriptlang.skript.lang.converter.Converters;
 
+import java.util.List;
+import java.util.function.Function;
+import java.util.function.Predicate;
+
 /**
  * Represents a chain of arithmetic operations between two operands.
  *
@@ -43,7 +24,7 @@
 public class ArithmeticChain<L, R, T> implements ArithmeticGettable<T> {
 
 	@SuppressWarnings("unchecked")
-	private static final Checker<Object>[] CHECKERS = new Checker[] {
+	private static final Predicate<Object>[] CHECKERS = new Predicate[] {
 		o -> o.equals(Operator.ADDITION) || o.equals(Operator.SUBTRACTION),
 		o -> o.equals(Operator.MULTIPLICATION) || o.equals(Operator.DIVISION),
 		o -> o.equals(Operator.EXPONENTIATION)
@@ -129,7 +110,7 @@ public Class<? extends T> getReturnType() {
 	@Nullable
 	@SuppressWarnings("unchecked")
 	public static <L, R, T> ArithmeticGettable<T> parse(List<Object> chain) {
-		for (Checker<Object> checker : CHECKERS) {
+		for (Predicate<Object> checker : CHECKERS) {
 			int lastIndex = Utils.findLastIndex(chain, checker);
 
 			if (lastIndex != -1) {
diff --git a/src/main/java/ch/njol/skript/expressions/arithmetic/ArithmeticExpressionInfo.java b/src/main/java/ch/njol/skript/expressions/arithmetic/ArithmeticExpressionInfo.java
index 9f80830a541..8ee724a66c3 100644
--- a/src/main/java/ch/njol/skript/expressions/arithmetic/ArithmeticExpressionInfo.java
+++ b/src/main/java/ch/njol/skript/expressions/arithmetic/ArithmeticExpressionInfo.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions.arithmetic;
 
 import org.bukkit.event.Event;
diff --git a/src/main/java/ch/njol/skript/expressions/arithmetic/ArithmeticGettable.java b/src/main/java/ch/njol/skript/expressions/arithmetic/ArithmeticGettable.java
index 2bf076860df..14fdee7fe89 100644
--- a/src/main/java/ch/njol/skript/expressions/arithmetic/ArithmeticGettable.java
+++ b/src/main/java/ch/njol/skript/expressions/arithmetic/ArithmeticGettable.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions.arithmetic;
 
 import org.bukkit.event.Event;
diff --git a/src/main/java/ch/njol/skript/expressions/arithmetic/ExprArithmetic.java b/src/main/java/ch/njol/skript/expressions/arithmetic/ExprArithmetic.java
index 99026e9d40f..4916139842b 100644
--- a/src/main/java/ch/njol/skript/expressions/arithmetic/ExprArithmetic.java
+++ b/src/main/java/ch/njol/skript/expressions/arithmetic/ExprArithmetic.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions.arithmetic;
 
 import ch.njol.skript.Skript;
diff --git a/src/main/java/ch/njol/skript/expressions/arithmetic/NumberExpressionInfo.java b/src/main/java/ch/njol/skript/expressions/arithmetic/NumberExpressionInfo.java
index 6c8ede2fff9..ff2e7289935 100644
--- a/src/main/java/ch/njol/skript/expressions/arithmetic/NumberExpressionInfo.java
+++ b/src/main/java/ch/njol/skript/expressions/arithmetic/NumberExpressionInfo.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions.arithmetic;
 
 import ch.njol.skript.lang.Expression;
diff --git a/src/main/java/ch/njol/skript/expressions/arithmetic/Operator.java b/src/main/java/ch/njol/skript/expressions/arithmetic/Operator.java
index d3b983358fd..bc12caab9ee 100644
--- a/src/main/java/ch/njol/skript/expressions/arithmetic/Operator.java
+++ b/src/main/java/ch/njol/skript/expressions/arithmetic/Operator.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions.arithmetic;
 
 @SuppressWarnings("UnnecessaryBoxing")
diff --git a/src/main/java/ch/njol/skript/expressions/base/EventValueExpression.java b/src/main/java/ch/njol/skript/expressions/base/EventValueExpression.java
index 574969ce4c4..49b1a307639 100644
--- a/src/main/java/ch/njol/skript/expressions/base/EventValueExpression.java
+++ b/src/main/java/ch/njol/skript/expressions/base/EventValueExpression.java
@@ -1,28 +1,5 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions.base;
 
-import java.lang.reflect.Array;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Map.Entry;
-
 import ch.njol.skript.Skript;
 import ch.njol.skript.SkriptAPIException;
 import ch.njol.skript.classes.Changer;
@@ -39,11 +16,20 @@
 import ch.njol.skript.log.SkriptLogger;
 import ch.njol.skript.registrations.Classes;
 import ch.njol.skript.registrations.EventValues;
-import ch.njol.skript.util.Getter;
 import ch.njol.skript.util.Utils;
 import ch.njol.util.Kleenean;
+import org.skriptlang.skript.registration.SyntaxInfo;
+import org.skriptlang.skript.registration.SyntaxRegistry;
+import org.skriptlang.skript.util.Priority;
 import org.bukkit.event.Event;
+import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.Nullable;
+import org.skriptlang.skript.lang.converter.Converter;
+
+import java.lang.reflect.Array;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Map.Entry;
 
 /**
  * A useful class for creating default expressions. It simply returns the event value of the given type.
@@ -65,6 +51,36 @@
  */
 public class EventValueExpression<T> extends SimpleExpression<T> implements DefaultExpression<T> {
 
+	/**
+	 * A priority for {@link EventValueExpression}s.
+	 * They will be registered before {@link SyntaxInfo#COMBINED} expressions
+	 *  but after {@link SyntaxInfo#SIMPLE} expressions.
+	 */
+	@ApiStatus.Experimental
+	public static final Priority DEFAULT_PRIORITY = Priority.before(SyntaxInfo.COMBINED);
+
+	/**
+	 * Registers an event value expression with the provided pattern.
+	 * The syntax info will be forced to use the {@link #DEFAULT_PRIORITY} priority.
+	 * This also adds '[the]' to the start of the pattern.
+	 *
+	 * @param registry The SyntaxRegistry to register with.
+	 * @param expressionClass The EventValueExpression class being registered.
+	 * @param returnType The class representing the expression's return type.
+	 * @param pattern The pattern to match for creating this expression.
+	 * @param <T> The return type.
+	 * @param <E> The Expression type.
+	 * @return The registered {@link SyntaxInfo}.
+	 */
+	@ApiStatus.Experimental
+	public static <E extends EventValueExpression<T>, T> SyntaxInfo.Expression<E, T> register(SyntaxRegistry registry, Class<E> expressionClass, Class<T> returnType, String pattern) {
+		SyntaxInfo.Expression<E, T> info = SyntaxInfo.Expression.builder(expressionClass, returnType)
+				.priority(DEFAULT_PRIORITY)
+				.addPattern("[the] " + pattern)
+				.build();
+		registry.register(SyntaxRegistry.EXPRESSION, info);
+		return info;
+	}
 
 	/**
 	 * Registers an expression as {@link ExpressionType#EVENT} with the provided pattern.
@@ -78,7 +94,7 @@ public static <T> void register(Class<? extends EventValueExpression<T>> express
 		Skript.registerExpression(expression, type, ExpressionType.EVENT, "[the] " + pattern);
 	}
 
-	private final Map<Class<? extends Event>, Getter<? extends T, ?>> getters = new HashMap<>();
+	private final Map<Class<? extends Event>, Converter<?, ? extends T>> converters = new HashMap<>();
 
 	private final Class<?> componentType;
 	private final Class<? extends T> type;
@@ -133,24 +149,24 @@ public boolean init() {
 				return false;
 			}
 			for (Class<? extends Event> event : events) {
-				if (getters.containsKey(event)) {
-					hasValue = getters.get(event) != null;
+				if (converters.containsKey(event)) {
+					hasValue = converters.get(event) != null;
 					continue;
 				}
-				if (EventValues.hasMultipleGetters(event, type, getTime()) == Kleenean.TRUE) {
+				if (EventValues.hasMultipleConverters(event, type, getTime()) == Kleenean.TRUE) {
 					Noun typeName = Classes.getExactClassInfo(componentType).getName();
 					log.printError("There are multiple " + typeName.toString(true) + " in " + Utils.a(getParser().getCurrentEventName()) + " event. " +
 							"You must define which " + typeName + " to use.");
 					return false;
 				}
-				Getter<? extends T, ?> getter;
+				Converter<?, ? extends T> converter;
 				if (exact) {
-					getter = EventValues.getExactEventValueGetter(event, type, getTime());
+					converter = EventValues.getExactEventValueConverter(event, type, getTime());
 				} else {
-					getter = EventValues.getEventValueGetter(event, type, getTime());
+					converter = EventValues.getEventValueConverter(event, type, getTime());
 				}
-				if (getter != null) {
-					getters.put(event, getter);
+				if (converter != null) {
+					converters.put(event, converter);
 					hasValue = true;
 				}
 			}
@@ -186,19 +202,19 @@ protected T[] get(Event event) {
 	@Nullable
 	@SuppressWarnings("unchecked")
 	private <E extends Event> T getValue(E event) {
-		if (getters.containsKey(event.getClass())) {
-			final Getter<? extends T, ? super E> g = (Getter<? extends T, ? super E>) getters.get(event.getClass());
-			return g == null ? null : g.get(event);
+		if (converters.containsKey(event.getClass())) {
+			final Converter<? super E, ? extends T> g = (Converter<? super E, ? extends T>) converters.get(event.getClass());
+			return g == null ? null : g.convert(event);
 		}
 
-		for (final Entry<Class<? extends Event>, Getter<? extends T, ?>> p : getters.entrySet()) {
+		for (final Entry<Class<? extends Event>, Converter<?, ? extends T>> p : converters.entrySet()) {
 			if (p.getKey().isAssignableFrom(event.getClass())) {
-				getters.put(event.getClass(), p.getValue());
-				return p.getValue() == null ? null : ((Getter<? extends T, ? super E>) p.getValue()).get(event);
+				converters.put(event.getClass(), p.getValue());
+				return p.getValue() == null ? null : ((Converter<? super E, ? extends T>) p.getValue()).convert(event);
 			}
 		}
 
-		getters.put(event.getClass(), null);
+		converters.put(event.getClass(), null);
 
 		return null;
 	}
@@ -237,7 +253,7 @@ public boolean setTime(int time) {
 			if (has) {
 				super.setTime(time);
 				// Since the time was changed, we now need to re-initialize the getters we already got. START
-				getters.clear();
+				converters.clear();
 				init();
 				// END
 				return true;
diff --git a/src/main/java/ch/njol/skript/expressions/base/PropertyExpression.java b/src/main/java/ch/njol/skript/expressions/base/PropertyExpression.java
index 7f37230b26f..e331044076e 100644
--- a/src/main/java/ch/njol/skript/expressions/base/PropertyExpression.java
+++ b/src/main/java/ch/njol/skript/expressions/base/PropertyExpression.java
@@ -1,81 +1,164 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions.base;
 
-import org.bukkit.event.Event;
-import org.jetbrains.annotations.Nullable;
-
 import ch.njol.skript.Skript;
-import org.skriptlang.skript.lang.converter.Converter;
 import ch.njol.skript.lang.Expression;
 import ch.njol.skript.lang.ExpressionType;
 import ch.njol.skript.lang.SkriptParser.ParseResult;
 import ch.njol.skript.lang.SyntaxElement;
 import ch.njol.skript.lang.util.SimpleExpression;
-import org.skriptlang.skript.lang.converter.Converters;
 import ch.njol.util.Kleenean;
-
+import com.google.common.base.Preconditions;
 import java.util.Arrays;
+import org.bukkit.event.Event;
+import org.jetbrains.annotations.ApiStatus;
+import org.jetbrains.annotations.Nullable;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.UnknownNullability;
+import org.skriptlang.skript.lang.converter.Converter;
+import org.skriptlang.skript.lang.converter.Converters;
+import org.skriptlang.skript.registration.SyntaxInfo;
+import org.skriptlang.skript.registration.SyntaxRegistry;
+import org.skriptlang.skript.util.Priority;
 
 /**
  * Represents an expression which represents a property of another one. Remember to set the expression with {@link #setExpr(Expression)} in
  * {@link SyntaxElement#init(Expression[], int, Kleenean, ParseResult) init()}.
- * 
+ *
  * @see SimplePropertyExpression
  * @see #register(Class, Class, String, String)
  */
 public abstract class PropertyExpression<F, T> extends SimpleExpression<T> {
 
+	/**
+	 * A helper method to get the property patterns given a property, type, and default expression parameter.
+	 * @param property the property
+	 * @param fromType the type(s) that the property should apply to
+	 * @param defaultExpr whether the type(s) should be optional
+	 * @return an array of strings representing the patterns of the given property and type(s)
+	 * @throws IllegalArgumentException if property or fromType is null
+	 */
+	private static String[] patternsOf(String property, String fromType, boolean defaultExpr) {
+		Preconditions.checkNotNull(property, "property must be present");
+		Preconditions.checkNotNull(fromType, "fromType must be present");
+		String types = defaultExpr ? "[of %" + fromType + "%]" : "of %" + fromType + "%";
+		return new String[]{"[the] " + property + " " + types, "%" + fromType + "%'[s] " + property};
+	}
+
+	/**
+	 * Returns the standard property patterns given a property and type(s).
+	 * i.e. "[the] property of %types%" and "%types%'[s] property"
+	 *
+	 * @param property the property
+	 * @param fromType the type(s) that the property should apply to
+	 *
+	 * @return an array of strings representing the standard property patterns given a property and type(s)
+	 * @throws IllegalArgumentException if property or fromType is null
+	 */
+	public static String[] getPatterns(String property, String fromType) {
+		return patternsOf(property, fromType, false);
+	}
+
+	/**
+	 * Returns the property patterns given a property and type(s), with the latter being optional to force a default expression.
+	 * i.e. "[the] property [of %types%]" and "%types%'[s] property"
+	 *
+	 * @param property the property
+	 * @param fromType the type(s) that the property should apply to
+	 *
+	 * @return an array of strings representing the property patterns given a property and type(s), that force a default expression
+	 * @throws IllegalArgumentException if property or fromType is null
+	 */
+	public static String[] getDefaultPatterns(String property, String fromType) {
+		return patternsOf(property, fromType, true);
+	}
+
+	/**
+	 * A priority for {@link PropertyExpression}s.
+	 * They will be registered before {@link SyntaxInfo#PATTERN_MATCHES_EVERYTHING} expressions
+	 *  but after {@link SyntaxInfo#COMBINED} expressions.
+	 */
+	@ApiStatus.Experimental
+	public static final Priority DEFAULT_PRIORITY = Priority.before(SyntaxInfo.PATTERN_MATCHES_EVERYTHING);
+
+	/**
+	 * Registers an expression with the two default property patterns "property of %types%" and "%types%'[s] property"
+	 *
+	 * @param registry The SyntaxRegistry to register with.
+	 * @param expressionClass The PropertyExpression class being registered.
+	 * @param returnType The class representing the expression's return type.
+	 * @param property The name of the property.
+	 * @param fromType Should be plural to support multiple objects but doesn't have to be.
+	 * @param <T> The return type.
+	 * @param <E> The Expression type.
+	 * @return The registered {@link SyntaxInfo}.
+	 */
+	@ApiStatus.Experimental
+	public static <E extends Expression<T>, T> SyntaxInfo.Expression<E, T> register(SyntaxRegistry registry, Class<E> expressionClass, Class<T> returnType, String property, String fromType) {
+		SyntaxInfo.Expression<E, T> info = SyntaxInfo.Expression.builder(expressionClass, returnType)
+				.priority(DEFAULT_PRIORITY)
+				.addPatterns(getPatterns(property, fromType))
+				.build();
+		registry.register(SyntaxRegistry.EXPRESSION, info);
+		return info;
+	}
+
 	/**
 	 * Registers an expression as {@link ExpressionType#PROPERTY} with the two default property patterns "property of %types%" and "%types%'[s] property"
-	 * 
+	 *
 	 * @param expressionClass the PropertyExpression class being registered.
 	 * @param type the main expression type the property is based off of.
 	 * @param property the name of the property.
 	 * @param fromType should be plural to support multiple objects but doesn't have to be.
 	 */
 	public static <T> void register(Class<? extends Expression<T>> expressionClass, Class<T> type, String property, String fromType) {
-		Skript.registerExpression(expressionClass, type, ExpressionType.PROPERTY, "[the] " + property + " of %" + fromType + "%", "%" + fromType + "%'[s] " + property);
+		Skript.registerExpression(expressionClass, type, ExpressionType.PROPERTY, getPatterns(property, fromType));
+	}
+
+	/**
+	 * Registers an expression with the two default property patterns "property [of %types%]" and "%types%'[s] property"
+	 * This method also makes the expression type optional to force a default expression on the property expression.
+	 *
+	 * @param registry The SyntaxRegistry to register with.
+	 * @param expressionClass The PropertyExpression class being registered.
+	 * @param returnType The class representing the expression's return type.
+	 * @param property The name of the property.
+	 * @param fromType Should be plural to support multiple objects but doesn't have to be.
+	 * @param <T> The return type.
+	 * @param <E> The Expression type.
+	 * @return The registered {@link SyntaxInfo}.
+	 */
+	@ApiStatus.Experimental
+	public static <E extends Expression<T>, T> SyntaxInfo.Expression<E, T> registerDefault(SyntaxRegistry registry, Class<E> expressionClass, Class<T> returnType, String property, String fromType) {
+		SyntaxInfo.Expression<E, T> info = SyntaxInfo.Expression.builder(expressionClass, returnType)
+				.priority(DEFAULT_PRIORITY)
+				.addPatterns(getDefaultPatterns(property, fromType))
+				.build();
+		registry.register(SyntaxRegistry.EXPRESSION, info);
+		return info;
 	}
 
 	/**
 	 * Registers an expression as {@link ExpressionType#PROPERTY} with the two default property patterns "property [of %types%]" and "%types%'[s] property"
 	 * This method also makes the expression type optional to force a default expression on the property expression.
-	 * 
+	 *
 	 * @param expressionClass the PropertyExpression class being registered.
 	 * @param type the main expression type the property is based off of.
 	 * @param property the name of the property.
 	 * @param fromType should be plural to support multiple objects but doesn't have to be.
 	 */
 	public static <T> void registerDefault(Class<? extends Expression<T>> expressionClass, Class<T> type, String property, String fromType) {
-		Skript.registerExpression(expressionClass, type, ExpressionType.PROPERTY, "[the] " + property + " [of %" + fromType + "%]", "%" + fromType + "%'[s] " + property);
+		Skript.registerExpression(expressionClass, type, ExpressionType.PROPERTY, getDefaultPatterns(property, fromType));
 	}
 
-	@Nullable
-	private Expression<? extends F> expr;
+	private @UnknownNullability Expression<? extends F> expr;
 
 	/**
 	 * Sets the expression this expression represents a property of. No reference to the expression should be kept.
-	 * 
-	 * @param expr
+	 *
+	 * @param expr The expression this expression represents a property of.
 	 */
-	protected final void setExpr(Expression<? extends F> expr) {
+	protected final void setExpr(@NotNull Expression<? extends F> expr) {
+		Preconditions.checkNotNull(expr, "The expr param cannot be null");
 		this.expr = expr;
 	}
 
@@ -98,7 +181,7 @@ public final T[] getAll(Event event) {
 	 * Converts the given source object(s) to the correct type.
 	 * <p>
 	 * Please note that the returned array must neither be null nor contain any null elements!
-	 * 
+	 *
 	 * @param event the event involved at the time of runtime calling.
 	 * @param source the array of the objects from the expressions.
 	 * @return An array of the converted objects, which may contain less elements than the source array, but must not be null.
@@ -112,11 +195,10 @@ public final T[] getAll(Event event) {
 	 * @return An array containing the converted values
 	 * @throws ArrayStoreException if the converter returned invalid values
 	 */
-	@SuppressWarnings("deprecation") // for backwards compatibility
-	protected T[] get(final F[] source, final ch.njol.skript.classes.Converter<? super F, ? extends T> converter) {
+	protected T[] get(final F[] source, Converter<? super F, ? extends T> converter) {
 		assert source != null;
 		assert converter != null;
-		return ch.njol.skript.registrations.Converters.convertUnsafe(source, getReturnType(), converter);
+		return Converters.convertUnsafe(source, getReturnType(), converter);
 	}
 
 	@Override
diff --git a/src/main/java/ch/njol/skript/expressions/base/SectionExpression.java b/src/main/java/ch/njol/skript/expressions/base/SectionExpression.java
new file mode 100644
index 00000000000..ab38dc86324
--- /dev/null
+++ b/src/main/java/ch/njol/skript/expressions/base/SectionExpression.java
@@ -0,0 +1,166 @@
+package ch.njol.skript.expressions.base;
+
+import ch.njol.skript.Skript;
+import ch.njol.skript.config.SectionNode;
+import ch.njol.skript.lang.*;
+import ch.njol.skript.lang.SkriptParser.ParseResult;
+import ch.njol.skript.lang.parser.ParserInstance;
+import ch.njol.skript.lang.util.SimpleExpression;
+import ch.njol.util.Kleenean;
+import org.bukkit.event.Event;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.List;
+
+/**
+ * An implementation of the {@link Expression} interface that is allowed to start a section.
+ * <pre>{@code
+ * 	set {var} to (my section expression):
+ *      this is inside a section
+ *      this section can be 'managed' by (my section expression)
+ * }</pre>
+ * <br/>
+ * <br/>
+ * A section expression can be used in any expression slot, provided that:
+ * <ol>
+ *     <li>The line itself is not already a {@link Section} or an {@link EffectSection}.</li>
+ *     <li>The line does not already contain another {@link SectionExpression}.</li>
+ * </ol>
+ * <br/>
+ * <br/>
+ * The intended purpose of section expressions is to make features like the below possible,
+ * without the need to modify individual effect classes:
+ * <pre>{@code
+ * 	set {var} to a new lambda:
+ *      broadcast "hello"
+ *      # this section is managed by `a new lambda` rather than EffChange
+ * }</pre>
+ * <br/>
+ * <br/>
+ * Please note that section expressions will not be given a {@link SectionNode} during `init`
+ * if they are used in a line <b>that does not start a section</b>!
+ * It is up to the implementation to check whether this is provided.
+ * <p>
+ * Section node provided:
+ * <pre>{@code
+ * 	set {var} to a new lambda:
+ *      broadcast "hello"
+ * }</pre>
+ * <p>
+ * Section node not provided:
+ * <pre>{@code
+ * 	set {var} to a new lambda
+ * }</pre>
+ * <br/>
+ * <br/>
+ * Please also note that expressions are not 'executed' individually as effects/sections are,
+ * and so some behaviour (such as trigger items, orders, etc.) may be different from a regular section.
+ *
+ * @see Skript#registerExpression(Class, Class, ExpressionType, String...)
+ * @see Section
+ * @see SimpleExpression
+ */
+public abstract class SectionExpression<Value> extends SimpleExpression<Value> {
+
+	protected final ExpressionSection section = new ExpressionSection(this);
+
+	/**
+	 * Called just after the constructor.
+	 *
+	 * @param expressions all %expr%s included in the matching pattern in the order they appear in the pattern. If an optional value was left out, it will still be included in this list
+	 *            holding the default value of the desired type, which usually depends on the event
+	 * @param pattern The index of the pattern which matched
+	 * @param delayed Whether this expression is used after a delay or not (i.e. if the event has already passed when this expression will be called)
+	 * @param result Additional information about the match
+	 * @param node The section node representing the un-handled code in the body of the approaching section. If this expression does not start a section, the node will be null.
+	 * @param triggerItems A list of preceding trigger nodes before this line
+	 *
+	 * @return Whether this expression was initialised successfully. An error should be printed prior to returning false to specify the cause.
+	 */
+	public abstract boolean init(Expression<?>[] expressions,
+								 int pattern,
+								 Kleenean delayed,
+								 ParseResult result,
+								 @Nullable SectionNode node,
+								 @Nullable List<TriggerItem> triggerItems);
+
+	@Override
+	public final boolean init(Expression<?>[] expressions, int matchedPattern, Kleenean isDelayed,
+                              ParseResult parseResult) {
+		return section.init(expressions, matchedPattern, isDelayed, parseResult);
+	}
+
+	/**
+	 * @return A dummy trigger item representing the section belonging to this
+	 */
+	public final Section getAsSection() {
+		return section;
+	}
+
+	/**
+	 * Loads the code in the given {@link SectionNode},
+	 * appropriately modifying {@link ParserInstance#getCurrentSections()}.
+	 * <br>
+	 * This method differs from {@link #loadCode(SectionNode)} in that it
+	 * is meant for code that will be executed at another time and potentially with different context.
+	 * The section's contents are parsed with the understanding that they have no relation
+	 *  to the section itself, along with any other code that may come before and after the section.
+	 * The {@link ParserInstance} is modified to reflect that understanding.
+	 *
+	 * @param sectionNode The section node to load.
+	 * @param name The name of the event(s) being used.
+	 * @param afterLoading A Runnable to execute after the SectionNode has been loaded.
+	 * This occurs before {@link ParserInstance} states are reset.
+	 * @param events The event(s) during the section's execution.
+	 * @return A trigger containing the loaded section. This should be stored and used
+	 * to run the section one or more times.
+	 */
+	protected Trigger loadCode(SectionNode sectionNode, String name,
+							   @Nullable Runnable afterLoading, Class<? extends Event>... events) {
+		return section.loadCodeTask(sectionNode, name, afterLoading, events);
+	}
+
+	/**
+	 * Loads the code in the given {@link SectionNode},
+	 * appropriately modifying {@link ParserInstance#getCurrentSections()}.
+	 * <br>
+	 * This method itself does not modify {@link ParserInstance#getHasDelayBefore()}
+	 * (although the loaded code may change it), the calling code must deal with this.
+	 */
+	protected void loadCode(SectionNode sectionNode) {
+		this.section.loadCode(sectionNode);
+	}
+
+	/**
+	 * Loads the code using {@link #loadCode(SectionNode)}.
+	 * <br>
+	 * This method also adjusts {@link ParserInstance#getHasDelayBefore()} to expect the code
+	 * to be called zero or more times. This is done by setting {@code hasDelayBefore} to {@link Kleenean#UNKNOWN}
+	 * if the loaded section has a possible or definite delay in it.
+	 */
+	protected void loadOptionalCode(SectionNode sectionNode) {
+		this.section.loadOptionalCode(sectionNode);
+	}
+
+	/**
+	 * Establishes the {@link TriggerItem} tree of this section
+	 *  without modifying {@link ParserInstance#getCurrentSections()}.
+	 */
+	protected void setTriggerItems(List<TriggerItem> items) {
+		this.section.setTriggerItems(items);
+	}
+
+	/**
+	 * Executes the code within the section associated with this expression.
+	 * Before calling this method, the section must have been loaded through:
+	 * {@link #loadCode(SectionNode)},
+	 * {@link #loadOptionalCode(SectionNode)},
+	 * or {@link #setTriggerItems(List)}.
+	 * @param event The event to pass as context.
+	 * @return False if an exception occurred while executing the section.
+	 */
+	protected boolean runSection(Event event) {
+		return this.section.runSection(event);
+	}
+
+}
diff --git a/src/main/java/ch/njol/skript/expressions/base/SimplePropertyExpression.java b/src/main/java/ch/njol/skript/expressions/base/SimplePropertyExpression.java
index 09d443c53a3..07e9afcf8c8 100644
--- a/src/main/java/ch/njol/skript/expressions/base/SimplePropertyExpression.java
+++ b/src/main/java/ch/njol/skript/expressions/base/SimplePropertyExpression.java
@@ -1,31 +1,14 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions.base;
 
-import ch.njol.skript.classes.Converter;
-import org.bukkit.event.Event;
-import org.jetbrains.annotations.Nullable;
-
+import ch.njol.skript.config.Node;
 import ch.njol.skript.lang.Expression;
 import ch.njol.skript.lang.SkriptParser.ParseResult;
 import ch.njol.skript.util.LiteralUtils;
 import ch.njol.util.Kleenean;
+import org.bukkit.event.Event;
+import org.jetbrains.annotations.Nullable;
+import org.skriptlang.skript.log.runtime.SyntaxRuntimeErrorProducer;
+import org.skriptlang.skript.lang.converter.Converter;
 
 /**
  * A base class for property expressions that requires only few overridden methods
@@ -33,9 +16,11 @@
  * @see PropertyExpression
  * @see PropertyExpression#register(Class, Class, String, String)
  */
-@SuppressWarnings("deprecation") // for backwards compatibility
-public abstract class SimplePropertyExpression<F, T> extends PropertyExpression<F, T> implements Converter<F, T> {
+public abstract class SimplePropertyExpression<F, T> extends PropertyExpression<F, T> implements Converter<F, T>, SyntaxRuntimeErrorProducer {
 
+	private Node node;
+	protected String rawExpr;
+  
 	@Override
 	@SuppressWarnings("unchecked")
 	public boolean init(Expression<?>[] expressions, int matchedPattern, Kleenean isDelayed, ParseResult parseResult) {
@@ -44,6 +29,8 @@ public boolean init(Expression<?>[] expressions, int matchedPattern, Kleenean is
 			return LiteralUtils.canInitSafely(getExpr());
 		}
 		setExpr((Expression<? extends F>) expressions[0]);
+		node = getParser().getNode();
+		rawExpr = parseResult.expr;
 		return true;
 	}
 
@@ -56,6 +43,11 @@ protected T[] get(Event event, F[] source) {
 		return super.get(source, this);
 	}
 
+	@Override
+	public Node getNode() {
+		return node;
+	}
+
 	/**
 	 * Used to collect the property type used in the register method.
 	 * This forms the toString of this SimplePropertyExpression.
diff --git a/src/main/java/ch/njol/skript/expressions/base/WrapperExpression.java b/src/main/java/ch/njol/skript/expressions/base/WrapperExpression.java
index 63a8cee6635..f80c584d3fa 100644
--- a/src/main/java/ch/njol/skript/expressions/base/WrapperExpression.java
+++ b/src/main/java/ch/njol/skript/expressions/base/WrapperExpression.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.expressions.base;
 
 import ch.njol.skript.classes.Changer.ChangeMode;
diff --git a/src/main/java/ch/njol/skript/hooks/Hook.java b/src/main/java/ch/njol/skript/hooks/Hook.java
index c0d415c2786..cfeb5ecf5c2 100644
--- a/src/main/java/ch/njol/skript/hooks/Hook.java
+++ b/src/main/java/ch/njol/skript/hooks/Hook.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.hooks;
 
 import java.io.IOException;
diff --git a/src/main/java/ch/njol/skript/hooks/VaultHook.java b/src/main/java/ch/njol/skript/hooks/VaultHook.java
index 8377e8bc1d8..3412c3df62c 100644
--- a/src/main/java/ch/njol/skript/hooks/VaultHook.java
+++ b/src/main/java/ch/njol/skript/hooks/VaultHook.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.hooks;
 
 import java.io.IOException;
diff --git a/src/main/java/ch/njol/skript/hooks/chat/expressions/ExprPrefixSuffix.java b/src/main/java/ch/njol/skript/hooks/chat/expressions/ExprPrefixSuffix.java
index 802d09ed6c0..ddd065e331e 100644
--- a/src/main/java/ch/njol/skript/hooks/chat/expressions/ExprPrefixSuffix.java
+++ b/src/main/java/ch/njol/skript/hooks/chat/expressions/ExprPrefixSuffix.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.hooks.chat.expressions;
 
 import ch.njol.skript.classes.Changer.ChangeMode;
@@ -34,9 +16,8 @@
 import org.bukkit.event.Event;
 import org.jetbrains.annotations.Nullable;
 
-/**
- * @author Peter Güttinger
- */
+import java.util.concurrent.CompletableFuture;
+
 @Name("Prefix/Suffix")
 @Description("The prefix or suffix as defined in the server's chat plugin.")
 @Examples({
@@ -44,56 +25,71 @@
 	"\tcancel event",
 	"\tbroadcast \"%player's prefix%%player's display name%%player's suffix%: %message%\" to the player's world",
 	"",
-	"set the player's prefix to \"[&lt;red&gt;Admin<reset>] \""
+	"set the player's prefix to \"[&lt;red&gt;Admin<reset>] \"",
+	"",
+	"clear player's prefix"
 })
-@Since("2.0")
+@Since("2.0, 2.10 (delete)")
 @RequiredPlugins({"Vault", "a chat plugin that supports Vault"})
 public class ExprPrefixSuffix extends SimplePropertyExpression<Player, String> {
 	static {
-		register(ExprPrefixSuffix.class, String.class, "[chat] (1¦prefix|2¦suffix)", "players");
+		register(ExprPrefixSuffix.class, String.class, "[chat] (1:prefix|2:suffix)", "players");
 	}
 	
 	private boolean prefix;
 	
 	@Override
-	public boolean init(final Expression<?>[] exprs, final int matchedPattern, final Kleenean isDelayed, final ParseResult parseResult) {
+	public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelayed, ParseResult parseResult) {
 		prefix = parseResult.mark == 1;
 		return super.init(exprs, matchedPattern, isDelayed, parseResult);
 	}
 	
 	@Override
-	public String convert(final Player p) {
-		return Utils.replaceChatStyles(prefix ? "" + VaultHook.chat.getPlayerPrefix(p) : "" + VaultHook.chat.getPlayerSuffix(p));
+	public String convert(Player player) {
+		return Utils.replaceChatStyles(prefix ? VaultHook.chat.getPlayerPrefix(player) : VaultHook.chat.getPlayerSuffix(player));
 	}
-	
+
 	@Override
-	protected String getPropertyName() {
-		return prefix ? "prefix" : "suffix";
+	public Class<?> @Nullable [] acceptChange(ChangeMode mode) {
+		return switch (mode) {
+			case SET -> new Class[] {String.class};
+			case RESET, DELETE -> new Class<?>[0];
+			default -> null;
+		};
 	}
-	
+
 	@Override
-	public Class<? extends String> getReturnType() {
-		return String.class;
+	public void change(Event event,  Object @Nullable [] delta, ChangeMode mode) {
+		CompletableFuture.runAsync(() -> {
+			for (Player player : getExpr().getArray(event)) {
+				switch (mode) {
+					case SET -> {
+						if (prefix) {
+							VaultHook.chat.setPlayerPrefix(player, (String) delta[0]);
+						} else {
+							VaultHook.chat.setPlayerSuffix(player, (String) delta[0]);
+						}
+					}
+					case RESET, DELETE -> {
+						if (prefix) {
+							VaultHook.chat.setPlayerPrefix(player, null);
+						} else {
+							VaultHook.chat.setPlayerSuffix(player, null);
+						}
+					}
+				}
+			}
+		}).join();
 	}
-	
+
 	@Override
-	@Nullable
-	public Class<?>[] acceptChange(final ChangeMode mode) {
-		if (mode == ChangeMode.SET)
-			return new Class[] {String.class};
-		return null;
+	public Class<? extends String> getReturnType() {
+		return String.class;
 	}
-	
+
 	@Override
-	public void change(final Event e, final @Nullable Object[] delta, final ChangeMode mode) {
-		assert mode == ChangeMode.SET;
-		assert delta != null;
-		for (final Player p : getExpr().getArray(e)) {
-			if (prefix)
-				VaultHook.chat.setPlayerPrefix(p, (String) delta[0]);
-			else
-				VaultHook.chat.setPlayerSuffix(p, (String) delta[0]);
-		}
+	protected String getPropertyName() {
+		return prefix ? "prefix" : "suffix";
 	}
 	
 }
diff --git a/src/main/java/ch/njol/skript/hooks/economy/classes/Money.java b/src/main/java/ch/njol/skript/hooks/economy/classes/Money.java
index bc4d550dabf..821d2824149 100644
--- a/src/main/java/ch/njol/skript/hooks/economy/classes/Money.java
+++ b/src/main/java/ch/njol/skript/hooks/economy/classes/Money.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.hooks.economy.classes;
 
 import ch.njol.skript.Skript;
@@ -158,7 +140,7 @@ private static Money parseMoney(String s, String addition) {
 
 	@Nullable
 	private static Double parseDouble(String s) {
-		if (!JavaClasses.NUMBER_PATTERN.matcher(s).matches())
+		if (!JavaClasses.DECIMAL_PATTERN.matcher(s).matches())
 			return null;
 		try {
 			return Double.parseDouble(s);
diff --git a/src/main/java/ch/njol/skript/hooks/economy/expressions/ExprBalance.java b/src/main/java/ch/njol/skript/hooks/economy/expressions/ExprBalance.java
index 4c02eea8e33..609720efe0e 100644
--- a/src/main/java/ch/njol/skript/hooks/economy/expressions/ExprBalance.java
+++ b/src/main/java/ch/njol/skript/hooks/economy/expressions/ExprBalance.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.hooks.economy.expressions;
 
 import org.bukkit.OfflinePlayer;
diff --git a/src/main/java/ch/njol/skript/hooks/permission/expressions/ExprAllGroups.java b/src/main/java/ch/njol/skript/hooks/permission/expressions/ExprAllGroups.java
index aecf98fa30e..b7ad68b6e74 100644
--- a/src/main/java/ch/njol/skript/hooks/permission/expressions/ExprAllGroups.java
+++ b/src/main/java/ch/njol/skript/hooks/permission/expressions/ExprAllGroups.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.hooks.permission.expressions;
 
 import ch.njol.skript.Skript;
diff --git a/src/main/java/ch/njol/skript/hooks/permission/expressions/ExprGroup.java b/src/main/java/ch/njol/skript/hooks/permission/expressions/ExprGroup.java
index 054d065c96d..a04fceea5ef 100644
--- a/src/main/java/ch/njol/skript/hooks/permission/expressions/ExprGroup.java
+++ b/src/main/java/ch/njol/skript/hooks/permission/expressions/ExprGroup.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.hooks.permission.expressions;
 
 import ch.njol.skript.Skript;
diff --git a/src/main/java/ch/njol/skript/hooks/regions/GriefPreventionHook.java b/src/main/java/ch/njol/skript/hooks/regions/GriefPreventionHook.java
index a7fa61cb376..77f1722acfa 100644
--- a/src/main/java/ch/njol/skript/hooks/regions/GriefPreventionHook.java
+++ b/src/main/java/ch/njol/skript/hooks/regions/GriefPreventionHook.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.hooks.regions;
 
 import java.io.IOException;
diff --git a/src/main/java/ch/njol/skript/hooks/regions/PreciousStonesHook.java b/src/main/java/ch/njol/skript/hooks/regions/PreciousStonesHook.java
index a0094373307..82e8a318e1e 100644
--- a/src/main/java/ch/njol/skript/hooks/regions/PreciousStonesHook.java
+++ b/src/main/java/ch/njol/skript/hooks/regions/PreciousStonesHook.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.hooks.regions;
 
 import static ch.njol.skript.variables.Variables.yggdrasil;
diff --git a/src/main/java/ch/njol/skript/hooks/regions/RegionsPlugin.java b/src/main/java/ch/njol/skript/hooks/regions/RegionsPlugin.java
index c2f2fb46d32..b729a69839d 100644
--- a/src/main/java/ch/njol/skript/hooks/regions/RegionsPlugin.java
+++ b/src/main/java/ch/njol/skript/hooks/regions/RegionsPlugin.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.hooks.regions;
 
 import java.io.IOException;
diff --git a/src/main/java/ch/njol/skript/hooks/regions/ResidenceHook.java b/src/main/java/ch/njol/skript/hooks/regions/ResidenceHook.java
index d342cf8840b..e966dba318c 100644
--- a/src/main/java/ch/njol/skript/hooks/regions/ResidenceHook.java
+++ b/src/main/java/ch/njol/skript/hooks/regions/ResidenceHook.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.hooks.regions;
 
 import java.io.IOException;
diff --git a/src/main/java/ch/njol/skript/hooks/regions/WorldGuardHook.java b/src/main/java/ch/njol/skript/hooks/regions/WorldGuardHook.java
index f9cd9bc0670..7dc975b4acd 100644
--- a/src/main/java/ch/njol/skript/hooks/regions/WorldGuardHook.java
+++ b/src/main/java/ch/njol/skript/hooks/regions/WorldGuardHook.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.hooks.regions;
 
 import java.io.IOException;
diff --git a/src/main/java/ch/njol/skript/hooks/regions/classes/Region.java b/src/main/java/ch/njol/skript/hooks/regions/classes/Region.java
index fe60beef3f5..631f38e2a46 100644
--- a/src/main/java/ch/njol/skript/hooks/regions/classes/Region.java
+++ b/src/main/java/ch/njol/skript/hooks/regions/classes/Region.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.hooks.regions.classes;
 
 import ch.njol.skript.Skript;
diff --git a/src/main/java/ch/njol/skript/hooks/regions/conditions/CondCanBuild.java b/src/main/java/ch/njol/skript/hooks/regions/conditions/CondCanBuild.java
index 5b9ac5390b9..79fef6b1330 100644
--- a/src/main/java/ch/njol/skript/hooks/regions/conditions/CondCanBuild.java
+++ b/src/main/java/ch/njol/skript/hooks/regions/conditions/CondCanBuild.java
@@ -1,44 +1,20 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.hooks.regions.conditions;
 
 import ch.njol.skript.Skript;
-import ch.njol.skript.doc.Description;
-import ch.njol.skript.doc.Examples;
-import ch.njol.skript.doc.Name;
-import ch.njol.skript.doc.RequiredPlugins;
-import ch.njol.skript.doc.Since;
+import ch.njol.skript.doc.*;
 import ch.njol.skript.hooks.regions.RegionsPlugin;
 import ch.njol.skript.lang.Condition;
 import ch.njol.skript.lang.Expression;
 import ch.njol.skript.lang.SkriptParser.ParseResult;
 import ch.njol.skript.util.Direction;
-import ch.njol.util.Checker;
 import ch.njol.util.Kleenean;
 import org.bukkit.Location;
 import org.bukkit.entity.Player;
 import org.bukkit.event.Event;
 import org.jetbrains.annotations.Nullable;
 
-/**
- * @author Peter Güttinger
- */
+import java.util.function.Predicate;
+
 @Name("Can Build")
 @Description({
 	"Tests whether a player is allowed to build at a certain location.",
@@ -46,12 +22,12 @@
 })
 @Examples({
 	"command /setblock &lt;material&gt;:",
-	"\tdescription: set the block at your crosshair to a different type",
-	"\ttrigger:",
-	"\t\tplayer cannot build at the targeted block:",
-	"\t\t\tmessage \"You do not have permission to change blocks there!\"",
-	"\t\t\tstop",
-	"\t\tset the targeted block to argument"
+		"\tdescription: set the block at your crosshair to a different type",
+		"\ttrigger:",
+			"\t\tplayer cannot build at the targeted block:",
+				"\t\t\tmessage \"You do not have permission to change blocks there!\"",
+				"\t\t\tstop",
+			"\t\tset the targeted block to argument"
 })
 @Since("2.0")
 @RequiredPlugins("Supported regions plugin")
@@ -61,12 +37,12 @@ public class CondCanBuild extends Condition {
 				"%players% (can|(is|are) allowed to) build %directions% %locations%",
 				"%players% (can('t|not)|(is|are)(n't| not) allowed to) build %directions% %locations%");
 	}
-	
+
 	@SuppressWarnings("null")
 	private Expression<Player> players;
 	@SuppressWarnings("null")
 	Expression<Location> locations;
-	
+
 	@SuppressWarnings({"unchecked", "null"})
 	@Override
 	public boolean init(final Expression<?>[] exprs, final int matchedPattern, final Kleenean isDelayed, final ParseResult parseResult) {
@@ -75,25 +51,17 @@ public boolean init(final Expression<?>[] exprs, final int matchedPattern, final
 		setNegated(matchedPattern == 1);
 		return true;
 	}
-	
+
 	@Override
-	public boolean check(final Event e) {
-		return players.check(e, new Checker<Player>() {
-			@Override
-			public boolean check(final Player p) {
-				return locations.check(e, new Checker<Location>() {
-					@Override
-					public boolean check(final Location l) {
-						return RegionsPlugin.canBuild(p, l);
-					}
-				}, isNegated());
-			}
-		});
+	public boolean check(Event event) {
+		return players.check(event,
+			player -> locations.check(event,
+				location -> RegionsPlugin.canBuild(player, location), isNegated()));
 	}
-	
+
 	@Override
 	public String toString(final @Nullable Event e, final boolean debug) {
 		return players.toString(e, debug) + " can build " + locations.toString(e, debug);
 	}
-	
+
 }
diff --git a/src/main/java/ch/njol/skript/hooks/regions/conditions/CondIsMember.java b/src/main/java/ch/njol/skript/hooks/regions/conditions/CondIsMember.java
index b89c9aae201..17c2c5843b6 100644
--- a/src/main/java/ch/njol/skript/hooks/regions/conditions/CondIsMember.java
+++ b/src/main/java/ch/njol/skript/hooks/regions/conditions/CondIsMember.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.hooks.regions.conditions;
 
 import ch.njol.skript.Skript;
@@ -28,12 +10,13 @@
 import ch.njol.skript.lang.Condition;
 import ch.njol.skript.lang.Expression;
 import ch.njol.skript.lang.SkriptParser.ParseResult;
-import ch.njol.util.Checker;
 import ch.njol.util.Kleenean;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.event.Event;
 import org.jetbrains.annotations.Nullable;
 
+import java.util.function.Predicate;
+
 /**
  * @author Peter Güttinger
  */
@@ -54,14 +37,14 @@ public class CondIsMember extends Condition {
 				"%offlineplayers% (is|are) (0¦[a] member|1¦[(the|an)] owner) of [[the] region] %regions%",
 				"%offlineplayers% (is|are)(n't| not) (0¦[a] member|1¦[(the|an)] owner) of [[the] region] %regions%");
 	}
-	
+
 	@SuppressWarnings("null")
 	private Expression<OfflinePlayer> players;
 	@SuppressWarnings("null")
 	Expression<Region> regions;
-	
+
 	boolean owner;
-	
+
 	@SuppressWarnings({"null", "unchecked"})
 	@Override
 	public boolean init(final Expression<?>[] exprs, final int matchedPattern, final Kleenean isDelayed, final ParseResult parseResult) {
@@ -71,22 +54,14 @@ public boolean init(final Expression<?>[] exprs, final int matchedPattern, final
 		setNegated(matchedPattern == 1);
 		return true;
 	}
-	
+
 	@Override
-	public boolean check(final Event e) {
-		return players.check(e, new Checker<OfflinePlayer>() {
-			@Override
-			public boolean check(final OfflinePlayer p) {
-				return regions.check(e, new Checker<Region>() {
-					@Override
-					public boolean check(final Region r) {
-						return owner ? r.isOwner(p) : r.isMember(p);
-					}
-				}, isNegated());
-			}
-		});
+	public boolean check(Event event) {
+		return players.check(event,
+			player -> regions.check(event,
+				region -> owner ? region.isOwner(player) : region.isMember(player), isNegated()));
 	}
-	
+
 	@Override
 	public String toString(final @Nullable Event e, final boolean debug) {
 		return players.toString(e, debug) + " " + (players.isSingle() ? "is" : "are") + (isNegated() ? " not" : "") + " " + (owner ? "owner" : "member") + (players.isSingle() ? "" : "s") + " of " + regions.toString(e, debug);
diff --git a/src/main/java/ch/njol/skript/hooks/regions/conditions/CondRegionContains.java b/src/main/java/ch/njol/skript/hooks/regions/conditions/CondRegionContains.java
index 340540f0180..66230a7ee6f 100644
--- a/src/main/java/ch/njol/skript/hooks/regions/conditions/CondRegionContains.java
+++ b/src/main/java/ch/njol/skript/hooks/regions/conditions/CondRegionContains.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.hooks.regions.conditions;
 
 import ch.njol.skript.Skript;
@@ -29,15 +11,13 @@
 import ch.njol.skript.lang.Expression;
 import ch.njol.skript.lang.SkriptParser.ParseResult;
 import ch.njol.skript.util.Direction;
-import ch.njol.util.Checker;
 import ch.njol.util.Kleenean;
 import org.bukkit.Location;
 import org.bukkit.event.Event;
 import org.jetbrains.annotations.Nullable;
 
-/**
- * @author Peter Güttinger
- */
+import java.util.function.Predicate;
+
 @Name("Region Contains")
 @Description({
 	"Checks whether a location is contained in a particular <a href='./classes.html#region'>region</a>.",
@@ -47,23 +27,24 @@
 	"player is in the region {regions::3}",
 	"",
 	"on region enter:",
-	"\tregion contains {flags.%world%.red}",
-	"\tmessage \"The red flag is near!\""
+		"\tregion contains {flags.%world%.red}",
+		"\tmessage \"The red flag is near!\""
 })
 @Since("2.1")
 @RequiredPlugins("Supported regions plugin")
 public class CondRegionContains extends Condition {
+
 	static {
 		Skript.registerCondition(CondRegionContains.class,
 				"[[the] region] %regions% contain[s] %directions% %locations%", "%locations% (is|are) ([contained] in|part of) [[the] region] %regions%",
 				"[[the] region] %regions% (do|does)(n't| not) contain %directions% %locations%", "%locations% (is|are)(n't| not) (contained in|part of) [[the] region] %regions%");
 	}
-	
+
 	@SuppressWarnings("null")
 	private Expression<Region> regions;
 	@SuppressWarnings("null")
 	Expression<Location> locs;
-	
+
 	@SuppressWarnings({"unchecked", "null"})
 	@Override
 	public boolean init(final Expression<?>[] exprs, final int matchedPattern, final Kleenean isDelayed, final ParseResult parseResult) {
@@ -77,25 +58,16 @@ public boolean init(final Expression<?>[] exprs, final int matchedPattern, final
 		setNegated(matchedPattern >= 2);
 		return true;
 	}
-	
+
 	@Override
-	public boolean check(final Event e) {
-		return regions.check(e, new Checker<Region>() {
-			@Override
-			public boolean check(final Region r) {
-				return locs.check(e, new Checker<Location>() {
-					@Override
-					public boolean check(final Location l) {
-						return r.contains(l);
-					}
-				}, isNegated());
-			}
-		});
+	public boolean check(Event event) {
+		return regions.check(event,
+			region -> locs.check(event, region::contains, isNegated()));
 	}
-	
+
 	@Override
 	public String toString(final @Nullable Event e, final boolean debug) {
 		return regions.toString(e, debug) + " contain" + (regions.isSingle() ? "s" : "") + " " + locs.toString(e, debug);
 	}
-	
+
 }
diff --git a/src/main/java/ch/njol/skript/hooks/regions/events/EvtRegionBorder.java b/src/main/java/ch/njol/skript/hooks/regions/events/EvtRegionBorder.java
index d338b8f9fcb..62a07f47f32 100644
--- a/src/main/java/ch/njol/skript/hooks/regions/events/EvtRegionBorder.java
+++ b/src/main/java/ch/njol/skript/hooks/regions/events/EvtRegionBorder.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.hooks.regions.events;
 
 import ch.njol.skript.Skript;
@@ -27,7 +9,6 @@
 import ch.njol.skript.lang.SkriptParser.ParseResult;
 import ch.njol.skript.lang.Trigger;
 import ch.njol.skript.registrations.EventValues;
-import ch.njol.skript.util.Getter;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.entity.Player;
@@ -60,18 +41,8 @@ public class EvtRegionBorder extends SkriptEvent {
 					"\tmessage \"Leaving %region%.\""
 				).since("2.1")
 				.requiredPlugins("Supported regions plugin");
-		EventValues.registerEventValue(RegionBorderEvent.class, Region.class, new Getter<Region, RegionBorderEvent>() {
-			@Override
-			public Region get(RegionBorderEvent e) {
-				return e.getRegion();
-			}
-		}, EventValues.TIME_NOW);
-		EventValues.registerEventValue(RegionBorderEvent.class, Player.class, new Getter<Player, RegionBorderEvent>() {
-			@Override
-			public Player get(RegionBorderEvent e) {
-				return e.getPlayer();
-			}
-		}, EventValues.TIME_NOW);
+		EventValues.registerEventValue(RegionBorderEvent.class, Region.class, RegionBorderEvent::getRegion);
+		EventValues.registerEventValue(RegionBorderEvent.class, Player.class, RegionBorderEvent::getPlayer);
 	}
 
 	// Even WorldGuard doesn't have events, and this way all region plugins are supported for sure.
diff --git a/src/main/java/ch/njol/skript/hooks/regions/events/RegionBorderEvent.java b/src/main/java/ch/njol/skript/hooks/regions/events/RegionBorderEvent.java
index f2d08cecf7a..d75fc92730f 100644
--- a/src/main/java/ch/njol/skript/hooks/regions/events/RegionBorderEvent.java
+++ b/src/main/java/ch/njol/skript/hooks/regions/events/RegionBorderEvent.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.hooks.regions.events;
 
 import org.bukkit.entity.Player;
diff --git a/src/main/java/ch/njol/skript/hooks/regions/expressions/ExprBlocksInRegion.java b/src/main/java/ch/njol/skript/hooks/regions/expressions/ExprBlocksInRegion.java
index eaa6af8c785..fd61ee3b16c 100644
--- a/src/main/java/ch/njol/skript/hooks/regions/expressions/ExprBlocksInRegion.java
+++ b/src/main/java/ch/njol/skript/hooks/regions/expressions/ExprBlocksInRegion.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.hooks.regions.expressions;
 
 import ch.njol.skript.Skript;
diff --git a/src/main/java/ch/njol/skript/hooks/regions/expressions/ExprMembersOfRegion.java b/src/main/java/ch/njol/skript/hooks/regions/expressions/ExprMembersOfRegion.java
index bd4db9cb447..883b609bf05 100644
--- a/src/main/java/ch/njol/skript/hooks/regions/expressions/ExprMembersOfRegion.java
+++ b/src/main/java/ch/njol/skript/hooks/regions/expressions/ExprMembersOfRegion.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.hooks.regions.expressions;
 
 import ch.njol.skript.Skript;
diff --git a/src/main/java/ch/njol/skript/hooks/regions/expressions/ExprRegion.java b/src/main/java/ch/njol/skript/hooks/regions/expressions/ExprRegion.java
index a0b1426e3ce..3b92975e9e2 100644
--- a/src/main/java/ch/njol/skript/hooks/regions/expressions/ExprRegion.java
+++ b/src/main/java/ch/njol/skript/hooks/regions/expressions/ExprRegion.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.hooks.regions.expressions;
 
 import ch.njol.skript.doc.Description;
diff --git a/src/main/java/ch/njol/skript/hooks/regions/expressions/ExprRegionsAt.java b/src/main/java/ch/njol/skript/hooks/regions/expressions/ExprRegionsAt.java
index 0e2c80aa20b..a122a9d3cb4 100644
--- a/src/main/java/ch/njol/skript/hooks/regions/expressions/ExprRegionsAt.java
+++ b/src/main/java/ch/njol/skript/hooks/regions/expressions/ExprRegionsAt.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.hooks.regions.expressions;
 
 import ch.njol.skript.Skript;
diff --git a/src/main/java/ch/njol/skript/lang/Condition.java b/src/main/java/ch/njol/skript/lang/Condition.java
index 447561047f9..5648ce45c4d 100644
--- a/src/main/java/ch/njol/skript/lang/Condition.java
+++ b/src/main/java/ch/njol/skript/lang/Condition.java
@@ -1,37 +1,62 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.lang;
 
 import ch.njol.skript.Skript;
+import ch.njol.skript.conditions.base.PropertyCondition;
 import ch.njol.skript.lang.util.SimpleExpression;
-import ch.njol.util.Checker;
+import ch.njol.util.Kleenean;
 import org.bukkit.event.Event;
+import org.jetbrains.annotations.ApiStatus;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
+import org.skriptlang.skript.lang.condition.Conditional;
+import org.skriptlang.skript.registration.SyntaxInfo;
+import org.skriptlang.skript.util.Priority;
 
 import java.util.Iterator;
+import java.util.function.Predicate;
 
 /**
  * A condition which must be fulfilled for the trigger to continue. If the condition is in a section the behaviour depends on the section.
  *
  * @see Skript#registerCondition(Class, String...)
  */
-public abstract class Condition extends Statement {
+public abstract class Condition extends Statement implements Conditional<Event> {
+
+	public enum ConditionType {
+		/**
+		 * Conditions that contain other expressions, e.g. "%properties% is/are within %expressions%"
+		 * 
+		 * @see #PROPERTY
+		 */
+		COMBINED(SyntaxInfo.COMBINED),
+
+		/**
+		 * Property conditions, e.g. "%properties% is/are data value[s]"
+		 */
+		PROPERTY(PropertyCondition.DEFAULT_PRIORITY),
+
+		/**
+		 * Conditions whose pattern matches (almost) everything or should be last checked.
+		 */
+		PATTERN_MATCHES_EVERYTHING(SyntaxInfo.PATTERN_MATCHES_EVERYTHING);
+
+		@ApiStatus.Experimental
+		private final Priority priority;
+
+		@ApiStatus.Experimental
+		ConditionType(Priority priority) {
+			this.priority = priority;
+		}
+
+		/**
+		 * @return The Priority equivalent of this ConditionType.
+		 */
+		@ApiStatus.Experimental
+		public Priority priority() {
+			return this.priority;
+		}
+
+	}
 
 	private boolean negated;
 
@@ -41,20 +66,25 @@ protected Condition() {}
 	 * Checks whether this condition is satisfied with the given event. This should not alter the event or the world in any way, as conditions are only checked until one returns
 	 * false. All subsequent conditions of the same trigger will then be omitted.<br/>
 	 * <br/>
-	 * You might want to use {@link SimpleExpression#check(Event, Checker)}
-	 * 
+	 * You might want to use {@link SimpleExpression#check(Event, Predicate)}
+	 *
 	 * @param event the event to check
 	 * @return <code>true</code> if the condition is satisfied, <code>false</code> otherwise or if the condition doesn't apply to this event.
 	 */
 	public abstract boolean check(Event event);
 
+	@Override
+	public Kleenean evaluate(Event event) {
+		return Kleenean.get(check(event));
+	}
+
 	@Override
 	public final boolean run(Event event) {
 		return check(event);
 	}
 
 	/**
-	 * Sets the negation state of this condition. This will change the behaviour of {@link Expression#check(Event, Checker, boolean)}.
+	 * Sets the negation state of this condition. This will change the behaviour of {@link Expression#check(Event, Predicate, boolean)}.
 	 */
 	protected final void setNegated(boolean invert) {
 		negated = invert;
@@ -67,12 +97,23 @@ public final boolean isNegated() {
 		return negated;
 	}
 
-	@Nullable
-	@SuppressWarnings({"rawtypes", "unchecked"})
-	public static Condition parse(String input, @Nullable String defaultError) {
+	@Override
+	public @NotNull String getSyntaxTypeName() {
+		return "condition";
+	}
+
+	/**
+	 * Parse a raw string input as a condition.
+	 * 
+	 * @param input The string input to parse as a condition.
+	 * @param defaultError The error if the condition fails.
+	 * @return Condition if parsed correctly, otherwise null.
+	 */
+	public static @Nullable Condition parse(String input, @Nullable String defaultError) {
 		input = input.trim();
 		while (input.startsWith("(") && SkriptParser.next(input, 0, ParseContext.DEFAULT) == input.length())
 			input = input.substring(1, input.length() - 1);
+		//noinspection unchecked,rawtypes
 		return (Condition) SkriptParser.parse(input, (Iterator) Skript.getConditions().iterator(), defaultError);
 	}
 
diff --git a/src/main/java/ch/njol/skript/lang/Debuggable.java b/src/main/java/ch/njol/skript/lang/Debuggable.java
index 98714194d32..a89660b6124 100644
--- a/src/main/java/ch/njol/skript/lang/Debuggable.java
+++ b/src/main/java/ch/njol/skript/lang/Debuggable.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.lang;
 
 import org.bukkit.event.Event;
diff --git a/src/main/java/ch/njol/skript/lang/DefaultExpression.java b/src/main/java/ch/njol/skript/lang/DefaultExpression.java
index 86140cd57db..57a62e70fb0 100644
--- a/src/main/java/ch/njol/skript/lang/DefaultExpression.java
+++ b/src/main/java/ch/njol/skript/lang/DefaultExpression.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.lang;
 
 /**
diff --git a/src/main/java/ch/njol/skript/lang/Effect.java b/src/main/java/ch/njol/skript/lang/Effect.java
index e3309e7ecd9..3d13e6d9ee1 100644
--- a/src/main/java/ch/njol/skript/lang/Effect.java
+++ b/src/main/java/ch/njol/skript/lang/Effect.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.lang;
 
 import ch.njol.skript.Skript;
@@ -23,6 +5,7 @@
 import ch.njol.skript.log.ParseLogHandler;
 import ch.njol.skript.log.SkriptLogger;
 import org.bukkit.event.Event;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.Iterator;
@@ -50,11 +33,8 @@ public final boolean run(Event event) {
 		return true;
 	}
 
-	@Nullable
-	@SuppressWarnings({"rawtypes", "unchecked"})
-	public static Effect parse(String input, @Nullable String defaultError) {
-		ParseLogHandler log = SkriptLogger.startParseLogHandler();
-		try {
+	public static @Nullable Effect parse(String input, @Nullable String defaultError) {
+		try (ParseLogHandler log = SkriptLogger.startParseLogHandler()) {
 			EffFunctionCall functionCall = EffFunctionCall.parse(input);
 			if (functionCall != null) {
 				log.printLog();
@@ -72,6 +52,7 @@ public static Effect parse(String input, @Nullable String defaultError) {
 			}
 			log.clear();
 
+			//noinspection unchecked,rawtypes
 			Effect effect = (Effect) SkriptParser.parse(input, (Iterator) Skript.getEffects().iterator(), defaultError);
 			if (effect != null) {
 				log.printLog();
@@ -80,9 +61,12 @@ public static Effect parse(String input, @Nullable String defaultError) {
 
 			log.printError();
 			return null;
-		} finally {
-			log.stop();
 		}
 	}
 
+	@Override
+	public @NotNull String getSyntaxTypeName() {
+		return "effect";
+	}
+
 }
diff --git a/src/main/java/ch/njol/skript/lang/EffectSection.java b/src/main/java/ch/njol/skript/lang/EffectSection.java
index 699e28257bb..65b6d49d135 100644
--- a/src/main/java/ch/njol/skript/lang/EffectSection.java
+++ b/src/main/java/ch/njol/skript/lang/EffectSection.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.lang;
 
 import ch.njol.skript.Skript;
@@ -69,11 +51,10 @@ public abstract boolean init(Expression<?>[] expressions,
 	/**
 	 * Similar to {@link Section#parse(String, String, SectionNode, List)}, but will only attempt to parse from other {@link EffectSection}s.
 	 */
-	@Nullable
-	@SuppressWarnings({"unchecked", "rawtypes"})
-	public static EffectSection parse(String input, @Nullable String defaultError, @Nullable SectionNode sectionNode, @Nullable List<TriggerItem> triggerItems) {
+	public static @Nullable EffectSection parse(String input, @Nullable String defaultError, @Nullable SectionNode sectionNode, @Nullable List<TriggerItem> triggerItems) {
 		SectionContext sectionContext = ParserInstance.get().getData(SectionContext.class);
 
+		//noinspection unchecked,rawtypes
 		return sectionContext.modify(sectionNode, triggerItems, () ->
 			(EffectSection) SkriptParser.parse(
 				input,
diff --git a/src/main/java/ch/njol/skript/lang/EffectSectionEffect.java b/src/main/java/ch/njol/skript/lang/EffectSectionEffect.java
index 3cc1916e700..985c42ab260 100644
--- a/src/main/java/ch/njol/skript/lang/EffectSectionEffect.java
+++ b/src/main/java/ch/njol/skript/lang/EffectSectionEffect.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.lang;
 
 import ch.njol.skript.lang.SkriptParser.ParseResult;
diff --git a/src/main/java/ch/njol/skript/lang/EventRestrictedSyntax.java b/src/main/java/ch/njol/skript/lang/EventRestrictedSyntax.java
new file mode 100644
index 00000000000..901c23d6ece
--- /dev/null
+++ b/src/main/java/ch/njol/skript/lang/EventRestrictedSyntax.java
@@ -0,0 +1,25 @@
+package ch.njol.skript.lang;
+
+import ch.njol.util.Kleenean;
+import ch.njol.util.coll.CollectionUtils;
+import org.bukkit.event.Event;
+
+/**
+ * A syntax element that restricts the events it can be used in.
+ */
+public interface EventRestrictedSyntax {
+
+	/**
+	 * Returns all supported events for this syntax element.
+	 * <p>
+	 * Before {@link SyntaxElement#init(Expression[], int, Kleenean, SkriptParser.ParseResult)} is called, checks
+	 * to see if the current event is supported by this syntax element.
+	 * If it is not, an error will be printed and the syntax element will not be initialised.
+	 * </p>
+	 *
+	 * @return All supported event classes.
+	 * @see CollectionUtils#array(Object[])
+	 */
+	Class<? extends Event>[] supportedEvents();
+
+}
diff --git a/src/main/java/ch/njol/skript/lang/ExecutionIntent.java b/src/main/java/ch/njol/skript/lang/ExecutionIntent.java
new file mode 100644
index 00000000000..da67e862f44
--- /dev/null
+++ b/src/main/java/ch/njol/skript/lang/ExecutionIntent.java
@@ -0,0 +1,141 @@
+package ch.njol.skript.lang;
+
+import com.google.common.base.MoreObjects;
+import com.google.common.base.Preconditions;
+import org.jetbrains.annotations.Contract;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.Objects;
+
+/**
+ * Used to describe the intention of a {@link TriggerItem}.
+ * As of now, it is only used to tell whether the item halts the execution or not and print the appropriate warnings.
+ *
+ * @see TriggerItem#executionIntent()
+ */
+public sealed interface ExecutionIntent extends Comparable<ExecutionIntent>
+		permits ExecutionIntent.StopTrigger, ExecutionIntent.StopSections {
+
+	/**
+	 * Creates a new stop trigger intent.
+	 *
+	 * @return a new stop trigger intent.
+	 */
+	@Contract(value = " -> new", pure = true)
+	static StopTrigger stopTrigger() {
+		return new StopTrigger();
+	}
+
+	/**
+	 * Creates a new stop sections intent.
+	 *
+	 * @param levels the number of levels to stop.
+	 * @return a new stop sections intent.
+	 * @throws IllegalArgumentException if the depth is less than 1.
+	 */
+	@Contract(value = "_ -> new", pure = true)
+	static StopSections stopSections(int levels) {
+		Preconditions.checkArgument(levels > 0, "Depth must be at least 1");
+		return new StopSections(levels);
+	}
+
+	/**
+	 * Creates a new stop sections intent with a depth of 1.
+	 *
+	 * @return a new stop sections intent.
+	 */
+	@Contract(value = " -> new", pure = true)
+	static StopSections stopSection() {
+		return new StopSections(1);
+	}
+
+	/**
+	 * Uses the current ExecutionIntent.
+	 *
+	 * @return a new ExecutionIntent, or null if it's exhausted.
+	 */
+	@Nullable ExecutionIntent use();
+
+	/**
+	 * Represents a stop trigger intent. This intent stops the execution of the trigger.
+	 */
+	final class StopTrigger implements ExecutionIntent {
+
+		private StopTrigger() {}
+
+		@Override
+		public StopTrigger use() {
+			return new StopTrigger();
+		}
+
+		@Override
+		@SuppressWarnings("ComparatorMethodParameterNotUsed")
+		public int compareTo(@NotNull ExecutionIntent other) {
+			return other instanceof StopTrigger ? 0 : 1;
+		}
+
+		@Override
+		public String toString() {
+			return "StopTrigger";
+		}
+
+	}
+
+	/**
+	 * Represents a stop sections intent.
+	 * This intent stops the execution of the current section and the specified number of levels.
+	 */
+	final class StopSections implements ExecutionIntent {
+
+		private final int levels;
+
+		private StopSections(int levels) {
+			this.levels = levels;
+		}
+
+		public @Nullable ExecutionIntent.StopSections use() {
+			return levels > 1 ? new StopSections(levels - 1) : null;
+		}
+
+		@Override
+		public int compareTo(@NotNull ExecutionIntent other) {
+			if (!(other instanceof StopSections))
+				return other.compareTo(this) * -1;
+			int levels = ((StopSections) other).levels;
+			return Integer.compare(this.levels, levels);
+		}
+
+		/**
+		 * Returns the number of levels to stop.
+		 *
+		 * @return the number of levels to stop.
+		 */
+		public int levels() {
+			return levels;
+		}
+
+		@Override
+		public boolean equals(Object obj) {
+			if (obj == this)
+				return true;
+			if (obj == null || obj.getClass() != this.getClass())
+				return false;
+			return this.levels == ((StopSections) obj).levels;
+		}
+
+		@Override
+		public int hashCode() {
+			return Objects.hash(levels);
+		}
+
+		@Override
+		public String toString() {
+			return MoreObjects.toStringHelper(this)
+					.add("levels", levels)
+					.toString();
+		}
+
+	}
+
+}
diff --git a/src/main/java/ch/njol/skript/lang/Expression.java b/src/main/java/ch/njol/skript/lang/Expression.java
index 1f68484e045..6240e674b76 100644
--- a/src/main/java/ch/njol/skript/lang/Expression.java
+++ b/src/main/java/ch/njol/skript/lang/Expression.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.lang;
 
 import ch.njol.skript.Skript;
@@ -28,21 +10,16 @@
 import ch.njol.skript.log.ErrorQuality;
 import ch.njol.skript.registrations.Classes;
 import ch.njol.skript.util.slot.Slot;
-import ch.njol.util.Checker;
 import org.bukkit.event.Event;
 import org.bukkit.inventory.ItemStack;
+import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.skriptlang.skript.lang.converter.Converter;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Spliterators;
+import java.util.*;
 import java.util.function.Function;
+import java.util.function.Predicate;
 import java.util.stream.Stream;
 import java.util.stream.StreamSupport;
 
@@ -53,7 +30,7 @@
  * @see SimpleExpression
  * @see SyntaxElement
  */
-public interface Expression<T> extends SyntaxElement, Debuggable {
+public interface Expression<T> extends SyntaxElement, Debuggable, Loopable<T> {
 
 	/**
 	 * Get the single value of this expression.
@@ -61,19 +38,18 @@ public interface Expression<T> extends SyntaxElement, Debuggable {
 	 * This method may only return null if it always returns null for the given event, i.e. it is equivalent to getting a random element out of {@link #getAll(Event)} or null iff
 	 * that array is empty.
 	 * <p>
-	 * Do not use this in conditions, use {@link #check(Event, Checker, boolean)} instead.
-	 * 
+	 * Do not use this in conditions, use {@link #check(Event, Predicate, boolean)} instead.
+	 *
 	 * @param event The event
 	 * @return The value or null if this expression doesn't have any value for the event
 	 * @throws UnsupportedOperationException (optional) if this was called on a non-single expression
 	 */
-	@Nullable
-	T getSingle(Event event);
+	@Nullable T getSingle(Event event);
 
 	/**
 	 * Get an optional of the single value of this expression.
 	 * <p>
-	 * Do not use this in conditions, use {@link #check(Event, Checker, boolean)} instead.
+	 * Do not use this in conditions, use {@link #check(Event, Predicate, boolean)} instead.
 	 *
 	 * @param event the event
 	 * @return an {@link Optional} containing the {@link #getSingle(Event) single value} of this expression for this event.
@@ -88,7 +64,7 @@ default Optional<T> getOptionalSingle(Event event) {
 	 * <p>
 	 * The returned array must not contain any null values.
 	 * <p>
-	 * Do not use this in conditions, use {@link #check(Event, Checker, boolean)} instead.
+	 * Do not use this in conditions, use {@link #check(Event, Predicate, boolean)} instead.
 	 * 
 	 * @param event The event
 	 * @return An array of values of this expression which must neither be null nor contain nulls, and which must not be an internal array.
@@ -98,7 +74,7 @@ default Optional<T> getOptionalSingle(Event event) {
 	/**
 	 * Gets all possible return values of this expression, i.e. it returns the same as {@link #getArray(Event)} if {@link #getAnd()} is true, otherwise all possible values for
 	 * {@link #getSingle(Event)}.
-	 * 
+	 *
 	 * @param event The event
 	 * @return An array of all possible values of this expression for the given event which must neither be null nor contain nulls, and which must not be an internal array.
 	 */
@@ -110,7 +86,7 @@ default Optional<T> getOptionalSingle(Event event) {
 	 * @param event The event
 	 * @return A non-null stream of this expression's non-null values
 	 */
-	default Stream<@NotNull ? extends  T> stream(Event event) {
+	default Stream<? extends @NotNull T> stream(Event event) {
 		Iterator<? extends T> iterator = iterator(event);
 		if (iterator == null) {
 			return Stream.empty();
@@ -142,29 +118,29 @@ default boolean canBeSingle() {
 	 * or as the innermost check of nested checks.
 	 * <p>
 	 * Usual implementation (may differ, e.g. may return false for nonexistent values independent of <tt>negated</tt>):
-	 * 
+	 *
 	 * <pre>
-	 * return negated ^ {@link #check(Event, Checker)};
+	 * return negated ^ {@link #check(Event, Predicate)};
 	 * </pre>
-	 * 
+	 *
 	 * @param event The event to be used for evaluation
 	 * @param checker The checker that determines whether this expression matches
 	 * @param negated The checking condition's negated state. This is used to invert the output of the checker if set to true (i.e. <tt>negated ^ checker.check(...)</tt>)
 	 * @return Whether this expression matches or doesn't match the given checker depending on the condition's negated state.
-	 * @see SimpleExpression#check(Object[], Checker, boolean, boolean)
+	 * @see SimpleExpression#check(Object[], Predicate, boolean, boolean)
 	 */
-	boolean check(Event event, Checker<? super T> checker, boolean negated);
+	boolean check(Event event, Predicate<? super T> checker, boolean negated);
 
 	/**
-	 * Checks this expression against the given checker. This method must only be used around other checks, use {@link #check(Event, Checker, boolean)} for a simple check or the
+	 * Checks this expression against the given checker. This method must only be used around other checks, use {@link #check(Event, Predicate, boolean)} for a simple check or the
 	 * innermost check of a nested check.
-	 * 
+	 *
 	 * @param event The event to be used for evaluation
 	 * @param checker A checker that determines whether this expression matches
 	 * @return Whether this expression matches the given checker
-	 * @see SimpleExpression#check(Object[], Checker, boolean, boolean)
+	 * @see SimpleExpression#check(Object[], Predicate, boolean, boolean)
 	 */
-	boolean check(Event event, Checker<? super T> checker);
+	boolean check(Event event, Predicate<? super T> checker);
 
 	/**
 	 * Tries to convert this expression to the given type. This method can print an error prior to returning null to specify the cause.
@@ -174,20 +150,19 @@ default boolean canBeSingle() {
 	 * <p>
 	 * The returned expression should delegate this method to the original expression's method to prevent excessive converted expression chains (see also
 	 * {@link ConvertedExpression}).
-	 * 
+	 *
 	 * @param to The desired return type of the returned expression
 	 * @return Expression with the desired return type or null if the expression can't be converted to the given type. Returns the expression itself if it already returns the
 	 *         desired type.
 	 * @see Converter
 	 * @see ConvertedExpression
 	 */
-	@Nullable
 	@SuppressWarnings("unchecked")
-	<R> Expression<? extends R> getConvertedExpression(Class<R>... to);
+	<R> @Nullable Expression<? extends R> getConvertedExpression(Class<R>... to);
 
 	/**
 	 * Gets the return type of this expression.
-	 * 
+	 *
 	 * @return A supertype of any objects returned by {@link #getSingle(Event)} and the component type of any arrays returned by {@link #getArray(Event)}
 	 */
 	Class<? extends T> getReturnType();
@@ -220,11 +195,11 @@ default boolean canReturn(Class<?> returnType) {
 	/**
 	 * Returns true if this expression returns all possible values, false if it only returns some of them.
 	 * <p>
-	 * This method significantly influences {@link #check(Event, Checker)}, {@link #check(Event, Checker, boolean)} and {@link CondIsSet} and thus breaks conditions that use this
+	 * This method significantly influences {@link #check(Event, Predicate)}, {@link #check(Event, Predicate, boolean)} and {@link CondIsSet} and thus breaks conditions that use this
 	 * expression if it returns a wrong value.
 	 * <p>
 	 * This method must return true if this is a {@link #isSingle() single} expression. // TODO make this method irrelevant for single expressions
-	 * 
+	 *
 	 * @return Whether this expression returns all values at once or only part of them.
 	 */
 	boolean getAnd();
@@ -237,7 +212,7 @@ default boolean canReturn(Class<?> returnType) {
 	 * <p>
 	 * If this method returns false the expression will be discarded and an error message is printed. Custom error messages must be of {@link ErrorQuality#SEMANTIC_ERROR} to be
 	 * printed (NB: {@link Skript#error(String)} always creates semantic errors).
-	 * 
+	 *
 	 * @param time -1 for past or 1 for future. 0 is never passed to this method as it represents the default state.
 	 * @return Whether this expression has distinct time states, e.g. a player never changes but a block can. This should be sensitive for the event (using
 	 *         {@link ch.njol.skript.lang.parser.ParserInstance#isCurrentEvent(Class)}).
@@ -257,36 +232,16 @@ default boolean canReturn(Class<?> returnType) {
 	 * Returns whether this value represents the default value of its type for the event, i.e. it can be replaced with a call to event.getXyz() if one knows the event & value type.
 	 * <p>
 	 * This method might be removed in the future as it's better to check whether value == event.getXyz() for every value an expression returns.
-	 * 
+	 *
 	 * @return Whether this is the return types' default expression
 	 */
 	boolean isDefault();
 
-	/**
-	 * Returns the same as {@link #getArray(Event)} but as an iterator. This method should be overriden by expressions intended to be looped to increase performance.
-	 * 
-	 * @param event The event to be used for evaluation
-	 * @return An iterator to iterate over all values of this expression which may be empty and/or null, but must not return null elements.
-	 */
-	@Nullable
-	Iterator<? extends T> iterator(Event event);
-
-	/**
-	 * Checks whether the given 'loop-...' expression should match this loop, e.g. loop-block matches any loops that loop through blocks and loop-argument matches an
-	 * argument loop.
-	 * <p>
-	 * You should usually just return false as e.g. loop-block will automatically match the expression if its returnType is Block or a subtype of it.
-	 * 
-	 * @param input The entered input string (the blank in loop-___)
-	 * @return Whether this loop matches the given string
-	 */
-	boolean isLoopOf(String input);
-
 	/**
 	 * Returns the original expression that was parsed, i.e. without any conversions done.
 	 * <p>
 	 * This method is undefined for simplified expressions.
-	 * 
+	 *
 	 * @return The unconverted source expression of this expression or this expression itself if it was never converted.
 	 */
 	Expression<?> getSource();
@@ -297,7 +252,7 @@ default boolean canReturn(Class<?> returnType) {
 	 * After this method was used the toString methods are likely not useful anymore.
 	 * <p>
 	 * This method is not yet used but will be used to improve efficiency in the future.
-	 * 
+	 *
 	 * @return A reference to a simpler version of this expression. Can change this expression directly and return itself if applicable, i.e. no references to the expression before
 	 *         this method call should be kept!
 	 */
@@ -313,14 +268,13 @@ default boolean canReturn(Class<?> returnType) {
 	 * <tt>super.change(...)</tt>.
 	 * <p>
 	 * Unlike {@link Changer#acceptChange(ChangeMode)} this method may print errors.
-	 * 
+	 *
 	 * @param mode The mode to check
 	 * @return An array of types that {@link #change(Event, Object[], ChangeMode)} accepts as its <code>delta</code> parameter (which can be arrays to denote that multiple of
 	 *         that type are accepted), or null if the given mode is not supported. For {@link ChangeMode#DELETE} and {@link ChangeMode#RESET} this can return any non-null array to
 	 *         mark them as supported.
 	 */
-	@Nullable
-	Class<?>[] acceptChange(ChangeMode mode);
+	Class<?> @Nullable [] acceptChange(ChangeMode mode);
 
 	/**
 	 * Tests all accepted change modes, and if so what type it expects the <code>delta</code> to be.
@@ -339,14 +293,14 @@ default Map<ChangeMode, Class<?>[]> getAcceptedChangeModes() {
 	/**
 	 * Changes the expression's value by the given amount. This will only be called on supported modes and with the desired <code>delta</code> type as returned by
 	 * {@link #acceptChange(ChangeMode)}
-	 * 
+	 *
 	 * @param event The event
 	 * @param delta An array with one or more instances of one or more of the classes returned by {@link #acceptChange(ChangeMode)} for the given change mode (null for
 	 *            {@link ChangeMode#DELETE} and {@link ChangeMode#RESET}). <b>This can be a Object[], thus casting is not allowed.</b>
 	 * @param mode The {@link ChangeMode} of the attempted change
 	 * @throws UnsupportedOperationException (optional) - If this method was called on an unsupported ChangeMode.
 	 */
-	void change(Event event, @Nullable Object[] delta, ChangeMode mode);
+	void change(Event event, Object @Nullable [] delta, ChangeMode mode);
 
 	/**
 	 * Changes the contents of an expression using the given {@link Function}.
@@ -354,16 +308,22 @@ default Map<ChangeMode, Class<?>[]> getAcceptedChangeModes() {
 	 * changing the expression. For example, {@code set vector length of {_v} to 1}, rather than
 	 * {@code set {_v} to vector(0,1,0)}.
 	 * <br>
-	 * This is a 1 to 1 transformation and should not add or remove elements.
-	 * For {@link Variable}s, this will retain indices. For non-{@link Variable}s, it will
-	 * evaluate {@link #getArray(Event)}, apply the change function on each, and call
-	 * {@link #change(Event, Object[], ChangeMode)} with the modified values and {@link ChangeMode#SET}.
+	 * This is a 1 to 1 transformation and should not add elements.
+	 * Returning null will remove the element.
+	 * Returning a type not accepted by {@link #acceptChange(ChangeMode)} for {@link ChangeMode#SET}
+	 * will depend on the implementer. The default implementation will remove the element.
+	 * <br>
+	 * This expression must support {@link ChangeMode#SET} for this method to work.
 	 *
 	 * @param event The event to use for local variables and evaluation
 	 * @param changeFunction A 1-to-1 function that transforms a single input to a single output.
+	 *                       Returning null will remove the element.
+	 *                       Returning a type not accepted by {@link #acceptChange(ChangeMode)} for {@link ChangeMode#SET}
+	 *                       will depend on the implementer. The default implementation will remove the element.
 	 * @param <R> The output type of the change function. Must be a type returned
 	 *              by {{@link #acceptChange(ChangeMode)}} for {@link ChangeMode#SET}.
 	 */
+	@ApiStatus.Internal
 	default <R> void changeInPlace(Event event, Function<T, R> changeFunction) {
 		changeInPlace(event, changeFunction, false);
 	}
@@ -374,24 +334,38 @@ default <R> void changeInPlace(Event event, Function<T, R> changeFunction) {
 	 * changing the expression. For example, {@code set vector length of {_v} to 1}, rather than
 	 * {@code set {_v} to vector(0,1,0)}.
 	 * <br>
-	 * This is a 1 to 1 transformation and should not add or remove elements.
-	 * For {@link Variable}s, this will retain indices. For non-{@link Variable}s, it will
-	 * evaluate the expression, apply the change function on each value, and call
-	 * {@link #change(Event, Object[], ChangeMode)} with the modified values and {@link ChangeMode#SET}.
+	 * This is a 1 to 1 transformation and should not add elements.
+	 * Returning null will remove the element.
+	 * Returning a type not accepted by {@link #acceptChange(ChangeMode)} for {@link ChangeMode#SET}
+	 * will depend on the implementer. The default implementation will remove the element.
+	 * <br>
+	 * This expression must support {@link ChangeMode#SET} for this method to work.
 	 *
 	 * @param event The event to use for local variables and evaluation
 	 * @param changeFunction A 1-to-1 function that transforms a single input to a single output.
+	 *                       Returning null will remove the element.
+	 *                       Returning a type not accepted by {@link #acceptChange(ChangeMode)} for {@link ChangeMode#SET}
+	 *                       will depend on the implementer. The default implementation will remove the element.
 	 * @param getAll Whether to evaluate with {@link #getAll(Event)} or {@link #getArray(Event)}.
 	 * @param <R> The output type of the change function. Must be a type returned
 	 *              by {{@link #acceptChange(ChangeMode)}} for {@link ChangeMode#SET}.
 	 */
+	@ApiStatus.Internal
 	default <R> void changeInPlace(Event event, Function<T, R> changeFunction, boolean getAll) {
 		T[] values = getAll ? getAll(event) : getArray(event);
 		if (values.length == 0)
 			return;
+
+		@SuppressWarnings("DataFlowIssue")
+		Class<?>[] validClasses = Arrays.stream(acceptChange(ChangeMode.SET))
+				.map(c -> c.isArray() ? c.getComponentType() : c)
+				.toArray(Class<?>[]::new);
+
 		List<R> newValues = new ArrayList<>();
 		for (T value : values) {
-			newValues.add(changeFunction.apply(value));
+			R newValue = changeFunction.apply(value);
+			if (newValue != null && ChangerUtils.acceptsChangeTypes(validClasses, newValue.getClass()))
+				newValues.add(newValue);
 		}
 		change(event, newValues.toArray(), ChangeMode.SET);
 	}
@@ -407,8 +381,7 @@ default <R> void changeInPlace(Event event, Function<T, R> changeFunction, boole
 	 * @param delta Initial delta array.
 	 * @return Delta array to use for change.
 	 */
-	@Nullable
-	default Object[] beforeChange(Expression<?> changed, @Nullable Object[] delta) {
+	default Object @Nullable [] beforeChange(Expression<?> changed, Object @Nullable [] delta) {
 		if (delta == null || delta.length == 0) // Nothing to nothing
 			return null;
 
@@ -437,4 +410,9 @@ default Object[] beforeChange(Expression<?> changed, @Nullable Object[] delta) {
 		return newDelta == null ? delta : newDelta;
 	}
 
+	@Override
+	default @NotNull String getSyntaxTypeName() {
+		return "expression";
+	}
+
 }
diff --git a/src/main/java/ch/njol/skript/lang/ExpressionInfo.java b/src/main/java/ch/njol/skript/lang/ExpressionInfo.java
index 2f24c3a6ec3..feeba7bd785 100644
--- a/src/main/java/ch/njol/skript/lang/ExpressionInfo.java
+++ b/src/main/java/ch/njol/skript/lang/ExpressionInfo.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.lang;
 
 import org.jetbrains.annotations.Nullable;
@@ -25,8 +7,7 @@
  */
 public class ExpressionInfo<E extends Expression<T>, T> extends SyntaxElementInfo<E> {
 
-	@Nullable
-	public ExpressionType expressionType;
+	public @Nullable ExpressionType expressionType;
 	public Class<T> returnType;
 
 	public ExpressionInfo(String[] patterns, Class<T> returnType, Class<E> expressionClass, String originClassPath) throws IllegalArgumentException {
@@ -51,8 +32,7 @@ public Class<T> getReturnType() {
 	 * Get the type of this expression.
 	 * @return The type of this Expression
 	 */
-	@Nullable
-	public ExpressionType getExpressionType() {
+	public @Nullable ExpressionType getExpressionType() {
 		return expressionType;
 	}
 
diff --git a/src/main/java/ch/njol/skript/lang/ExpressionList.java b/src/main/java/ch/njol/skript/lang/ExpressionList.java
index 5ee67d942a7..584de92e82b 100644
--- a/src/main/java/ch/njol/skript/lang/ExpressionList.java
+++ b/src/main/java/ch/njol/skript/lang/ExpressionList.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.lang;
 
 import ch.njol.skript.classes.Changer.ChangeMode;
@@ -23,18 +5,14 @@
 import ch.njol.skript.lang.SkriptParser.ParseResult;
 import ch.njol.skript.lang.util.SimpleLiteral;
 import ch.njol.skript.registrations.Classes;
-import ch.njol.util.Checker;
 import ch.njol.util.Kleenean;
 import ch.njol.util.coll.CollectionUtils;
 import org.bukkit.event.Event;
 import org.jetbrains.annotations.Nullable;
 
 import java.lang.reflect.Array;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.List;
-import java.util.NoSuchElementException;
+import java.util.*;
+import java.util.function.Predicate;
 
 /**
  * A list of expressions.
@@ -47,8 +25,7 @@ public class ExpressionList<T> implements Expression<T> {
 	protected boolean and;
 	private final boolean single;
 
-	@Nullable
-	private final ExpressionList<?> source;
+	private final @Nullable ExpressionList<?> source;
 
 	public ExpressionList(Expression<? extends T>[] expressions, Class<T> returnType, boolean and) {
 		this(expressions, returnType, and, null);
@@ -89,8 +66,7 @@ public boolean init(Expression<?>[] expressions, int matchedPattern, Kleenean is
 	}
 
 	@Override
-	@Nullable
-	public T getSingle(Event event) {
+	public @Nullable T getSingle(Event event) {
 		if (!single)
 			throw new UnsupportedOperationException();
 		Expression<? extends T> expression = CollectionUtils.getRandom(expressions);
@@ -98,31 +74,30 @@ public T getSingle(Event event) {
 	}
 
 	@Override
-	@SuppressWarnings("unchecked")
 	public T[] getArray(Event event) {
 		if (and)
 			return getAll(event);
 		Expression<? extends T> expression = CollectionUtils.getRandom(expressions);
+		//noinspection unchecked
 		return expression != null ? expression.getArray(event) : (T[]) Array.newInstance(returnType, 0);
 	}
 
 	@Override
-	@SuppressWarnings("unchecked")
 	public T[] getAll(Event event) {
 		List<T> values = new ArrayList<>();
 		for (Expression<? extends T> expr : expressions)
 			values.addAll(Arrays.asList(expr.getAll(event)));
+		//noinspection unchecked
 		return values.toArray((T[]) Array.newInstance(returnType, values.size()));
 	}
 
 	@Override
-	@Nullable
-	public Iterator<? extends T> iterator(Event event) {
+	public @Nullable Iterator<? extends T> iterator(Event event) {
 		if (!and) {
 			Expression<? extends T> expression = CollectionUtils.getRandom(expressions);
 			return expression != null ? expression.iterator(event) : null;
 		}
-		return new Iterator<T>() {
+		return new Iterator<>() {
 			private int i = 0;
 			@Nullable
 			private Iterator<? extends T> current = null;
@@ -160,27 +135,18 @@ public boolean isSingle() {
 	}
 
 	@Override
-	public boolean check(Event event, Checker<? super T> checker, boolean negated) {
-		for (Expression<? extends T> expr : expressions) {
-			boolean result = expr.check(event, checker) ^ negated;
-			// exit early if we find a FALSE and we're ANDing, or a TRUE and we're ORing
-			if (and && !result)
-				return false;
-			if (!and && result)
-				return true;
-		}
-		return and;
+	public boolean check(Event event, Predicate<? super T> checker, boolean negated) {
+		return CollectionUtils.check(expressions, expr -> expr.check(event, checker) ^ negated, and);
 	}
 
 	@Override
-	public boolean check(Event event, Checker<? super T> checker) {
+	public boolean check(Event event, Predicate<? super T> checker) {
 		return check(event, checker, false);
 	}
 
 	@Override
-	@Nullable
 	@SuppressWarnings("unchecked")
-	public <R> Expression<? extends R> getConvertedExpression(Class<R>... to) {
+	public <R> @Nullable Expression<? extends R> getConvertedExpression(Class<R>... to) {
 		Expression<? extends R>[] exprs = new Expression[expressions.length];
 		Class<?>[] returnTypes = new Class[expressions.length];
 		for (int i = 0; i < exprs.length; i++) {
@@ -215,8 +181,7 @@ public void invertAnd() {
 	}
 
 	@Override
-	@Nullable
-	public Class<?>[] acceptChange(ChangeMode mode) {
+	public Class<?> @Nullable [] acceptChange(ChangeMode mode) {
 		Class<?>[] exprClasses = expressions[0].acceptChange(mode);
 		if (exprClasses == null)
 			return null;
@@ -234,7 +199,7 @@ public Class<?>[] acceptChange(ChangeMode mode) {
 	}
 
 	@Override
-	public void change(Event event, @Nullable Object[] delta, ChangeMode mode) throws UnsupportedOperationException {
+	public void change(Event event, Object @Nullable [] delta, ChangeMode mode) throws UnsupportedOperationException {
 		for (Expression<?> expr : expressions) {
 			expr.change(event, delta, mode);
 		}
@@ -307,6 +272,23 @@ public Expression<? extends T>[] getExpressions() {
 		return expressions;
 	}
 
+	/**
+	 * Retrieves all expressions, including those nested within any {@code ExpressionList}s.
+	 *
+	 * @return A list of all expressions.
+	 */
+	public List<Expression<? extends T>> getAllExpressions() {
+		List<Expression<? extends T>> expressions = new ArrayList<>();
+		for (Expression<? extends T> expression : this.expressions) {
+			if (expression instanceof ExpressionList<? extends T> innerList) {
+				expressions.addAll(innerList.getAllExpressions());
+				continue;
+			}
+			expressions.add(expression);
+		}
+		return expressions;
+	}
+
 	@Override
 	@SuppressWarnings("unchecked")
 	public Expression<T> simplify() {
diff --git a/src/main/java/ch/njol/skript/lang/ExpressionSection.java b/src/main/java/ch/njol/skript/lang/ExpressionSection.java
new file mode 100644
index 00000000000..ae992d9ead0
--- /dev/null
+++ b/src/main/java/ch/njol/skript/lang/ExpressionSection.java
@@ -0,0 +1,83 @@
+package ch.njol.skript.lang;
+
+import ch.njol.skript.config.SectionNode;
+import ch.njol.skript.expressions.base.SectionExpression;
+import ch.njol.util.Kleenean;
+import org.bukkit.event.Event;
+import org.jetbrains.annotations.ApiStatus;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.List;
+
+/**
+ * A dummy trigger item representing the 'section' aspect of a {@link SectionExpression}.
+ * This is not a parsed or registered syntax in itself, and can be used for getting access to the parse-time features
+ * of a section syntax (e.g. loading body code).
+ * <p>
+ * This is not safe to be used during runtime, since it is not a part of the trigger item tree.
+ *
+ * @see SectionExpression
+ * @see Section
+ * @see EffectSectionEffect
+ */
+@ApiStatus.Internal
+public class ExpressionSection extends Section {
+
+	protected final SectionExpression<?> expression;
+
+	public ExpressionSection(SectionExpression<?> expression) {
+		this.expression = expression;
+	}
+
+	@Override
+	public boolean init(Expression<?>[] expressions, int matchedPattern, Kleenean isDelayed, SkriptParser.ParseResult parseResult) {
+		SectionContext context = getParser().getData(SectionContext.class);
+		return this.init(expressions, matchedPattern, isDelayed, parseResult, context.sectionNode, context.triggerItems)
+			&& context.claim(expression);
+	}
+
+	@Override
+	public boolean init(Expression<?>[] expressions, int matchedPattern, Kleenean isDelayed,
+						SkriptParser.ParseResult parseResult,
+						@Nullable SectionNode sectionNode, List<TriggerItem> triggerItems) {
+		return expression.init(expressions, matchedPattern, isDelayed, parseResult, sectionNode, triggerItems);
+	}
+
+	@Override
+	protected @Nullable TriggerItem walk(Event event) {
+		return super.walk(event, false);
+	}
+
+	@Override
+	public String toString(@Nullable Event event, boolean debug) {
+		return expression.toString(event, debug);
+	}
+
+	public SectionExpression<?> getAsExpression() {
+		return expression;
+	}
+
+	@Override
+	public void loadCode(SectionNode sectionNode) {
+		super.loadCode(sectionNode);
+	}
+
+	@Override
+	public void loadOptionalCode(SectionNode sectionNode) {
+		super.loadOptionalCode(sectionNode);
+	}
+
+	public boolean runSection(Event event) {
+		return TriggerItem.walk(this.first, event);
+	}
+
+	@Override
+	public void setTriggerItems(List<TriggerItem> items) {
+		super.setTriggerItems(items);
+	}
+
+	public Trigger loadCodeTask(SectionNode sectionNode, String name, @Nullable Runnable afterLoading, Class<? extends Event>... events) {
+		return super.loadCode(sectionNode, name, afterLoading, events);
+	}
+
+}
diff --git a/src/main/java/ch/njol/skript/lang/ExpressionType.java b/src/main/java/ch/njol/skript/lang/ExpressionType.java
index 7f16051ee57..b47c538e884 100644
--- a/src/main/java/ch/njol/skript/lang/ExpressionType.java
+++ b/src/main/java/ch/njol/skript/lang/ExpressionType.java
@@ -1,25 +1,11 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.lang;
 
 import ch.njol.skript.expressions.base.EventValueExpression;
 import ch.njol.skript.expressions.base.PropertyExpression;
+import org.jetbrains.annotations.ApiStatus;
+import org.jetbrains.annotations.Nullable;
+import org.skriptlang.skript.registration.SyntaxInfo;
+import org.skriptlang.skript.util.Priority;
 
 /**
  * Used to define in which order to parse expressions.
@@ -29,32 +15,63 @@ public enum ExpressionType {
 	/**
 	 * Expressions that only match simple text, e.g. "[the] player"
 	 */
-	SIMPLE,
+	SIMPLE(SyntaxInfo.SIMPLE),
 
 	/**
 	 * Expressions that are related to the Event that are typically simple.
 	 * 
 	 * @see EventValueExpression
 	 */
-	EVENT,
+	EVENT(EventValueExpression.DEFAULT_PRIORITY),
 
 	/**
 	 * Expressions that contain other expressions, e.g. "[the] distance between %location% and %location%"
 	 * 
 	 * @see #PROPERTY
 	 */
-	COMBINED,
+	COMBINED(SyntaxInfo.COMBINED),
 
 	/**
 	 * Property expressions, e.g. "[the] data value[s] of %items%"/"%items%'[s] data value[s]"
 	 * 
 	 * @see PropertyExpression
 	 */
-	PROPERTY,
+	PROPERTY(PropertyExpression.DEFAULT_PRIORITY),
 
 	/**
 	 * Expressions whose pattern matches (almost) everything. Typically when using regex. Example: "[the] [loop-]<.+>"
 	 */
-	PATTERN_MATCHES_EVERYTHING;
+	PATTERN_MATCHES_EVERYTHING(SyntaxInfo.PATTERN_MATCHES_EVERYTHING);
+
+	@ApiStatus.Experimental
+	private final Priority priority;
+
+	@ApiStatus.Experimental
+	ExpressionType(Priority priority) {
+		this.priority = priority;
+	}
+
+	/**
+	 * @return The Priority equivalent of this ExpressionType.
+	 */
+	@ApiStatus.Experimental
+	public Priority priority() {
+		return priority;
+	}
+
+	@ApiStatus.Experimental
+	public static @Nullable ExpressionType fromModern(Priority priority) {
+		if (priority == SyntaxInfo.SIMPLE)
+			return ExpressionType.SIMPLE;
+		if (priority == EventValueExpression.DEFAULT_PRIORITY)
+			return ExpressionType.EVENT;
+		if (priority == SyntaxInfo.COMBINED)
+			return ExpressionType.COMBINED;
+		if (priority == PropertyExpression.DEFAULT_PRIORITY)
+			return ExpressionType.PROPERTY;
+		if (priority == SyntaxInfo.PATTERN_MATCHES_EVERYTHING)
+			return ExpressionType.PATTERN_MATCHES_EVERYTHING;
+		return null;
+	}
 
 }
diff --git a/src/main/java/ch/njol/skript/lang/InputSource.java b/src/main/java/ch/njol/skript/lang/InputSource.java
index df541a0e40f..d50905d9cf7 100644
--- a/src/main/java/ch/njol/skript/lang/InputSource.java
+++ b/src/main/java/ch/njol/skript/lang/InputSource.java
@@ -1,25 +1,8 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.lang;
 
 import ch.njol.skript.expressions.ExprInput;
 import ch.njol.skript.lang.parser.ParserInstance;
+import ch.njol.skript.util.LiteralUtils;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.annotations.UnknownNullability;
 
@@ -63,14 +46,35 @@ default boolean hasIndices() {
 		return null;
 	}
 
+	/**
+	 * Parses an expression using the given input source and parser instance.
+	 *
+	 * @param expr the string expression to be parsed.
+	 * @param parser the parser instance used for parsing the expression.
+	 * @return the parsed expression, or null if the parsing fails.
+	 */
+	default @Nullable Expression<?> parseExpression(String expr, ParserInstance parser, int flags) {
+		InputData inputData = parser.getData(InputData.class);
+		InputSource originalSource = inputData.getSource();
+		inputData.setSource(this);
+		Expression<?> mappingExpr = new SkriptParser(expr, flags, ParseContext.DEFAULT)
+			.parseExpression(Object.class);
+		if (mappingExpr != null && LiteralUtils.hasUnparsedLiteral(mappingExpr)) {
+			mappingExpr = LiteralUtils.defendExpression(mappingExpr);
+			if (!LiteralUtils.canInitSafely(mappingExpr))
+				return null;
+		}
+		inputData.setSource(originalSource);
+		return mappingExpr;
+	}
+
 	/**
 	 * A {@link ch.njol.skript.lang.parser.ParserInstance.Data} used for
 	 * linking {@link InputSource}s and {@link ExprInput}s.
 	 */
 	class InputData extends ParserInstance.Data {
 
-		@Nullable
-		private InputSource source;
+		private @Nullable InputSource source;
 
 		public InputData(ParserInstance parserInstance) {
 			super(parserInstance);
@@ -92,8 +96,7 @@ public void setSource(@Nullable InputSource source) {
 		 *
 		 * @return the source of information.
 		 */
-		@Nullable
-		public InputSource getSource() {
+		public @Nullable InputSource getSource() {
 			return source;
 		}
 
diff --git a/src/main/java/ch/njol/skript/lang/KeyProviderExpression.java b/src/main/java/ch/njol/skript/lang/KeyProviderExpression.java
new file mode 100644
index 00000000000..cd053a3dd8c
--- /dev/null
+++ b/src/main/java/ch/njol/skript/lang/KeyProviderExpression.java
@@ -0,0 +1,128 @@
+package ch.njol.skript.lang;
+
+import ch.njol.skript.classes.Changer;
+import ch.njol.skript.classes.Changer.ChangeMode;
+import org.bukkit.event.Event;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * Represents an expression that is able to return a set of keys linked to its values.
+ * This can be used to return index-linked values to store in a list variable,
+ * using the {@link ChangeMode#SET} {@link Changer}.
+ * An expression can provide a set of keys to use, rather than numerical indices.
+ * <br/>
+ * Index-linking is not (currently) used with other change modes.
+ * <br/>
+ * <br/>
+ * <h2>Contract</h2>
+ * <ul>
+ *     <li>Neither {@link #getArrayKeys(Event)} nor {@link #getAllKeys(Event)} should ever be called without
+ *     a corresponding {@link #getArray(Event)} or {@link #getAll(Event)} call.</li>
+ *     <li>A caller may ask only for values and does not have to invoke either {@link #getArrayKeys(Event)} or
+ *     {@link #getAllKeys(Event)}.</li>
+ *     <li>{@link #getArrayKeys(Event)} might be called after the corresponding {@link #getArray(Event)}</li>
+ *     <li>{@link #getAllKeys(Event)} might be called after the corresponding {@link #getAll(Event)}</li>
+ * </ul>
+ * <br/>
+ * <h2>Advice on Caching</h2>
+ * As long as callers are built sensibly and follow API advice, it should be safe to cache a key-list during a values
+ * call.
+ * E.g. if an expression is returning data from a map, it could request the whole entry-set during
+ * {@link #getArray(Event)}
+ * and return the keys during {@link #getArrayKeys(Event)} (provided the cache is weak, safe and event-linked).
+ * This is not necessary, but it may be helpful for some expressions where the set of keys could potentially change
+ * between repeated calls, or is expensive to access.
+ * <br/>
+ * <br/>
+ * <h3>Caveats</h3>
+ * <ol>
+ *     <li>The caller may <i>never</i> ask for {@link #getArrayKeys(Event)}.
+ *     The cache should be disposed of in a timely manner.</li>
+ *     <li>It is (theoretically) possible for two separate calls to occur simultaneously
+ *     (asking for the value/key sets separately) so it is recommended to link any cache system to the event instance
+ *     .</li>
+ * </ol>
+ * Note that the caller may <i>never</i> ask for {@link #getArrayKeys(Event)} and so the cache should be disposed of
+ * in a timely manner.
+ * <br/>
+ * <pre>{@code
+ * Map<Event, Collection<String>> cache = new WeakHashMap<>();
+ *
+ * public Object[] getArray(Event event) {
+ *     Set<Entry<String, T>> entries = something.entrySet();
+ *     cache.put(event, List.copyOf(something.keySet()));
+ *     return something.values().toArray(...);
+ * }
+ *
+ * public String[] getArrayKeys(Event event) {
+ *     if (!cache.containsKey(event))
+ *         throw new IllegalStateException();
+ *     return cache.remove(event).toArray(new String[0]);
+ *     // this should never be absent/null
+ * }
+ * }</pre>
+ *
+ * @see Expression
+ * @see KeyReceiverExpression
+ */
+public interface KeyProviderExpression<T> extends Expression<T> {
+
+	/**
+	 * A set of keys, matching the length and order of the immediately-previous
+	 * {@link #getArray(Event)} values array.
+	 * <br/>
+	 * This should <b>only</b> be called immediately after a {@link #getArray(Event)} invocation.
+	 * If it is called without a matching values request (or after a delay) then the behaviour
+	 * is undefined, in which case:
+	 * <ul>
+	 *     <li>the method may throw an error,</li>
+	 *     <li>the method may return keys not matching any previous values,</li>
+	 *     <li>or the method may return nothing at all.</li>
+	 * </ul>
+	 *
+	 * @param event The event context
+	 * @return A set of keys, of the same length as {@link #getArray(Event)}
+	 * @throws IllegalStateException If this was not called directly after a {@link #getArray(Event)} call
+	 */
+	@NotNull String @NotNull [] getArrayKeys(Event event) throws IllegalStateException;
+
+	/**
+	 * A set of keys, matching the length and order of the immediately-previous
+	 * {@link #getAll(Event)} values array.
+	 * <br/>
+	 * This should <b>only</b> be called immediately after a {@link #getAll(Event)} invocation.
+	 * If it is called without a matching values request (or after a delay) then the behaviour
+	 * is undefined, in which case:
+	 * <ul>
+	 *     <li>the method may throw an error,</li>
+	 *     <li>the method may return keys not matching any previous values,</li>
+	 *     <li>or the method may return nothing at all.</li>
+	 * </ul>
+	 *
+	 * @param event The event context
+	 * @return A set of keys, of the same length as {@link #getAll(Event)}
+	 * @throws IllegalStateException If this was not called directly after a {@link #getAll(Event)} call
+	 */
+	default @NotNull String @NotNull [] getAllKeys(Event event) {
+		return this.getArrayKeys(event);
+	}
+
+	/**
+	 * Keyed expressions should never be single.
+	 */
+	@Override
+	default boolean isSingle() {
+		return false;
+	}
+
+	/**
+	 * While all keyed expressions <i>offer</i> their keys,
+	 * some may prefer that they are not used unless strictly required (e.g. variables).
+	 *
+	 * @return Whether the caller is recommended to ask for keys after asking for values
+	 */
+	default boolean areKeysRecommended() {
+		return true;
+	}
+
+}
diff --git a/src/main/java/ch/njol/skript/lang/KeyReceiverExpression.java b/src/main/java/ch/njol/skript/lang/KeyReceiverExpression.java
new file mode 100644
index 00000000000..e954c2ac5e0
--- /dev/null
+++ b/src/main/java/ch/njol/skript/lang/KeyReceiverExpression.java
@@ -0,0 +1,31 @@
+package ch.njol.skript.lang;
+
+import ch.njol.skript.classes.Changer;
+import ch.njol.skript.classes.Changer.ChangeMode;
+import org.bukkit.event.Event;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * Represents an expression that is able to accept a set of keys linked to values
+ * during the {@link ChangeMode#SET} {@link Changer}.
+ *
+ * @see Expression
+ * @see KeyReceiverExpression
+ */
+public interface KeyReceiverExpression<T> extends Expression<T> {
+
+	/**
+	 * An alternative changer method that provides a set of keys as well as a set of values.
+	 * This is only ever called for {@link ChangeMode#supportsKeyedChange()} safe change modes,
+	 * where a set of values is provided.
+	 * (This will never be called for valueless {@link ChangeMode#DELETE} or {@link ChangeMode#RESET} changers,
+	 * for example.)
+	 *
+	 * @param event The current event context
+	 * @param delta The change values
+	 * @param mode  The key-safe change mode {@link ChangeMode#SET}
+	 * @param keys  The keys, matching the length and order of the values array
+	 */
+	void change(Event event, Object @NotNull [] delta, ChangeMode mode, @NotNull String @NotNull [] keys);
+
+}
diff --git a/src/main/java/ch/njol/skript/lang/Literal.java b/src/main/java/ch/njol/skript/lang/Literal.java
index 115d0822edf..a685f3c2e30 100644
--- a/src/main/java/ch/njol/skript/lang/Literal.java
+++ b/src/main/java/ch/njol/skript/lang/Literal.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.lang;
 
 import org.jetbrains.annotations.Nullable;
@@ -32,9 +14,8 @@ public interface Literal<T> extends Expression<T> {
 	T getSingle();
 
 	@Override
-	@Nullable
 	@SuppressWarnings("unchecked")
-	<R> Literal<? extends R> getConvertedExpression(Class<R>... to);
+	<R> @Nullable Literal<? extends R> getConvertedExpression(Class<R>... to);
 
 	T[] getAll();
 
diff --git a/src/main/java/ch/njol/skript/lang/LiteralList.java b/src/main/java/ch/njol/skript/lang/LiteralList.java
index cf4571b375c..af0db3ca6ff 100644
--- a/src/main/java/ch/njol/skript/lang/LiteralList.java
+++ b/src/main/java/ch/njol/skript/lang/LiteralList.java
@@ -1,25 +1,7 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.lang;
 
-import ch.njol.skript.registrations.Classes;
 import ch.njol.skript.lang.util.SimpleLiteral;
+import ch.njol.skript.registrations.Classes;
 import org.jetbrains.annotations.Nullable;
 
 import java.lang.reflect.Array;
@@ -63,8 +45,8 @@ public T[] getAll() {
 	}
 
 	@Override
-	@Nullable
-	public <R> Literal<? extends R> getConvertedExpression(final Class<R>... to) {
+	@SuppressWarnings("unchecked")
+	public <R> @Nullable Literal<? extends R> getConvertedExpression(final Class<R>... to) {
 		Literal<? extends R>[] exprs = new Literal[expressions.length];
 		Class<?>[] returnTypes = new Class[expressions.length];
 		for (int i = 0; i < exprs.length; i++) {
diff --git a/src/main/java/ch/njol/skript/lang/LiteralString.java b/src/main/java/ch/njol/skript/lang/LiteralString.java
index 588bd1e5691..f26b1d9d919 100644
--- a/src/main/java/ch/njol/skript/lang/LiteralString.java
+++ b/src/main/java/ch/njol/skript/lang/LiteralString.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.lang;
 
 import ch.njol.skript.lang.util.ConvertedLiteral;
diff --git a/src/main/java/ch/njol/skript/lang/LoopSection.java b/src/main/java/ch/njol/skript/lang/LoopSection.java
index b126a8889c6..6c073faa63c 100644
--- a/src/main/java/ch/njol/skript/lang/LoopSection.java
+++ b/src/main/java/ch/njol/skript/lang/LoopSection.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.lang;
 
 import org.bukkit.event.Event;
diff --git a/src/main/java/ch/njol/skript/lang/Loopable.java b/src/main/java/ch/njol/skript/lang/Loopable.java
new file mode 100644
index 00000000000..4911b681422
--- /dev/null
+++ b/src/main/java/ch/njol/skript/lang/Loopable.java
@@ -0,0 +1,39 @@
+package ch.njol.skript.lang;
+
+import ch.njol.skript.lang.util.SimpleExpression;
+import org.bukkit.event.Event;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.Iterator;
+
+public interface Loopable<T> {
+
+	/**
+	 * Returns the same as {@link Expression#getArray(Event)} but as an iterator. This method should be overridden by expressions intended to be looped to increase performance.
+	 * @see SimpleExpression#iterator(Event)
+	 *
+	 * @param event The event to be used for evaluation
+	 * @return An iterator to iterate over all values of this expression which may be empty and/or null, but must not return null elements.
+	 */
+	@Nullable Iterator<? extends T> iterator(Event event);
+
+	/**
+	 * Checks whether the given 'loop-...' expression should match this loop, e.g. loop-block matches any loops that loop through blocks and loop-argument matches an
+	 * argument loop.
+	 * <p>
+	 * You should usually just return false as e.g. loop-block will automatically match the expression if its returnType is Block or a subtype of it.
+	 *
+	 * @param input The entered input string (the blank in loop-___)
+	 * @return Whether this loop matches the given string
+	 */
+	boolean isLoopOf(String input);
+
+	/**
+	 * Checks whether the expression allows using 'next loop-value' when provided as the iterator for a SecLoop.
+	 * @return
+	 */
+	default boolean supportsLoopPeeking() {
+		return false;
+	};
+
+}
diff --git a/src/main/java/ch/njol/skript/lang/ParseContext.java b/src/main/java/ch/njol/skript/lang/ParseContext.java
index ecac65279e7..c1dca4677de 100644
--- a/src/main/java/ch/njol/skript/lang/ParseContext.java
+++ b/src/main/java/ch/njol/skript/lang/ParseContext.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.lang;
 
 /**
diff --git a/src/main/java/ch/njol/skript/lang/ReturnHandler.java b/src/main/java/ch/njol/skript/lang/ReturnHandler.java
index d905599dc4b..e12a0482027 100644
--- a/src/main/java/ch/njol/skript/lang/ReturnHandler.java
+++ b/src/main/java/ch/njol/skript/lang/ReturnHandler.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.lang;
 
 import ch.njol.skript.ScriptLoader;
diff --git a/src/main/java/ch/njol/skript/lang/ReturnableTrigger.java b/src/main/java/ch/njol/skript/lang/ReturnableTrigger.java
index 08b6cea873e..90629b0776d 100644
--- a/src/main/java/ch/njol/skript/lang/ReturnableTrigger.java
+++ b/src/main/java/ch/njol/skript/lang/ReturnableTrigger.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.lang;
 
 import org.bukkit.event.Event;
diff --git a/src/main/java/ch/njol/skript/lang/Section.java b/src/main/java/ch/njol/skript/lang/Section.java
index 94c9f75bba4..cd4a2093faf 100644
--- a/src/main/java/ch/njol/skript/lang/Section.java
+++ b/src/main/java/ch/njol/skript/lang/Section.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.lang;
 
 import ch.njol.skript.ScriptLoader;
@@ -25,6 +7,8 @@
 import ch.njol.skript.lang.parser.ParserInstance;
 import ch.njol.util.Kleenean;
 import org.bukkit.event.Event;
+import org.jetbrains.annotations.ApiStatus;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.ArrayList;
@@ -64,7 +48,8 @@ public abstract class Section extends TriggerSection implements SyntaxElement {
 	@Override
 	public boolean init(Expression<?>[] expressions, int matchedPattern, Kleenean isDelayed, ParseResult parseResult) {
 		SectionContext sectionContext = getParser().getData(SectionContext.class);
-		return init(expressions, matchedPattern, isDelayed, parseResult, sectionContext.sectionNode, sectionContext.triggerItems);
+		return init(expressions, matchedPattern, isDelayed, parseResult, sectionContext.sectionNode, sectionContext.triggerItems)
+			&& sectionContext.claim(this);
 	}
 
 	public abstract boolean init(Expression<?>[] expressions,
@@ -172,9 +157,9 @@ protected void loadOptionalCode(SectionNode sectionNode) {
 	}
 
 	@Nullable
-	@SuppressWarnings({"unchecked", "rawtypes"})
 	public static Section parse(String expr, @Nullable String defaultError, SectionNode sectionNode, List<TriggerItem> triggerItems) {
 		SectionContext sectionContext = ParserInstance.get().getData(SectionContext.class);
+		//noinspection unchecked,rawtypes
 		return sectionContext.modify(sectionNode, triggerItems,
 			() -> (Section) SkriptParser.parse(expr, (Iterator) Skript.getSections().iterator(), defaultError));
 	}
@@ -188,6 +173,7 @@ protected static class SectionContext extends ParserInstance.Data {
 
 		protected SectionNode sectionNode;
 		protected List<TriggerItem> triggerItems;
+		protected @Nullable Debuggable owner;
 
 		public SectionContext(ParserInstance parserInstance) {
 			super(parserInstance);
@@ -205,18 +191,64 @@ public SectionContext(ParserInstance parserInstance) {
 		protected <T> T modify(SectionNode sectionNode, List<TriggerItem> triggerItems, Supplier<T> supplier) {
 			SectionNode prevSectionNode = this.sectionNode;
 			List<TriggerItem> prevTriggerItems = this.triggerItems;
+			Debuggable owner = this.owner;
 
 			this.sectionNode = sectionNode;
 			this.triggerItems = triggerItems;
+			this.owner = null;
 
 			T result = supplier.get();
 
 			this.sectionNode = prevSectionNode;
 			this.triggerItems = prevTriggerItems;
+			this.owner = owner;
 
 			return result;
 		}
 
+		/**
+		 * Marks the section this context represents as having been 'claimed' by the current syntax.
+		 * Once a syntax has claimed a section, another syntax may not claim it.
+		 *
+		 * @param syntax The syntax that wants to own this section
+		 * @return True if this was successfully claimed, false if it was already owned
+		 */
+		@ApiStatus.Internal
+		public <Syntax extends SyntaxElement & Debuggable> boolean claim(Syntax syntax) {
+			if (sectionNode == null)
+				return true;
+			if (this.claimed()) {
+				if (owner == syntax)
+					return true;
+				assert owner != null;
+				Skript.error("The syntax '" + syntax.toString(null, false)
+					+ "' tried to claim the current section, but it was already claimed by '"
+					+ this.owner.toString(null, false)
+					+ "'. You cannot have two section-starters in the same line.");
+				return false;
+			}
+			this.owner = syntax;
+			return true;
+		}
+
+		/**
+		 * Used to keep track of whether a syntax is managing the current section.
+		 * Every section needs exactly one manager. This is used to detect errors such as:
+		 * <ol>
+		 *     <li>Two syntax both want to manage the section (e.g. an effectsection and an expression or two expressions).</li>
+		 *     <li>No syntax wants to manage the section.</li>
+		 * </ol>
+		 * @return Whether a syntax is already managing this section context
+		 */
+		public boolean claimed() {
+			return owner != null;
+		}
+
+	}
+
+	@Override
+	public @NotNull String getSyntaxTypeName() {
+		return "section";
 	}
 
 }
diff --git a/src/main/java/ch/njol/skript/lang/SectionExitHandler.java b/src/main/java/ch/njol/skript/lang/SectionExitHandler.java
index 3b081245fdb..fd034735da4 100644
--- a/src/main/java/ch/njol/skript/lang/SectionExitHandler.java
+++ b/src/main/java/ch/njol/skript/lang/SectionExitHandler.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.lang;
 
 import org.bukkit.event.Event;
diff --git a/src/main/java/ch/njol/skript/lang/SectionSkriptEvent.java b/src/main/java/ch/njol/skript/lang/SectionSkriptEvent.java
index 05d8490aae7..ec03f1152ff 100644
--- a/src/main/java/ch/njol/skript/lang/SectionSkriptEvent.java
+++ b/src/main/java/ch/njol/skript/lang/SectionSkriptEvent.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.lang;
 
 import ch.njol.skript.SkriptAPIException;
diff --git a/src/main/java/ch/njol/skript/lang/SelfRegisteringSkriptEvent.java b/src/main/java/ch/njol/skript/lang/SelfRegisteringSkriptEvent.java
index 00b9f607620..17de22fd24f 100644
--- a/src/main/java/ch/njol/skript/lang/SelfRegisteringSkriptEvent.java
+++ b/src/main/java/ch/njol/skript/lang/SelfRegisteringSkriptEvent.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.lang;
 
 import ch.njol.skript.config.Config;
@@ -38,6 +20,7 @@ public abstract class SelfRegisteringSkriptEvent extends SkriptEvent {
 	 * Normally, that method would register the parsed trigger with {@link ch.njol.skript.SkriptEventHandler}.
 	 * A reference to the {@link Trigger} is available through {@link #trigger}.
 	 */
+	@Deprecated
 	public abstract void register(Trigger t);
 
 	/**
@@ -48,6 +31,7 @@ public abstract class SelfRegisteringSkriptEvent extends SkriptEvent {
 	 * Normally, that method would unregister the parsed trigger with {@link ch.njol.skript.SkriptEventHandler}.
 	 * A reference to the {@link Trigger} is available through {@link #trigger}.
 	 */
+	@Deprecated
 	public abstract void unregister(Trigger t);
 
 	/**
@@ -57,6 +41,7 @@ public abstract class SelfRegisteringSkriptEvent extends SkriptEvent {
 	 * @deprecated This method should no longer be used.
 	 * Each trigger should be unregistered through {@link #unregister(Trigger)}.
 	 */
+	@Deprecated
 	public abstract void unregisterAll();
 
 	@Override
diff --git a/src/main/java/ch/njol/skript/lang/SkriptEvent.java b/src/main/java/ch/njol/skript/lang/SkriptEvent.java
index 693396d69a9..c7eb245fb22 100644
--- a/src/main/java/ch/njol/skript/lang/SkriptEvent.java
+++ b/src/main/java/ch/njol/skript/lang/SkriptEvent.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.lang;
 
 import ch.njol.skript.ScriptLoader;
@@ -26,10 +8,11 @@
 import ch.njol.skript.events.EvtClick;
 import ch.njol.skript.lang.SkriptParser.ParseResult;
 import ch.njol.skript.structures.StructEvent.EventData;
-import ch.njol.skript.util.Utils;
-import org.bukkit.event.Cancellable;
 import org.bukkit.event.Event;
 import org.bukkit.event.EventPriority;
+import org.skriptlang.skript.bukkit.registration.BukkitSyntaxInfos;
+import ch.njol.skript.util.Utils;
+import org.bukkit.event.Cancellable;
 import org.jetbrains.annotations.Nullable;
 import org.skriptlang.skript.lang.entry.EntryContainer;
 import org.skriptlang.skript.lang.script.Script;
@@ -55,10 +38,8 @@ public abstract class SkriptEvent extends Structure {
 
 	private String expr;
 	private SectionNode source;
-	@Nullable
-	protected EventPriority eventPriority;
-	@Nullable
-	protected ListeningBehavior listeningBehavior;
+	protected @Nullable EventPriority eventPriority;
+	protected @Nullable ListeningBehavior listeningBehavior;
 	protected boolean supportsListeningBehavior;
 	private SkriptEventInfo<?> skriptEventInfo;
 
@@ -137,7 +118,6 @@ public boolean load() {
 		if (!shouldLoadEvent())
 			return false;
 
-		// noinspection ConstantConditions - entry container cannot be null as this structure is not simple
 		if (Skript.debug() || source.debug())
 			Skript.debug(expr + " (" + this + "):");
 
@@ -259,29 +239,7 @@ public boolean canExecuteAsynchronously() {
 	 * to be nullable.
 	 */
 	public static String fixPattern(String pattern) {
-		char[] chars = pattern.toCharArray();
-		StringBuilder stringBuilder = new StringBuilder();
-
-		boolean inType = false;
-		for (int i = 0; i < chars.length; i++) {
-			char character = chars[i];
-			stringBuilder.append(character);
-
-			if (character == '%') {
-				// toggle inType
-				inType = !inType;
-
-				// add the dash character if it's not already present
-				// a type specification can have two prefix characters for modification
-				if (inType && i + 2 < chars.length && chars[i + 1] != '-' && chars[i + 2] != '-')
-					stringBuilder.append('-');
-			} else if (character == '\\' && i + 1 < chars.length) {
-				// Make sure we don't toggle inType for escape percentage signs
-				stringBuilder.append(chars[i + 1]);
-				i++;
-			}
-		}
-		return stringBuilder.toString();
+		return BukkitSyntaxInfos.fixPattern(pattern);
 	}
 
 	@Nullable
diff --git a/src/main/java/ch/njol/skript/lang/SkriptEventInfo.java b/src/main/java/ch/njol/skript/lang/SkriptEventInfo.java
index bf63e19203f..71bd8e661e9 100644
--- a/src/main/java/ch/njol/skript/lang/SkriptEventInfo.java
+++ b/src/main/java/ch/njol/skript/lang/SkriptEventInfo.java
@@ -1,45 +1,34 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.lang;
 
+import ch.njol.skript.Skript;
 import ch.njol.skript.SkriptAPIException;
 import ch.njol.skript.SkriptConfig;
+import ch.njol.skript.lang.SkriptEvent.ListeningBehavior;
+import ch.njol.skript.lang.SkriptEventInfo.ModernSkriptEventInfo;
 import org.bukkit.event.Event;
 import org.bukkit.event.player.PlayerInteractAtEntityEvent;
+import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.Nullable;
+import org.jetbrains.annotations.Unmodifiable;
+import org.skriptlang.skript.bukkit.registration.BukkitSyntaxInfos;
 import org.skriptlang.skript.lang.structure.StructureInfo;
-import ch.njol.skript.lang.SkriptEvent.ListeningBehavior;
+import org.skriptlang.skript.registration.SyntaxInfo;
+import org.skriptlang.skript.registration.SyntaxOrigin;
+import org.skriptlang.skript.util.Priority;
 
+import java.lang.reflect.InvocationTargetException;
+import java.util.Collection;
+import java.util.List;
 import java.util.Locale;
 
-public final class SkriptEventInfo<E extends SkriptEvent> extends StructureInfo<E> {
+public sealed class SkriptEventInfo<E extends SkriptEvent> extends StructureInfo<E> permits ModernSkriptEventInfo {
 
 	public Class<? extends Event>[] events;
 	public final String name;
   
 	private ListeningBehavior listeningBehavior;
-  
-	@Nullable
-	private String[] description, examples, keywords, requiredPlugins;
-
-	@Nullable
-	private String since, documentationID;
+	private String @Nullable [] description, examples, keywords, requiredPlugins;
+	private @Nullable String since, documentationID;
 
 	private final String id;
 
@@ -180,33 +169,149 @@ public ListeningBehavior getListeningBehavior() {
 		return listeningBehavior;
 	}
   
-	@Nullable
-	public String[] getDescription() {
+	public String @Nullable [] getDescription() {
 		return description;
 	}
 
-	@Nullable
-	public String[] getExamples() {
+	public String @Nullable [] getExamples() {
 		return examples;
 	}
 
-	@Nullable
-	public String[] getKeywords() {
+	public String @Nullable [] getKeywords() {
 		return keywords;
 	}
 
-	@Nullable
-	public String getSince() {
+	public @Nullable String getSince() {
 		return since;
 	}
 
-	@Nullable
-	public String[] getRequiredPlugins() {
+	public String @Nullable [] getRequiredPlugins() {
 		return requiredPlugins;
 	}
 
-	@Nullable
-	public String getDocumentationID() {
+	public @Nullable String getDocumentationID() {
 		return documentationID;
 	}
+
+	/*
+	 * Registration API Compatibility
+	 */
+
+	/**
+	 * Internal wrapper class for providing compatibility with the new Registration API.
+	 */
+	@ApiStatus.Internal
+	@ApiStatus.Experimental
+	public static final class ModernSkriptEventInfo<E extends SkriptEvent>
+			extends SkriptEventInfo<E>
+			implements BukkitSyntaxInfos.Event<E> {
+
+		private final SyntaxOrigin origin;
+
+		public ModernSkriptEventInfo(String name, String[] patterns, Class<E> eventClass, String originClassPath, Class<? extends Event>[] events) {
+			super(name, patterns, eventClass, originClassPath, events);
+			this.origin = Skript.getSyntaxOrigin(eventClass);
+		}
+
+		@Override
+		public Builder<? extends Builder<?, E>, E> toBuilder() {
+			return BukkitSyntaxInfos.Event.builder(type(), name())
+				.origin(origin)
+				.addPatterns(patterns())
+				.priority(priority())
+				.listeningBehavior(listeningBehavior())
+				.since(since())
+				.documentationId(id())
+				.addDescription(description())
+				.addExamples(examples())
+				.addKeywords(keywords())
+				.addRequiredPlugins(requiredPlugins())
+				.addEvents(events());
+		}
+
+		@Override
+		public SyntaxOrigin origin() {
+			return origin;
+		}
+
+		@Override
+		public Class<E> type() {
+			return getElementClass();
+		}
+
+		@Override
+		public E instance() {
+			try {
+				return type().getDeclaredConstructor().newInstance();
+			} catch (InstantiationException | IllegalAccessException | InvocationTargetException |
+					 NoSuchMethodException e) {
+				throw new RuntimeException(e);
+			}
+		}
+
+		@Override
+		public @Unmodifiable Collection<String> patterns() {
+			return List.of(getPatterns());
+		}
+
+		@Override
+		public Priority priority() {
+			return SyntaxInfo.COMBINED;
+		}
+
+		@Override
+		public ListeningBehavior listeningBehavior() {
+			return getListeningBehavior();
+		}
+
+		@Override
+		public String name() {
+			return getName();
+		}
+
+		@Override
+		public String id() {
+			return getId();
+		}
+
+		@Override
+		public @Nullable String since() {
+			return getSince();
+		}
+
+		@Override
+		public @Nullable String documentationId() {
+			return getDocumentationID();
+		}
+
+		@Override
+		public Collection<String> description() {
+			String[] description = getDescription();
+			return description != null ? List.of(description) : List.of();
+		}
+
+		@Override
+		public Collection<String> examples() {
+			String[] examples = getExamples();
+			return examples != null ? List.of(examples) : List.of();
+		}
+
+		@Override
+		public Collection<String> keywords() {
+			String[] keywords = getKeywords();
+			return keywords != null ? List.of(keywords) : List.of();
+		}
+
+		@Override
+		public Collection<String> requiredPlugins() {
+			String[] requiredPlugins = getRequiredPlugins();
+			return requiredPlugins != null ? List.of(requiredPlugins) : List.of();
+		}
+
+		@Override
+		public Collection<Class<? extends Event>> events() {
+			return List.of(events);
+		}
+	}
+
 }
diff --git a/src/main/java/ch/njol/skript/lang/SkriptParser.java b/src/main/java/ch/njol/skript/lang/SkriptParser.java
index cefa92b2549..a6eb399dfc8 100644
--- a/src/main/java/ch/njol/skript/lang/SkriptParser.java
+++ b/src/main/java/ch/njol/skript/lang/SkriptParser.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.lang;
 
 import ch.njol.skript.Skript;
@@ -49,19 +31,14 @@
 import ch.njol.util.StringUtils;
 import ch.njol.util.coll.CollectionUtils;
 import com.google.common.primitives.Booleans;
+import org.bukkit.event.Event;
 import org.bukkit.plugin.java.JavaPlugin;
-import org.jetbrains.annotations.Nullable;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 import org.skriptlang.skript.lang.script.Script;
 import org.skriptlang.skript.lang.script.ScriptWarning;
 
-import java.util.ArrayList;
-import java.util.Deque;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
+import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.function.Supplier;
@@ -121,8 +98,7 @@ public SkriptParser(SkriptParser other, String expr) {
 	public static final String WILDCARD = "[^\"]*?(?:\"[^\"]*?\"[^\"]*?)*?";
 
 	public static class ParseResult {
-		@Nullable
-		public SkriptPattern source;
+		public @Nullable SkriptPattern source;
 		public Expression<?>[] exprs;
 		public List<MatchResult> regexes = new ArrayList<>(1);
 		public String expr;
@@ -153,12 +129,11 @@ public boolean hasTag(String tag) {
 	 * <p>
 	 * Prints errors.
 	 */
-	@Nullable
-	@SuppressWarnings("unchecked")
-	public static <T> Literal<? extends T> parseLiteral(String expr, Class<T> expectedClass, ParseContext context) {
+	public static <T> @Nullable Literal<? extends T> parseLiteral(String expr, Class<T> expectedClass, ParseContext context) {
 		expr = "" + expr.trim();
 		if (expr.isEmpty())
 			return null;
+		//noinspection ReassignedVariable,unchecked
 		return new UnparsedLiteral(expr).getConvertedExpression(context, expectedClass);
 	}
 
@@ -167,15 +142,13 @@ public static <T> Literal<? extends T> parseLiteral(String expr, Class<T> expect
 	 * <p>
 	 * Can print an error.
 	 */
-	@Nullable
-	public static <T extends SyntaxElement> T parse(String expr, Iterator<? extends SyntaxElementInfo<T>> source, @Nullable String defaultError) {
+	public static <T extends SyntaxElement> @Nullable T parse(String expr, Iterator<? extends SyntaxElementInfo<T>> source, @Nullable String defaultError) {
 		expr = "" + expr.trim();
 		if (expr.isEmpty()) {
 			Skript.error(defaultError);
 			return null;
 		}
-		ParseLogHandler log = SkriptLogger.startParseLogHandler();
-		try {
+		try (ParseLogHandler log = SkriptLogger.startParseLogHandler()) {
 			T element = new SkriptParser(expr).parse(source);
 			if (element != null) {
 				log.printLog();
@@ -183,27 +156,22 @@ public static <T extends SyntaxElement> T parse(String expr, Iterator<? extends
 			}
 			log.printError(defaultError);
 			return null;
-		} finally {
-			log.stop();
 		}
 	}
 
-	@Nullable
-	public static <T extends SyntaxElement> T parseStatic(String expr, Iterator<? extends SyntaxElementInfo<? extends T>> source, @Nullable String defaultError) {
+	public static <T extends SyntaxElement> @Nullable T parseStatic(String expr, Iterator<? extends SyntaxElementInfo<? extends T>> source, @Nullable String defaultError) {
 		return parseStatic(expr, source, ParseContext.DEFAULT, defaultError);
 	}
 
-	@Nullable
-	public static <T extends SyntaxElement> T parseStatic(String expr, Iterator<? extends SyntaxElementInfo<? extends T>> source, ParseContext parseContext, @Nullable String defaultError) {
+	public static <T extends SyntaxElement> @Nullable T parseStatic(String expr, Iterator<? extends SyntaxElementInfo<? extends T>> source, ParseContext parseContext, @Nullable String defaultError) {
 		expr = expr.trim();
 		if (expr.isEmpty()) {
 			Skript.error(defaultError);
 			return null;
 		}
 
-		ParseLogHandler log = SkriptLogger.startParseLogHandler();
 		T element;
-		try {
+		try (ParseLogHandler log = SkriptLogger.startParseLogHandler()) {
 			element = new SkriptParser(expr, PARSE_LITERALS, parseContext).parse(source);
 			if (element != null) {
 				log.printLog();
@@ -211,15 +179,11 @@ public static <T extends SyntaxElement> T parseStatic(String expr, Iterator<? ex
 			}
 			log.printError(defaultError);
 			return null;
-		} finally {
-			log.stop();
 		}
 	}
 
-	@Nullable
-	private <T extends SyntaxElement> T parse(Iterator<? extends SyntaxElementInfo<? extends T>> source) {
-		ParseLogHandler log = SkriptLogger.startParseLogHandler();
-		try {
+	private <T extends SyntaxElement> @Nullable T parse(Iterator<? extends SyntaxElementInfo<? extends T>> source) {
+		try (ParseLogHandler log = SkriptLogger.startParseLogHandler()) {
 			while (source.hasNext()) {
 				SyntaxElementInfo<? extends T> info = source.next();
 				patternsLoop: for (int patternIndex = 0; patternIndex < info.patterns.length; patternIndex++) {
@@ -256,7 +220,26 @@ private <T extends SyntaxElement> T parse(Iterator<? extends SyntaxElementInfo<?
 								}
 							}
 							T element = info.getElementClass().newInstance();
-							if (element.init(parseResult.exprs, patternIndex, getParser().getHasDelayBefore(), parseResult)) {
+
+							if (element instanceof EventRestrictedSyntax eventRestrictedSyntax) {
+								Class<? extends Event>[] supportedEvents = eventRestrictedSyntax.supportedEvents();
+								if (!getParser().isCurrentEvent(supportedEvents)) {
+									Iterator<String> iterator = Arrays.stream(supportedEvents)
+										.map(it -> "the " + it.getSimpleName()
+											.replaceAll("([A-Z])", " $1")
+											.toLowerCase()
+											.trim())
+										.iterator();
+
+									String events = StringUtils.join(iterator, ", ", " or ");
+
+									Skript.error("'" + parseResult.expr + "' can only be used in " + events);
+									continue;
+								}
+							}
+
+							boolean success = element.init(parseResult.exprs, patternIndex, getParser().getHasDelayBefore(), parseResult);
+							if (success) {
 								log.printLog();
 								return element;
 							}
@@ -268,12 +251,10 @@ private <T extends SyntaxElement> T parse(Iterator<? extends SyntaxElementInfo<?
 			}
 			log.printError();
 			return null;
-		} finally {
-			log.stop();
 		}
 	}
 
-	private static <T extends SyntaxElement> @NotNull DefaultExpression<?> getDefaultExpression(ExprInfo exprInfo, String pattern) {
+	private static @NotNull DefaultExpression<?> getDefaultExpression(ExprInfo exprInfo, String pattern) {
 		DefaultExpression<?> expr = exprInfo.classes[0].getDefaultExpression();
 		if (expr == null)
 			throw new SkriptAPIException("The class '" + exprInfo.classes[0].getCodeName() + "' does not provide a default expression. Either allow null (with %-" + exprInfo.classes[0].getCodeName() + "%) or make it mandatory [pattern: " + pattern + "]");
@@ -293,8 +274,7 @@ private <T extends SyntaxElement> T parse(Iterator<? extends SyntaxElementInfo<?
 	/**
 	 * Prints errors
 	 */
-	@Nullable
-	private static <T> Variable<T> parseVariable(String expr, Class<? extends T>[] returnTypes) {
+	private static <T> @Nullable Variable<T> parseVariable(String expr, Class<? extends T>[] returnTypes) {
 		if (VARIABLE_PATTERN.matcher(expr).matches()) {
 			String variableName = "" + expr.substring(expr.indexOf('{') + 1, expr.lastIndexOf('}'));
 			boolean inExpression = false;
@@ -317,19 +297,22 @@ private static <T> Variable<T> parseVariable(String expr, Class<? extends T>[] r
 		return null;
 	}
 
-	@Nullable
-	private static Expression<?> parseExpression(Class<?>[] types, String expr) {;
+	private static @Nullable Expression<?> parseExpression(Class<?>[] types, String expr) {;
+		if (expr.startsWith("“") || expr.startsWith("”") || expr.endsWith("”") || expr.endsWith("“")) {
+			Skript.error("Pretty quotes are not allowed, change to regular quotes (\")");
+			return null;
+		}
 		if (expr.startsWith("\"") && expr.length() != 1 && nextQuote(expr, 1) == expr.length() - 1) {
 			return VariableString.newInstance("" + expr.substring(1, expr.length() - 1));
 		} else {
+			//noinspection unchecked,rawtypes
 			return (Expression<?>) parse(expr, (Iterator) Skript.getExpressions(types), null);
 		}
 	}
 
 
-	@Nullable
-	@SuppressWarnings({"unchecked", "rawtypes"})
-	private <T> Expression<? extends T> parseSingleExpr(boolean allowUnparsedLiteral, @Nullable LogEntry error, Class<? extends T>... types) {
+	@SuppressWarnings({"unchecked"})
+	private <T> @Nullable Expression<? extends T> parseSingleExpr(boolean allowUnparsedLiteral, @Nullable LogEntry error, Class<? extends T>... types) {
 		assert types.length > 0;
 		assert types.length == 1 || !CollectionUtils.contains(types, Object.class);
 		if (expr.isEmpty())
@@ -339,8 +322,7 @@ private <T> Expression<? extends T> parseSingleExpr(boolean allowUnparsedLiteral
 					expr.startsWith("(") && expr.endsWith(")") &&
 					next(expr, 0, context) == expr.length())
 			return new SkriptParser(this, "" + expr.substring(1, expr.length() - 1)).parseSingleExpr(allowUnparsedLiteral, error, types);
-		ParseLogHandler log = SkriptLogger.startParseLogHandler();
-		try {
+		try (ParseLogHandler log = SkriptLogger.startParseLogHandler()) {
 			if (context == ParseContext.DEFAULT || context == ParseContext.EVENT) {
 				Variable<? extends T> parsedVariable = parseVariable(expr, types);
 				if (parsedVariable != null) {
@@ -358,6 +340,7 @@ private <T> Expression<? extends T> parseSingleExpr(boolean allowUnparsedLiteral
 				FunctionReference<T> functionReference = parseFunction(types);
 				if (functionReference != null) {
 					log.printLog();
+					//noinspection rawtypes
 					return new ExprFunctionCall(functionReference);
 				} else if (log.hasError()) {
 					log.printError();
@@ -368,9 +351,9 @@ private <T> Expression<? extends T> parseSingleExpr(boolean allowUnparsedLiteral
 			if ((flags & PARSE_EXPRESSIONS) != 0) {
 				Expression<?> parsedExpression = parseExpression(types, expr);
 				if (parsedExpression != null) { // Expression/VariableString parsing success
+					Class<?> parsedReturnType = parsedExpression.getReturnType();
 					for (Class<? extends T> type : types) {
-						// Check return type against everything that expression accepts
-						if (parsedExpression.canReturn(type)) {
+						if (type.isAssignableFrom(parsedReturnType)) {
 							log.printLog();
 							return (Expression<? extends T>) parsedExpression;
 						}
@@ -414,13 +397,10 @@ private <T> Expression<? extends T> parseSingleExpr(boolean allowUnparsedLiteral
 			}
 			log.printError();
 			return null;
-		} finally {
-			log.stop();
 		}
 	}
 
-	@Nullable
-	private Expression<?> parseSingleExpr(boolean allowUnparsedLiteral, @Nullable LogEntry error, ExprInfo exprInfo) {
+	private @Nullable Expression<?> parseSingleExpr(boolean allowUnparsedLiteral, @Nullable LogEntry error, ExprInfo exprInfo) {
 		if (expr.isEmpty()) // Empty expressions return nothing, obviously
 			return null;
 
@@ -430,8 +410,7 @@ private Expression<?> parseSingleExpr(boolean allowUnparsedLiteral, @Nullable Lo
 					expr.startsWith("(") && expr.endsWith(")") &&
 					next(expr, 0, context) == expr.length())
 			return new SkriptParser(this, "" + expr.substring(1, expr.length() - 1)).parseSingleExpr(allowUnparsedLiteral, error, exprInfo);
-		ParseLogHandler log = SkriptLogger.startParseLogHandler();
-		try {
+		try (ParseLogHandler log = SkriptLogger.startParseLogHandler()) {
 			// Construct types array which contains all potential classes
 			Class<?>[] types = new Class[exprInfo.classes.length]; // This may contain nulls!
 			boolean hasSingular = false;
@@ -540,13 +519,14 @@ private Expression<?> parseSingleExpr(boolean allowUnparsedLiteral, @Nullable Lo
 			if ((flags & PARSE_EXPRESSIONS) != 0) {
 				Expression<?> parsedExpression = parseExpression(types, expr);
 				if (parsedExpression != null) { // Expression/VariableString parsing success
+					Class<?> parsedReturnType = parsedExpression.getReturnType();
 					for (int i = 0; i < types.length; i++) {
 						Class<?> type = types[i];
 						if (type == null) // Ignore invalid (null) types
 							continue;
 
-						// Check return type against everything that expression accepts
-						if (parsedExpression.canReturn(type)) {
+						// Check return type against the expression's return type
+						if (type.isAssignableFrom(parsedReturnType)) {
 							if (!exprInfo.isPlural[i] && !parsedExpression.isSingle()) { // Wrong number of arguments
 								if (context == ParseContext.COMMAND) {
 									Skript.error(Commands.m_too_many_arguments.toString(exprInfo.classes[i].getName().getIndefiniteArticle(), exprInfo.classes[i].getName().toString()), ErrorQuality.SEMANTIC_ERROR);
@@ -614,8 +594,6 @@ private Expression<?> parseSingleExpr(boolean allowUnparsedLiteral, @Nullable Lo
 			}
 			log.printError();
 			return null;
-		} finally {
-			log.stop();
 		}
 	}
 
@@ -637,13 +615,12 @@ private SkriptParser suppressMissingAndOrWarnings() {
 		return this;
 	}
 
-	@Nullable
 	@SuppressWarnings("unchecked")
-	public <T> Expression<? extends T> parseExpression(Class<? extends T>... types) {
+	public <T> @Nullable Expression<? extends T> parseExpression(Class<? extends T>... types) {
 		if (expr.length() == 0)
 			return null;
 
-		assert types != null && types.length > 0;
+		assert types.length > 0;
 		assert types.length == 1 || !CollectionUtils.contains(types, Object.class);
 
 		ParseLogHandler log = SkriptLogger.startParseLogHandler();
@@ -661,8 +638,7 @@ public <T> Expression<? extends T> parseExpression(Class<? extends T>... types)
 		}
 	}
 
-	@Nullable
-	private <T> Expression<? extends T> parseExpressionList(ParseLogHandler log, Class<? extends T>... types) {
+	private <T> @Nullable Expression<? extends T> parseExpressionList(ParseLogHandler log, Class<? extends T>... types) {
 		boolean isObject = types.length == 1 && types[0] == Object.class;
 		List<Expression<? extends T>> parsedExpressions = new ArrayList<>();
 		Kleenean and = Kleenean.UNKNOWN;
@@ -769,14 +745,12 @@ private <T> Expression<? extends T> parseExpressionList(ParseLogHandler log, Cla
 		}
 	}
 
-	@Nullable
-	public Expression<?> parseExpression(ExprInfo exprInfo) {
+	public @Nullable Expression<?> parseExpression(ExprInfo exprInfo) {
 		if (expr.length() == 0)
 			return null;
 
 		boolean isObject = exprInfo.classes.length == 1 && exprInfo.classes[0].getC() == Object.class;
-		ParseLogHandler log = SkriptLogger.startParseLogHandler();
-		try {
+		try (ParseLogHandler log = SkriptLogger.startParseLogHandler()) {
 			// Attempt to parse a single expression
 			Expression<?> parsedExpression = parseSingleExpr(true, null, exprInfo);
 			if (parsedExpression != null) {
@@ -900,8 +874,6 @@ public Expression<?> parseExpression(ExprInfo exprInfo) {
 				return new ExpressionList(expressions, Classes.getSuperClassInfo(exprReturnTypes).getC(), exprReturnTypes, !and.isFalse());
 
 			}
-		} finally {
-			log.stop();
 		}
 	}
 
@@ -911,14 +883,12 @@ public Expression<?> parseExpression(ExprInfo exprInfo) {
 	 * @param types The required return type or null if it is not used (e.g. when calling a void function)
 	 * @return The parsed function, or null if the given expression is not a function call or is an invalid function call (check for an error to differentiate these two)
 	 */
-	@Nullable
 	@SuppressWarnings("unchecked")
-	public <T> FunctionReference<T> parseFunction(@Nullable Class<? extends T>... types) {
+	public <T> @Nullable FunctionReference<T> parseFunction(@Nullable Class<? extends T>... types) {
 		if (context != ParseContext.DEFAULT && context != ParseContext.EVENT)
 			return null;
-		ParseLogHandler log = SkriptLogger.startParseLogHandler();
 		AtomicBoolean unaryArgument = new AtomicBoolean(false);
-		try {
+		try (ParseLogHandler log = SkriptLogger.startParseLogHandler()) {
 			Matcher matcher = FUNCTION_CALL_PATTERN.matcher(expr);
 			if (!matcher.matches()) {
 				log.printLog();
@@ -973,8 +943,6 @@ public <T> FunctionReference<T> parseFunction(@Nullable Class<? extends T>... ty
 			}
 			log.printLog();
 			return functionReference;
-		} finally {
-			log.stop();
 		}
 	}
 
@@ -1026,8 +994,7 @@ public static boolean parseArguments(String args, ScriptCommand command, ScriptC
 	 * <p>
 	 * Prints parse errors (i.e. must start a ParseLog before calling this method)
 	 */
-	@Nullable
-	public static ParseResult parse(String text, String pattern) {
+	public static @Nullable ParseResult parse(String text, String pattern) {
 		return new SkriptParser(text, PARSE_LITERALS, ParseContext.COMMAND).parse_i(pattern);
 	}
 
@@ -1036,8 +1003,7 @@ public static ParseResult parse(String text, String pattern) {
 	 * <p>
 	 * Prints parse errors (i.e. must start a ParseLog before calling this method)
 	 */
-	@Nullable
-	public static ParseResult parse(String text, String pattern, int parseFlags, ParseContext parseContext) {
+	public static @Nullable ParseResult parse(String text, String pattern, int parseFlags, ParseContext parseContext) {
 		return new SkriptParser(text, parseFlags, parseContext).parse_i(pattern);
 	}
 
@@ -1046,8 +1012,7 @@ public static ParseResult parse(String text, String pattern, int parseFlags, Par
 	 * <p>
 	 * Prints parse errors (i.e. must start a ParseLog before calling this method)
 	 */
-	@Nullable
-	public static ParseResult parse(String text, SkriptPattern pattern, int parseFlags, ParseContext parseContext) {
+	public static @Nullable ParseResult parse(String text, SkriptPattern pattern, int parseFlags, ParseContext parseContext) {
 		return parse(text, pattern.toString(), parseFlags, parseContext);
 	}
 
@@ -1325,8 +1290,7 @@ public static int nextOccurrence(String haystack, String needle, int startIndex,
 
 	private static final Map<String, SkriptPattern> patterns = new ConcurrentHashMap<>();
 
-	@Nullable
-	private ParseResult parse_i(String pattern) {
+	private @Nullable ParseResult parse_i(String pattern) {
 		SkriptPattern skriptPattern = patterns.computeIfAbsent(pattern, PatternCompiler::compile);
 		ch.njol.skript.patterns.MatchResult matchResult = skriptPattern.match(expr, flags, context);
 		if (matchResult == null)
@@ -1340,8 +1304,7 @@ private ParseResult parse_i(String pattern) {
 	 * @param pattern The pattern string to validate
 	 * @return The pattern with %codenames% and a boolean array that contains whether the expressions are plural or not
 	 */
-	@Nullable
-	public static NonNullPair<String, NonNullPair<ClassInfo<?>, Boolean>[]> validatePattern(String pattern) {
+	public static @Nullable NonNullPair<String, NonNullPair<ClassInfo<?>, Boolean>[]> validatePattern(String pattern) {
 		List<NonNullPair<ClassInfo<?>, Boolean>> pairs = new ArrayList<>();
 		int groupLevel = 0, optionalLevel = 0;
 		Deque<Character> groups = new LinkedList<>();
@@ -1408,8 +1371,7 @@ public static NonNullPair<String, NonNullPair<ClassInfo<?>, Boolean>[]> validate
 		return new NonNullPair<>(stringBuilder.toString(), pairs.toArray(new NonNullPair[0]));
 	}
 
-	@Nullable
-	private static NonNullPair<String, NonNullPair<ClassInfo<?>, Boolean>[]> error(final String error) {
+	private static @Nullable NonNullPair<String, NonNullPair<ClassInfo<?>, Boolean>[]> error(final String error) {
 		Skript.error("Invalid pattern: " + error);
 		return null;
 	}
diff --git a/src/main/java/ch/njol/skript/lang/Statement.java b/src/main/java/ch/njol/skript/lang/Statement.java
index 2f4f783541c..ef7115961b4 100644
--- a/src/main/java/ch/njol/skript/lang/Statement.java
+++ b/src/main/java/ch/njol/skript/lang/Statement.java
@@ -1,25 +1,9 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.lang;
 
 import ch.njol.skript.Skript;
+import ch.njol.skript.config.SectionNode;
 import ch.njol.skript.lang.function.EffFunctionCall;
+import ch.njol.skript.lang.parser.ParserInstance;
 import ch.njol.skript.log.ParseLogHandler;
 import ch.njol.skript.log.SkriptLogger;
 import org.jetbrains.annotations.Nullable;
@@ -40,11 +24,12 @@ public abstract class Statement extends TriggerItem implements SyntaxElement {
 		return parse(input, null, defaultError);
 	}
 
-	@Nullable
-	@SuppressWarnings({"rawtypes", "unchecked"})
-	public static Statement parse(String input, @Nullable List<TriggerItem> items, String defaultError) {
-		ParseLogHandler log = SkriptLogger.startParseLogHandler();
-		try {
+	public static @Nullable Statement parse(String input, @Nullable List<TriggerItem> items, String defaultError) {
+		return parse(input, defaultError, null, items);
+	}
+
+	public static @Nullable Statement parse(String input, @Nullable String defaultError, @Nullable SectionNode node, @Nullable List<TriggerItem> items) {
+		try (ParseLogHandler log = SkriptLogger.startParseLogHandler()) {
 			EffFunctionCall functionCall = EffFunctionCall.parse(input);
 			if (functionCall != null) {
 				log.printLog();
@@ -62,7 +47,23 @@ public static Statement parse(String input, @Nullable List<TriggerItem> items, S
 			}
 			log.clear();
 
-			Statement statement = (Statement) SkriptParser.parse(input, (Iterator) Skript.getStatements().iterator(), defaultError);
+			Statement statement;
+			if (node != null) {
+				Section.SectionContext sectionContext = ParserInstance.get().getData(Section.SectionContext.class);
+				statement = sectionContext.modify(node, items, () -> {
+						//noinspection unchecked,rawtypes
+						Statement parsed = (Statement) SkriptParser.parse(input, (Iterator) Skript.getStatements().iterator(), defaultError);
+						if (parsed != null && !sectionContext.claimed()) {
+							Skript.error("The line '" + input + "' is a valid statement but cannot function as a section (:) because there is no syntax in the line to manage it.");
+							return null;
+						}
+						return parsed;
+				});
+			} else {
+				//noinspection unchecked,rawtypes
+				statement = (Statement) SkriptParser.parse(input, (Iterator) Skript.getStatements().iterator(), defaultError);
+			}
+
 			if (statement != null) {
 				log.printLog();
 				return statement;
@@ -70,8 +71,6 @@ public static Statement parse(String input, @Nullable List<TriggerItem> items, S
 
 			log.printError();
 			return null;
-		} finally {
-			log.stop();
 		}
 	}
 
diff --git a/src/main/java/ch/njol/skript/lang/SyntaxElement.java b/src/main/java/ch/njol/skript/lang/SyntaxElement.java
index 5ab3589733c..3693d7899bd 100644
--- a/src/main/java/ch/njol/skript/lang/SyntaxElement.java
+++ b/src/main/java/ch/njol/skript/lang/SyntaxElement.java
@@ -1,26 +1,10 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.lang;
 
 import ch.njol.skript.lang.SkriptParser.ParseResult;
 import ch.njol.skript.lang.parser.ParserInstance;
 import ch.njol.util.Kleenean;
+import org.jetbrains.annotations.Contract;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * Represents a general part of the syntax.
@@ -47,4 +31,10 @@ default ParserInstance getParser() {
 		return ParserInstance.get();
 	}
 
+	/**
+	 * @return A string naming the type of syntax this is. e.g. "expression", "section".
+	 */
+	@Contract(pure = true)
+	@NotNull String getSyntaxTypeName();
+
 }
diff --git a/src/main/java/ch/njol/skript/lang/SyntaxElementInfo.java b/src/main/java/ch/njol/skript/lang/SyntaxElementInfo.java
index 3945d2eb02b..2724451d23d 100644
--- a/src/main/java/ch/njol/skript/lang/SyntaxElementInfo.java
+++ b/src/main/java/ch/njol/skript/lang/SyntaxElementInfo.java
@@ -1,30 +1,18 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.lang;
 
+import org.bukkit.event.Event;
+import org.jetbrains.annotations.ApiStatus;
+import org.jetbrains.annotations.Contract;
+import org.skriptlang.skript.bukkit.registration.BukkitSyntaxInfos;
+import org.skriptlang.skript.registration.SyntaxInfo;
+import org.skriptlang.skript.lang.structure.StructureInfo;
+
 import ch.njol.skript.SkriptAPIException;
 
 import java.lang.reflect.Modifier;
 import java.util.Arrays;
 
 /**
- * @author Peter Güttinger
  * @param <E> the syntax element this info is for
  */
 public class SyntaxElementInfo<E extends SyntaxElement> {
@@ -74,4 +62,50 @@ public String[] getPatterns() {
 	public String getOriginClassPath() {
 		return originClassPath;
 	}
+
+	@Contract("_ -> new")
+	@ApiStatus.Experimental
+	@SuppressWarnings("unchecked")
+	public static <I extends SyntaxElementInfo<E>, E extends SyntaxElement> I fromModern(SyntaxInfo<? extends E> info) {
+		if (info instanceof BukkitSyntaxInfos.Event<?> event) {
+			// We must first go back to the raw input
+			String rawName = event.name().startsWith("On ")
+					? event.name().substring(3)
+					: "*" + event.name();
+			SkriptEventInfo<?> eventInfo = new SkriptEventInfo<>(
+					rawName, event.patterns().toArray(new String[0]),
+					event.type(), event.origin().name(),
+					(Class<? extends Event>[]) event.events().toArray(new Class<?>[0]));
+			String since = event.since();
+			if (since != null)
+				eventInfo.since(since);
+			String documentationId = event.documentationId();
+			if (documentationId != null)
+				eventInfo.documentationID(documentationId);
+			eventInfo.listeningBehavior(event.listeningBehavior())
+					.description(event.description().toArray(new String[0]))
+					.examples(event.examples().toArray(new String[0]))
+					.keywords(event.keywords().toArray(new String[0]))
+					.requiredPlugins(event.requiredPlugins().toArray(new String[0]));
+
+			return (I) eventInfo;
+		} else if (info instanceof SyntaxInfo.Structure<?> structure) {
+			return (I) new StructureInfo<>(structure.patterns().toArray(new String[0]), structure.type(),
+					structure.origin().name(), structure.entryValidator(), structure.nodeType());
+		} else if (info instanceof SyntaxInfo.Expression<?, ?> expression) {
+			return (I) fromModernExpression(expression);
+		}
+
+		return (I) new SyntaxElementInfo<>(info.patterns().toArray(new String[0]), info.type(), info.origin().name());
+	}
+	
+	@Contract("_ -> new")
+	@ApiStatus.Experimental
+	private static <E extends Expression<R>, R> ExpressionInfo<E, R> fromModernExpression(SyntaxInfo.Expression<E, R> info) {
+		return new ExpressionInfo<>(
+				info.patterns().toArray(new String[0]), info.returnType(),
+				info.type(), info.origin().name(), ExpressionType.fromModern(info.priority())
+		);
+	}
+
 }
diff --git a/src/main/java/ch/njol/skript/lang/SyntaxStringBuilder.java b/src/main/java/ch/njol/skript/lang/SyntaxStringBuilder.java
new file mode 100644
index 00000000000..e2ea883c5b7
--- /dev/null
+++ b/src/main/java/ch/njol/skript/lang/SyntaxStringBuilder.java
@@ -0,0 +1,70 @@
+package ch.njol.skript.lang;
+
+import com.google.common.base.Preconditions;
+import org.bukkit.event.Event;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.StringJoiner;
+
+/**
+ * Utility class to build syntax strings, primarily intended for use
+ * in {@link Debuggable#toString(Event, boolean)} implementations.
+ * Spaces are automatically added between the provided objects.
+ */
+public class SyntaxStringBuilder {
+
+	private final boolean debug;
+	private final @Nullable Event event;
+	private final StringJoiner joiner = new StringJoiner(" ");
+
+	/**
+	 * Creates a new SyntaxStringBuilder.
+	 *
+	 * @param event The event to get information from. This is always null if debug == false.
+	 * @param debug If true this should print more information, if false this should print what is shown to the end user
+	 */
+	public SyntaxStringBuilder(@Nullable Event event, boolean debug) {
+		this.event = event;
+		this.debug = debug;
+	}
+
+	/**
+	 * Adds an object to the string and returns the builder.
+	 * Spaces are automatically added between the provided objects.
+	 * If the object is a {@link Debuggable} it will be formatted using
+	 * {@link Debuggable#toString(Event, boolean)}.
+	 *
+	 * @param object The object to add.
+	 * @return The builder.
+	 */
+	public SyntaxStringBuilder append(@NotNull Object object) {
+		Preconditions.checkNotNull(object);
+		if (object instanceof Debuggable debuggable) {
+			joiner.add(debuggable.toString(event, debug));
+		} else {
+			joiner.add(object.toString());
+		}
+		return this;
+	}
+
+	/**
+	 * Adds multiple objects to the string and returns the builder.
+	 * Spaces are automatically added between the provided objects.
+	 *
+	 * @param objects The objects to add.
+	 * @return The builder.
+	 */
+	public SyntaxStringBuilder append(@NotNull Object... objects) {
+		for (Object object : objects) {
+			append(object);
+		}
+		return this;
+	}
+
+	@Override
+	public String toString() {
+		return joiner.toString();
+	}
+
+}
diff --git a/src/main/java/ch/njol/skript/lang/Trigger.java b/src/main/java/ch/njol/skript/lang/Trigger.java
index cabbdca119c..578ee748329 100644
--- a/src/main/java/ch/njol/skript/lang/Trigger.java
+++ b/src/main/java/ch/njol/skript/lang/Trigger.java
@@ -1,27 +1,9 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.lang;
 
-import org.skriptlang.skript.lang.script.Script;
 import ch.njol.skript.variables.Variables;
 import org.bukkit.event.Event;
 import org.jetbrains.annotations.Nullable;
+import org.skriptlang.skript.lang.script.Script;
 
 import java.util.List;
 
@@ -30,8 +12,7 @@ public class Trigger extends TriggerSection {
 	private final String name;
 	private final SkriptEvent event;
 
-	@Nullable
-	private final Script script;
+	private final @Nullable Script script;
 	private int line = -1; // -1 is default: it means there is no line number available
 	private String debugLabel;
 
@@ -70,8 +51,7 @@ public boolean execute(Event event) {
 	}
 
 	@Override
-	@Nullable
-	protected TriggerItem walk(Event event) {
+	protected @Nullable TriggerItem walk(Event event) {
 		return walk(event, true);
 	}
 
@@ -94,8 +74,7 @@ public SkriptEvent getEvent() {
 	/**
 	 * @return The script this trigger was created from.
 	 */
-	@Nullable
-	public Script getScript() {
+	public @Nullable Script getScript() {
 		return script;
 	}
 
diff --git a/src/main/java/ch/njol/skript/lang/TriggerItem.java b/src/main/java/ch/njol/skript/lang/TriggerItem.java
index 50aa4127e19..d8a21916709 100644
--- a/src/main/java/ch/njol/skript/lang/TriggerItem.java
+++ b/src/main/java/ch/njol/skript/lang/TriggerItem.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.lang;
 
 import ch.njol.skript.Skript;
@@ -37,10 +19,8 @@
  */
 public abstract class TriggerItem implements Debuggable {
 
-	@Nullable
-	protected TriggerSection parent = null;
-	@Nullable
-	private TriggerItem next = null;
+	protected @Nullable TriggerSection parent = null;
+	private @Nullable TriggerItem next = null;
 
 	protected TriggerItem() {}
 
@@ -56,8 +36,7 @@ protected TriggerItem(TriggerSection parent) {
 	 * @param event The event
 	 * @return The next item to run or null to stop execution
 	 */
-	@Nullable
-	protected TriggerItem walk(Event event) {
+	protected @Nullable TriggerItem walk(Event event) {
 		if (run(event)) {
 			debug(event, true);
 			return next;
@@ -113,13 +92,26 @@ public static boolean walk(TriggerItem start, Event event) {
 		return false;
 	}
 
+	/**
+	 * Returns whether this item stops the execution of the current trigger or section(s).
+	 * <br>
+	 * If present, and there are statement(s) after this one, the parser will print a warning
+	 * to the user.
+	 * <p>
+	 * <b>Note: This method is used purely to print warnings and doesn't affect parsing, execution or anything else.</b>
+	 *
+	 * @return whether this item stops the execution of the current trigger or section.
+	 */
+	public @Nullable ExecutionIntent executionIntent() {
+		return null;
+	}
+
 	/**
 	 * how much to indent each level
 	 */
 	private final static String INDENT = "  ";
 
-	@Nullable
-	private String indentation = null;
+	private @Nullable String indentation = null;
 
 	public String getIndentation() {
 		if (indentation == null) {
@@ -148,16 +140,14 @@ public TriggerItem setParent(@Nullable TriggerSection parent) {
 		return this;
 	}
 
-	@Nullable
-	public final TriggerSection getParent() {
+	public final @Nullable TriggerSection getParent() {
 		return parent;
 	}
 
 	/**
 	 * @return The trigger this item belongs to, or null if this is a stand-alone item (e.g. the effect of an effect command)
 	 */
-	@Nullable
-	public final Trigger getTrigger() {
+	public final @Nullable Trigger getTrigger() {
 		TriggerItem triggerItem = this;
 		while (triggerItem != null && !(triggerItem instanceof Trigger))
 			triggerItem = triggerItem.getParent();
@@ -169,8 +159,18 @@ public TriggerItem setNext(@Nullable TriggerItem next) {
 		return this;
 	}
 
-	@Nullable
-	public TriggerItem getNext() {
+	public @Nullable TriggerItem getNext() {
+		return next;
+	}
+
+	/**
+	 * This method guarantees to return next {@link TriggerItem} after this item.
+	 * This is not always the case for {@link #getNext()}, for example, {@code getNext()}
+	 * of a {@link ch.njol.skript.sections.SecLoop loop section} usually returns itself.
+	 * 
+	 * @return The next {@link TriggerItem}.
+	 */
+	public @Nullable TriggerItem getActualNext() {
 		return next;
 	}
 
diff --git a/src/main/java/ch/njol/skript/lang/TriggerSection.java b/src/main/java/ch/njol/skript/lang/TriggerSection.java
index efe0910c751..67430f304b6 100644
--- a/src/main/java/ch/njol/skript/lang/TriggerSection.java
+++ b/src/main/java/ch/njol/skript/lang/TriggerSection.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.lang;
 
 import ch.njol.skript.ScriptLoader;
@@ -32,8 +14,7 @@
  */
 public abstract class TriggerSection extends TriggerItem {
 
-	@Nullable
-	protected TriggerItem first, last;
+	protected @Nullable TriggerItem first, last;
 
 	/**
 	 * Reserved for new Trigger(...)
@@ -103,11 +84,9 @@ protected final boolean run(Event event) {
 	}
 
 	@Override
-	@Nullable
-	protected abstract TriggerItem walk(Event event);
+	protected abstract @Nullable TriggerItem walk(Event event);
 
-	@Nullable
-	protected final TriggerItem walk(Event event, boolean run) {
+	protected final @Nullable TriggerItem walk(Event event, boolean run) {
 		debug(event, run);
 		if (run && first != null) {
 			return first;
@@ -116,4 +95,20 @@ protected final TriggerItem walk(Event event, boolean run) {
 		}
 	}
 
+	/**
+	 * @return The execution intent of the section's trigger.
+	 */
+	protected @Nullable ExecutionIntent triggerExecutionIntent() {
+		TriggerItem current = first;
+		while (current != null) {
+			ExecutionIntent executionIntent = current.executionIntent();
+			if (executionIntent != null)
+				return executionIntent.use();
+			if (current == last)
+				break;
+			current = current.getActualNext();
+		}
+		return null;
+	}
+
 }
diff --git a/src/main/java/ch/njol/skript/lang/Unit.java b/src/main/java/ch/njol/skript/lang/Unit.java
index c1c237d83a6..e3829122340 100644
--- a/src/main/java/ch/njol/skript/lang/Unit.java
+++ b/src/main/java/ch/njol/skript/lang/Unit.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.lang;
 
 public interface Unit extends Cloneable {
diff --git a/src/main/java/ch/njol/skript/lang/UnparsedLiteral.java b/src/main/java/ch/njol/skript/lang/UnparsedLiteral.java
index 8e6a3071fb0..259305a3aab 100644
--- a/src/main/java/ch/njol/skript/lang/UnparsedLiteral.java
+++ b/src/main/java/ch/njol/skript/lang/UnparsedLiteral.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.lang;
 
 import ch.njol.skript.SkriptAPIException;
@@ -26,13 +8,13 @@
 import ch.njol.skript.log.ParseLogHandler;
 import ch.njol.skript.log.SkriptLogger;
 import ch.njol.skript.registrations.Classes;
-import ch.njol.util.Checker;
 import ch.njol.util.Kleenean;
 import ch.njol.util.coll.CollectionUtils;
 import ch.njol.util.coll.iterator.NonNullIterator;
 import org.bukkit.event.Event;
 import org.jetbrains.annotations.Nullable;
 
+import java.util.function.Predicate;
 import java.util.logging.Level;
 
 /**
@@ -43,8 +25,7 @@
 public class UnparsedLiteral implements Literal<Object> {
 
 	private final String data;
-	@Nullable
-	private final LogEntry error;
+	private final @Nullable LogEntry error;
 
 	/**
 	 * @param data non-null, non-empty & trimmed string
@@ -76,13 +57,11 @@ public Class<?> getReturnType() {
 	}
 
 	@Override
-	@Nullable
-	public <R> Literal<? extends R> getConvertedExpression(Class<R>... to) {
+	public <R> @Nullable Literal<? extends R> getConvertedExpression(Class<R>... to) {
 		return getConvertedExpression(ParseContext.DEFAULT, to);
 	}
 
-	@Nullable
-	public <R> Literal<? extends R> getConvertedExpression(ParseContext context, Class<? extends R>... to) {
+	public <R> @Nullable Literal<? extends R> getConvertedExpression(ParseContext context, Class<? extends R>... to) {
 		assert to.length > 0;
 		assert to.length == 1 || !CollectionUtils.contains(to, Object.class);
 		ParseLogHandler log = SkriptLogger.startParseLogHandler();
@@ -178,7 +157,7 @@ public NonNullIterator<Object> iterator(Event event) {
 	}
 
 	@Override
-	public void change(Event event, @Nullable Object[] delta, ChangeMode mode) throws UnsupportedOperationException {
+	public void change(Event event, Object @Nullable [] delta, ChangeMode mode) throws UnsupportedOperationException {
 		throw invalidAccessException();
 	}
 
@@ -188,12 +167,12 @@ public Class<?>[] acceptChange(ChangeMode mode) {
 	}
 
 	@Override
-	public boolean check(Event event, Checker<? super Object> checker) {
+	public boolean check(Event event, Predicate<? super Object> checker) {
 		throw invalidAccessException();
 	}
 
 	@Override
-	public boolean check(Event event, Checker<? super Object> checker, boolean negated) {
+	public boolean check(Event event, Predicate<? super Object> checker, boolean negated) {
 		throw invalidAccessException();
 	}
 
diff --git a/src/main/java/ch/njol/skript/lang/Variable.java b/src/main/java/ch/njol/skript/lang/Variable.java
index 1b7a55f42b6..3fe427c9bda 100644
--- a/src/main/java/ch/njol/skript/lang/Variable.java
+++ b/src/main/java/ch/njol/skript/lang/Variable.java
@@ -1,23 +1,14 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.lang;
 
+import java.lang.reflect.Array;
+import java.util.*;
+import java.util.Map.Entry;
+import java.util.regex.Pattern;
+import java.util.NoSuchElementException;
+import java.util.TreeMap;
+import java.util.function.Predicate;
+import java.util.function.Function;
+
 import ch.njol.skript.Skript;
 import ch.njol.skript.SkriptAPIException;
 import ch.njol.skript.SkriptConfig;
@@ -25,6 +16,10 @@
 import ch.njol.skript.classes.Changer.ChangeMode;
 import ch.njol.skript.classes.Changer.ChangerUtils;
 import ch.njol.skript.classes.ClassInfo;
+import ch.njol.skript.variables.VariablesStorage;
+import org.skriptlang.skript.lang.arithmetic.Arithmetics;
+import org.skriptlang.skript.lang.arithmetic.OperationInfo;
+import org.skriptlang.skript.lang.arithmetic.Operator;
 import ch.njol.skript.lang.SkriptParser.ParseResult;
 import ch.njol.skript.lang.parser.ParserInstance;
 import ch.njol.skript.lang.util.SimpleExpression;
@@ -34,7 +29,6 @@
 import ch.njol.skript.util.Utils;
 import ch.njol.skript.variables.TypeHints;
 import ch.njol.skript.variables.Variables;
-import ch.njol.util.Checker;
 import ch.njol.util.Kleenean;
 import ch.njol.util.Pair;
 import ch.njol.util.StringUtils;
@@ -45,6 +39,7 @@
 import org.bukkit.World;
 import org.bukkit.entity.Player;
 import org.bukkit.event.Event;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.skriptlang.skript.lang.arithmetic.Arithmetics;
 import org.skriptlang.skript.lang.arithmetic.OperationInfo;
@@ -56,27 +51,22 @@
 import org.skriptlang.skript.lang.script.ScriptWarning;
 
 import java.lang.reflect.Array;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.Map.Entry;
-import java.util.NoSuchElementException;
-import java.util.TreeMap;
 import java.util.function.Function;
+import java.util.function.Predicate;
 
-public class Variable<T> implements Expression<T> {
+public class Variable<T> implements Expression<T>, KeyReceiverExpression<T>, KeyProviderExpression<T> {
 
 	private final static String SINGLE_SEPARATOR_CHAR = ":";
 	public final static String SEPARATOR = SINGLE_SEPARATOR_CHAR + SINGLE_SEPARATOR_CHAR;
 	public final static String LOCAL_VARIABLE_TOKEN = "_";
+	private static final char[] reservedTokens = {'~', '.', '+', '$', '!', '&', '^', '*', '-'};
 
 	/**
 	 * Script this variable was created in.
 	 */
-	@Nullable
-	private final Script script;
+	private final @Nullable Script script;
 
 	/**
 	 * The name of this variable, excluding the local variable token, but including the list variable token '::*'.
@@ -89,8 +79,7 @@ public class Variable<T> implements Expression<T> {
 	private final boolean local;
 	private final boolean list;
 
-	@Nullable
-	private final Variable<?> source;
+	private final @Nullable Variable<?> source;
 
 	@SuppressWarnings("unchecked")
 	private Variable(VariableString name, Class<? extends T>[] types, boolean local, boolean list, @Nullable Variable<?> source) {
@@ -122,7 +111,26 @@ private Variable(VariableString name, Class<? extends T>[] types, boolean local,
 	 * @return true if the name is valid, false otherwise.
 	 */
 	public static boolean isValidVariableName(String name, boolean allowListVariable, boolean printErrors) {
-		name = name.startsWith(LOCAL_VARIABLE_TOKEN) ? "" + name.substring(LOCAL_VARIABLE_TOKEN.length()).trim() : "" + name.trim();
+		assert !name.isEmpty(): "Variable name should not be empty";
+		char first = name.charAt(0);
+		check_reserved_tokens:
+		for (char token : reservedTokens) {
+			if (first == token && printErrors) {
+				/*
+				A lot of people already use '-' so we want to skip this warning iff they're using it here
+				*/
+				if (first == '-') {
+					for (VariablesStorage store : Variables.getStores()) {
+						@Nullable Pattern pattern = store.getNamePattern();
+						if (pattern != null && pattern.pattern().equals("(?!-).*"))
+							continue check_reserved_tokens;
+					}
+				}
+				Skript.warning("The character '" + token + "' is reserved at the start of variable names, " +
+					"and may be restricted in future versions");
+			}
+		}
+		name = name.startsWith(LOCAL_VARIABLE_TOKEN) ? name.substring(LOCAL_VARIABLE_TOKEN.length()).trim() : name.trim();
 		if (!allowListVariable && name.contains(SEPARATOR)) {
 			if (printErrors)
 				Skript.error("List variables are not allowed here (error in variable {" + name + "})");
@@ -174,8 +182,7 @@ else if (character == '%')
 	/**
 	 * Prints errors
 	 */
-	@Nullable
-	public static <T> Variable<T> newInstance(String name, Class<? extends T>[] types) {
+	public static <T> @Nullable Variable<T> newInstance(String name, Class<? extends T>[] types) {
 		name = "" + name.trim();
 		if (!isValidVariableName(name, true, true))
 			return null;
@@ -190,9 +197,9 @@ public static <T> Variable<T> newInstance(String name, Class<? extends T>[] type
 		ParserInstance parser = ParserInstance.get();
 		Script currentScript = parser.isActive() ? parser.getCurrentScript() : null;
 		if (currentScript != null
-				&& !SkriptConfig.disableVariableStartingWithExpressionWarnings.value()
-				&& !currentScript.suppressesWarning(ScriptWarning.VARIABLE_STARTS_WITH_EXPRESSION)
-				&& (isLocal ? name.substring(LOCAL_VARIABLE_TOKEN.length()) : name).startsWith("%")) {
+			&& !SkriptConfig.disableVariableStartingWithExpressionWarnings.value()
+			&& !currentScript.suppressesWarning(ScriptWarning.VARIABLE_STARTS_WITH_EXPRESSION)
+			&& (isLocal ? name.substring(LOCAL_VARIABLE_TOKEN.length()) : name).startsWith("%")) {
 			Skript.warning("Starting a variable's name with an expression is discouraged ({" + name + "}). " +
 				"You could prefix it with the script's name: " +
 				"{" + StringUtils.substring(currentScript.getConfig().getFileName(), 0, -3) + SEPARATOR + name + "}");
@@ -302,8 +309,7 @@ public <R> Variable<R> getConvertedExpression(Class<R>... to) {
 	 * Gets the value of this variable as stored in the variables map.
 	 * This method also checks against default variables.
 	 */
-	@Nullable
-	public Object getRaw(Event event) {
+	public @Nullable Object getRaw(Event event) {
 		DefaultVariables data = script == null ? null : script.getData(DefaultVariables.class);
 		if (data != null)
 			data.enterScope();
@@ -313,7 +319,7 @@ public Object getRaw(Event event) {
 			// prevents e.g. {%expr%} where "%expr%" ends with "::*" from returning a Map
 			if (name.endsWith(Variable.SEPARATOR + "*") != list)
 				return null;
-			Object value = !list ? convertIfOldPlayer(name, event, Variables.getVariable(name, event, local)) : Variables.getVariable(name, event, local);
+			Object value = !list ? convertIfOldPlayer(name, local, event, Variables.getVariable(name, event, local)) : Variables.getVariable(name, event, local);
 			if (value != null)
 				return value;
 
@@ -333,9 +339,7 @@ public Object getRaw(Event event) {
 		return null;
 	}
 
-	@Nullable
-	@SuppressWarnings("unchecked")
-	private Object get(Event event) {
+	private @Nullable Object get(Event event) {
 		Object rawValue = getRaw(event);
 		if (!list)
 			return rawValue;
@@ -343,15 +347,17 @@ private Object get(Event event) {
 			return Array.newInstance(types[0], 0);
 		List<Object> convertedValues = new ArrayList<>();
 		String name = StringUtils.substring(this.name.toString(event), 0, -1);
+		//noinspection unchecked
 		for (Entry<String, ?> variable : ((Map<String, ?>) rawValue).entrySet()) {
 			if (variable.getKey() != null && variable.getValue() != null) {
 				Object value;
 				if (variable.getValue() instanceof Map)
+					//noinspection unchecked
 					value = ((Map<String, ?>) variable.getValue()).get(null);
 				else
 					value = variable.getValue();
 				if (value != null)
-					convertedValues.add(convertIfOldPlayer(name + variable.getKey(), event, value));
+					convertedValues.add(convertIfOldPlayer(name + variable.getKey(), local, event, value));
 			}
 		}
 		return convertedValues.toArray();
@@ -362,14 +368,13 @@ private Object get(Event event) {
 	 * because the player object inside the variable will be a (kinda) dead variable
 	 * as a new player object has been created by the server.
 	 */
-	@Nullable
-	Object convertIfOldPlayer(String key, Event event, @Nullable Object object) {
-		if (SkriptConfig.enablePlayerVariableFix.value() && object instanceof Player) {
-			Player oldPlayer = (Player) object;
+	public static <T> @Nullable T convertIfOldPlayer(String key, boolean local, Event event, @Nullable T object) {
+		if (SkriptConfig.enablePlayerVariableFix.value() && object instanceof Player oldPlayer) {
 			if (!oldPlayer.isValid() && oldPlayer.isOnline()) {
 				Player newPlayer = Bukkit.getPlayer(oldPlayer.getUniqueId());
 				Variables.setVariable(key, newPlayer, event, local);
-				return newPlayer;
+				//noinspection unchecked
+				return (T) newPlayer;
 			}
 		}
 		return object;
@@ -378,56 +383,11 @@ Object convertIfOldPlayer(String key, Event event, @Nullable Object object) {
 	public Iterator<Pair<String, Object>> variablesIterator(Event event) {
 		if (!list)
 			throw new SkriptAPIException("Looping a non-list variable");
-		String name = StringUtils.substring(this.name.toString(event), 0, -1);
-		Object val = Variables.getVariable(name + "*", event, local);
-		if (val == null)
-			return new EmptyIterator<>();
-		assert val instanceof TreeMap;
-		// temporary list to prevent CMEs
-		@SuppressWarnings("unchecked")
-		Iterator<String> keys = new ArrayList<>(((Map<String, Object>) val).keySet()).iterator();
-		return new Iterator<Pair<String, Object>>() {
-			@Nullable
-			private String key;
-			@Nullable
-			private Object next = null;
-
-			@Override
-			public boolean hasNext() {
-				if (next != null)
-					return true;
-				while (keys.hasNext()) {
-					key = keys.next();
-					if (key != null) {
-						next = convertIfOldPlayer(name + key, event, Variables.getVariable(name + key, event, local));
-						if (next != null && !(next instanceof TreeMap))
-							return true;
-					}
-				}
-				next = null;
-				return false;
-			}
-
-			@Override
-			public Pair<String, Object> next() {
-				if (!hasNext())
-					throw new NoSuchElementException();
-				Pair<String, Object> n = new Pair<>(key, next);
-				next = null;
-				return n;
-			}
-
-			@Override
-			public void remove() {
-				throw new UnsupportedOperationException();
-			}
-		};
+		return Variables.getVariableIterator(name.toString(event), local, event);
 	}
 
 	@Override
-	@Nullable
-	@SuppressWarnings("unchecked")
-	public Iterator<T> iterator(Event event) {
+	public @Nullable Iterator<T> iterator(Event event) {
 		if (!list) {
 			T value = getSingle(event);
 			return value != null ? new SingleItemIterator<>(value) : null;
@@ -438,23 +398,22 @@ public Iterator<T> iterator(Event event) {
 			return new EmptyIterator<>();
 		assert value instanceof TreeMap;
 		// temporary list to prevent CMEs
+		//noinspection unchecked
 		Iterator<String> keys = new ArrayList<>(((Map<String, Object>) value).keySet()).iterator();
-		return new Iterator<T>() {
-			@Nullable
-			private String key;
-			@Nullable
-			private T next = null;
+		return new Iterator<>() {
+			private @Nullable T next = null;
 
 			@Override
-			@SuppressWarnings({"unchecked"})
 			public boolean hasNext() {
 				if (next != null)
 					return true;
 				while (keys.hasNext()) {
-					key = keys.next();
+					@Nullable String key = keys.next();
 					if (key != null) {
 						next = Converters.convert(Variables.getVariable(name + key, event, local), types);
-						next = (T) convertIfOldPlayer(name + key, event, next);
+
+						//noinspection unchecked
+						next = (T) convertIfOldPlayer(name + key, local, event, next);
 						if (next != null && !(next instanceof TreeMap))
 							return true;
 					}
@@ -480,8 +439,7 @@ public void remove() {
 		};
 	}
 
-	@Nullable
-	private T getConverted(Event event) {
+	private @Nullable T getConverted(Event event) {
 		assert !list;
 		return Converters.convert(get(event), types);
 	}
@@ -503,15 +461,41 @@ private void setIndex(Event event, String index, @Nullable Object value) {
 	}
 
 	@Override
-	public Class<?>[] acceptChange(ChangeMode mode) {
+	public Class<?> @Nullable [] acceptChange(ChangeMode mode) {
 		if (!list && mode == ChangeMode.SET)
 			return CollectionUtils.array(Object.class);
 		return CollectionUtils.array(Object[].class);
 	}
 
+	@Override
+	public void change(Event event, Object @NotNull [] delta, ChangeMode mode, @NotNull String @NotNull [] keys) {
+		if (!list) {
+			this.change(event, delta, mode);
+			return;
+		}
+		if (mode == ChangeMode.SET) {
+			assert delta.length == keys.length;
+			this.set(event, null);
+			int length = Math.min(delta.length, keys.length);
+			for (int index = 0; index < length; index++) {
+				Object value = delta[index];
+				String key = keys[index];
+				if (value instanceof Object[] array) {
+					for (int j = 0; j < array.length; j++)
+						this.setIndex(event, key + SEPARATOR + (j + 1), array[j]);
+				} else {
+					this.setIndex(event, key, value);
+				}
+			}
+			return;
+		}
+		// no other modes are supported right now
+		this.change(event, delta, mode);
+	}
+
 	@Override
 	@SuppressWarnings({"unchecked", "rawtypes"})
-	public void change(Event event, @Nullable Object[] delta, ChangeMode mode) throws UnsupportedOperationException {
+	public void change(Event event, Object @Nullable [] delta, ChangeMode mode) throws UnsupportedOperationException {
 		switch (mode) {
 			case DELETE:
 				if (list) {
@@ -579,14 +563,15 @@ public void change(Event event, @Nullable Object[] delta, ChangeMode mode) throw
 					if (mode == ChangeMode.REMOVE) {
 						if (map == null)
 							return;
-						ArrayList<String> toRemove = new ArrayList<>(); // prevents CMEs
+						Set<String> toRemove = new HashSet<>(); // prevents CMEs
 						for (Object value : delta) {
 							for (Entry<String, Object> entry : map.entrySet()) {
+								String key = entry.getKey();
+								if (key == null)
+									continue; // This is NOT a part of list variable
+								if (toRemove.contains(key))
+									continue; // Skip if we've already marked this key to be removed
 								if (Relation.EQUAL.isImpliedBy(Comparators.compare(entry.getValue(), value))) {
-									String key = entry.getKey();
-									if (key == null)
-										continue; // This is NOT a part of list variable
-
 									// Otherwise, we'll mark that key to be set to null
 									toRemove.add(key);
 									break;
@@ -600,7 +585,7 @@ public void change(Event event, @Nullable Object[] delta, ChangeMode mode) throw
 					} else if (mode == ChangeMode.REMOVE_ALL) {
 						if (map == null)
 							return;
-						ArrayList<String> toRemove = new ArrayList<>(); // prevents CMEs
+						Set<String> toRemove = new HashSet<>(); // prevents CMEs
 						for (Entry<String, Object> i : map.entrySet()) {
 							for (Object value : delta) {
 								if (Relation.EQUAL.isImpliedBy(Comparators.compare(i.getValue(), value)))
@@ -667,6 +652,15 @@ public void change(Event event, @Nullable Object[] delta, ChangeMode mode) throw
 		}
 	}
 
+	/**
+	 * {@inheritDoc}
+	 * @param getAll This has no effect for a Variable, as {@link #getArray(Event)} is the same as {@link #getAll(Event)}.
+	 */
+	@Override
+	public <R> void changeInPlace(Event event, Function<T, R> changeFunction, boolean getAll) {
+		changeInPlace(event, changeFunction);
+	}
+
 	@Override
 	public <R> void changeInPlace(Event event, Function<T, R> changeFunction) {
 		if (!list) {
@@ -687,13 +681,34 @@ public <R> void changeInPlace(Event event, Function<T, R> changeFunction) {
 	}
 
 	@Override
-	@Nullable
-	public T getSingle(Event event) {
+	public @Nullable T getSingle(Event event) {
 		if (list)
 			throw new SkriptAPIException("Invalid call to getSingle");
 		return getConverted(event);
 	}
 
+	@Override
+	public @NotNull String @NotNull [] getArrayKeys(Event event) throws SkriptAPIException {
+		if (!list)
+			throw new SkriptAPIException("Invalid call to getArrayKeys on non-list");
+		String name = StringUtils.substring(this.name.toString(event), 0, -1);
+		Object value = Variables.getVariable(name + "*", event, local);
+		if (value == null)
+			return new String[0];
+		assert value instanceof Map<?,?>;
+		return ((Map<String, ?>) value).keySet().toArray(new String[0]);
+	}
+
+	@Override
+	public @NotNull String @NotNull [] getAllKeys(Event event) {
+		return this.getArrayKeys(event);
+	}
+
+	@Override
+	public boolean areKeysRecommended() {
+		return false; // We want `set {list::*} to {other::*}` reset numbering!
+	}
+
 	@Override
 	public T[] getArray(Event event) {
 		return getAll(event);
@@ -723,12 +738,12 @@ public boolean isIndexLoop(String input) {
 	}
 
 	@Override
-	public boolean check(Event event, Checker<? super T> checker, boolean negated) {
+	public boolean check(Event event, Predicate<? super T> checker, boolean negated) {
 		return SimpleExpression.check(getAll(event), checker, negated, getAnd());
 	}
 
 	@Override
-	public boolean check(Event event, Checker<? super T> checker) {
+	public boolean check(Event event, Predicate<? super T> checker) {
 		return SimpleExpression.check(getAll(event), checker, false, getAnd());
 	}
 
@@ -767,4 +782,9 @@ public Expression<? extends T> simplify() {
 		return this;
 	}
 
+	@Override
+	public boolean supportsLoopPeeking() {
+		return true;
+	}
+
 }
diff --git a/src/main/java/ch/njol/skript/lang/VariableString.java b/src/main/java/ch/njol/skript/lang/VariableString.java
index b9f914b1ddc..db6b1173e82 100644
--- a/src/main/java/ch/njol/skript/lang/VariableString.java
+++ b/src/main/java/ch/njol/skript/lang/VariableString.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.lang;
 
 import ch.njol.skript.Skript;
@@ -35,7 +17,6 @@
 import ch.njol.skript.util.Utils;
 import ch.njol.skript.util.chat.ChatMessages;
 import ch.njol.skript.util.chat.MessageComponent;
-import ch.njol.util.Checker;
 import ch.njol.util.Kleenean;
 import ch.njol.util.StringUtils;
 import ch.njol.util.coll.CollectionUtils;
@@ -51,6 +32,7 @@
 import java.util.Arrays;
 import java.util.Iterator;
 import java.util.List;
+import java.util.function.Predicate;
 import java.util.stream.Collectors;
 
 /**
@@ -58,8 +40,7 @@
  */
 public class VariableString implements Expression<String> {
 
-	@Nullable
-	private final Script script;
+	private final @Nullable Script script;
 	protected final String original;
 
 
@@ -69,8 +50,7 @@ public class VariableString implements Expression<String> {
 	private Object @Nullable [] stringsUnformatted;
 	private final boolean isSimple;
 
-	@Nullable
-	private final String simple, simpleUnformatted;
+	private final @Nullable String simple, simpleUnformatted;
 	private final StringMode mode;
 
 	/**
@@ -141,8 +121,7 @@ private VariableString(String original, Object[] strings, StringMode mode) {
 	/**
 	 * Prints errors
 	 */
-	@Nullable
-	public static VariableString newInstance(String input) {
+	public static @Nullable VariableString newInstance(String input) {
 		return newInstance(input, StringMode.MESSAGE);
 	}
 
@@ -153,8 +132,7 @@ public static VariableString newInstance(String input) {
 	 * @param original Unquoted string to parse.
 	 * @return A new VariableString instance.
 	 */
-	@Nullable
-	public static VariableString newInstance(String original, StringMode mode) {
+	public static @Nullable VariableString newInstance(String original, StringMode mode) {
 		if (mode != StringMode.VARIABLE_NAME && !isQuotedCorrectly(original, false))
 			return null;
 
@@ -364,8 +342,7 @@ public static VariableString[] makeStrings(String[] args) {
 	 * @param args Quoted strings - This is not checked!
 	 * @return a new array containing all newly created VariableStrings, or null if one is invalid
 	 */
-	@Nullable
-	public static VariableString[] makeStringsFromQuoted(List<String> args) {
+	public static VariableString @Nullable [] makeStringsFromQuoted(List<String> args) {
 		VariableString[] strings = new VariableString[args.size()];
 		for (int i = 0; i < args.size(); i++) {
 			assert args.get(i).startsWith("\"") && args.get(i).endsWith("\"");
@@ -491,8 +468,7 @@ public String toChatString(Event event) {
 		return ChatMessages.toJson(getMessageComponents(event));
 	}
 
-	@Nullable
-	private static ChatColor getLastColor(CharSequence sequence) {
+	private static @Nullable ChatColor getLastColor(CharSequence sequence) {
 		for (int i = sequence.length() - 2; i >= 0; i--) {
 			if (sequence.charAt(i) == ChatColor.COLOR_CHAR) {
 				ChatColor color = ChatColor.getByChar(sequence.charAt(i + 1));
@@ -574,8 +550,7 @@ public String toString(@Nullable Event event, boolean debug) {
 	 *
 	 * @return List<String> of all possible super class code names.
 	 */
-	@NotNull
-	public List<String> getDefaultVariableNames(String variableName, Event event) {
+	public @NotNull List<String> getDefaultVariableNames(String variableName, Event event) {
 		if (script == null || mode != StringMode.VARIABLE_NAME)
 			return Lists.newArrayList();
 
@@ -662,19 +637,18 @@ public boolean isSingle() {
 	}
 
 	@Override
-	public boolean check(Event event, Checker<? super String> checker, boolean negated) {
+	public boolean check(Event event, Predicate<? super String> checker, boolean negated) {
 		return SimpleExpression.check(getAll(event), checker, negated, false);
 	}
 
 	@Override
-	public boolean check(Event event, Checker<? super String> checker) {
+	public boolean check(Event event, Predicate<? super String> checker) {
 		return SimpleExpression.check(getAll(event), checker, false, false);
 	}
 
 	@Override
-	@Nullable
 	@SuppressWarnings("unchecked")
-	public <R> Expression<? extends R> getConvertedExpression(Class<R>... to) {
+	public <R> @Nullable Expression<? extends R> getConvertedExpression(Class<R>... to) {
 		if (CollectionUtils.containsSuperclass(to, String.class))
 			return (Expression<? extends R>) this;
 		return ConvertedExpression.newInstance(this, to);
@@ -686,13 +660,12 @@ public Class<? extends String> getReturnType() {
 	}
 
 	@Override
-	@Nullable
-	public Class<?>[] acceptChange(ChangeMode mode) {
+	public Class<?> @Nullable [] acceptChange(ChangeMode mode) {
 		return null;
 	}
 
 	@Override
-	public void change(Event event, @Nullable Object[] delta, ChangeMode mode) throws UnsupportedOperationException {
+	public void change(Event event, Object @Nullable [] delta, ChangeMode mode) throws UnsupportedOperationException {
 		throw new UnsupportedOperationException();
 	}
 
@@ -731,7 +704,6 @@ public Expression<?> getSource() {
 		return this;
 	}
 
-	@SuppressWarnings("unchecked")
 	public static <T> Expression<T> setStringMode(Expression<T> expression, StringMode mode) {
 		if (expression instanceof ExpressionList) {
 			Expression<?>[] expressions = ((ExpressionList<?>) expression).getExpressions();
@@ -741,6 +713,7 @@ public static <T> Expression<T> setStringMode(Expression<T> expression, StringMo
 				expressions[i] = setStringMode(expr, mode);
 			}
 		} else if (expression instanceof VariableString) {
+			//noinspection unchecked
 			return (Expression<T>) ((VariableString) expression).setMode(mode);
 		}
 		return expression;
diff --git a/src/main/java/ch/njol/skript/lang/VerboseAssert.java b/src/main/java/ch/njol/skript/lang/VerboseAssert.java
index 721de83e0c9..000616272a1 100644
--- a/src/main/java/ch/njol/skript/lang/VerboseAssert.java
+++ b/src/main/java/ch/njol/skript/lang/VerboseAssert.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.lang;
 
 import ch.njol.skript.registrations.Classes;
diff --git a/src/main/java/ch/njol/skript/lang/function/DynamicFunctionReference.java b/src/main/java/ch/njol/skript/lang/function/DynamicFunctionReference.java
new file mode 100644
index 00000000000..5256556deda
--- /dev/null
+++ b/src/main/java/ch/njol/skript/lang/function/DynamicFunctionReference.java
@@ -0,0 +1,273 @@
+package ch.njol.skript.lang.function;
+
+import ch.njol.skript.ScriptLoader;
+import ch.njol.skript.lang.Expression;
+import ch.njol.skript.lang.ExpressionList;
+import ch.njol.skript.lang.util.common.AnyNamed;
+import ch.njol.skript.registrations.Classes;
+import ch.njol.skript.util.Contract;
+import org.bukkit.event.Event;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+import org.jetbrains.annotations.UnknownNullability;
+import org.skriptlang.skript.lang.script.Script;
+import org.skriptlang.skript.util.Executable;
+import org.skriptlang.skript.util.Validated;
+
+import java.io.File;
+import java.lang.ref.Reference;
+import java.lang.ref.WeakReference;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
+
+/**
+ * A partial reference to a Skript function.
+ * This reference knows some of its information in advance (such as the function's name)
+ * but will not be resolved until it receives inputs for the first time.
+ * @param <Result> The return type of this function, if known.
+ */
+public class DynamicFunctionReference<Result>
+	implements Contract, Executable<Event, Result[]>, Validated, AnyNamed {
+
+	private final @NotNull String name;
+	private final @Nullable Script source;
+	private final Reference<Function<? extends Result>> function;
+	private final @UnknownNullability Signature<? extends Result> signature;
+	private final Validated validator = Validated.validator();
+	private final Map<Input, Expression<?>> checkedInputs = new HashMap<>();
+	private final boolean resolved;
+
+	public DynamicFunctionReference(Function<? extends Result> function) {
+		this.resolved = true;
+		this.function = new WeakReference<>(function);
+		this.name = function.getName();
+		this.signature = function.getSignature();
+		@Nullable File file = ScriptLoader.getScriptFromName(signature.script);
+		this.source = file != null ? ScriptLoader.getScript(file) : null;
+	}
+
+	public DynamicFunctionReference(@NotNull String name) {
+		this(name, null);
+	}
+
+	public DynamicFunctionReference(@NotNull String name, @Nullable Script source) {
+		this.name = name;
+		Function<? extends Result> function;
+		if (source != null) {
+			//noinspection unchecked
+			function = (Function<? extends Result>) Functions.getFunction(name, source.getConfig().getFileName());
+		} else {
+			//noinspection unchecked
+			function = (Function<? extends Result>) Functions.getFunction(name, null);
+		}
+		this.resolved = function != null;
+		this.function = new WeakReference<>(function);
+		if (resolved) {
+			this.signature = function.getSignature();
+			@Nullable File file = ScriptLoader.getScriptFromName(signature.script);
+			this.source = file != null ? ScriptLoader.getScript(file) : null;
+		} else {
+			this.signature = null;
+			this.source = null;
+		}
+	}
+
+	public @Nullable Script source() {
+		return source;
+	}
+
+	@Override
+	public @NotNull String name() {
+		return name;
+	}
+
+	@Override
+	public boolean isSingle(Expression<?>... arguments) {
+		if (!resolved)
+			return true;
+		return signature.contract != null
+				? signature.contract.isSingle(arguments)
+				: signature.isSingle();
+	}
+
+	@Override
+	public @Nullable Class<?> getReturnType(Expression<?>... arguments) {
+		if (!resolved)
+			return Object.class;
+		if (signature.contract != null)
+			return signature.contract.getReturnType(arguments);
+		Function<? extends Result> function = this.function.get();
+		if (function != null && function.getReturnType() != null)
+			return function.getReturnType().getC();
+		return null;
+	}
+
+	@Override
+	public Result @Nullable [] execute(Event event, Object... arguments) {
+		if (!this.valid())
+			return null;
+		Function<? extends Result> function = this.function.get();
+		if (function == null)
+			return null;
+		// We shouldn't trust the caller provided an array of arrays
+		Object[][] consigned = FunctionReference.consign(arguments);
+		try {
+			return function.execute(consigned);
+		} finally {
+			function.resetReturnValue();
+		}
+	}
+
+	@Override
+	public void invalidate() {
+		this.validator.invalidate();
+	}
+
+	@Override
+	public boolean valid() {
+		return resolved && validator.valid()
+			&& function.get() != null // function was garbage-collected
+			&& (source == null || source.valid());
+		// if our source script has been reloaded our reference was invalidated
+	}
+
+	@Override
+	public String toString() {
+		if (source != null)
+			return name + "() from " + Classes.toString(source);
+		return name + "()";
+	}
+
+	/**
+	 * Validates whether dynamic inputs are appropriate for the resolved function.
+	 * If the inputs are acceptable, this will collect them into an expression list
+	 * (the output of which can be passed directly to the task).
+	 *
+	 * @param parameters The input types to check
+	 * @return A combined expression list, if these inputs are appropriate for the function
+	 */
+	public @Nullable Expression<?> validate(Expression<?>[] parameters) {
+		Input input = new Input(parameters);
+		return this.validate(input);
+	}
+
+	public @Nullable Expression<?> validate(Input input) {
+		if (checkedInputs.containsKey(input))
+			return checkedInputs.get(input);
+		this.checkedInputs.put(input, null); // failure case
+		if (signature == null)
+			return null;
+		boolean varArgs = signature.getMaxParameters() == 1 && !signature.getParameter(0).single;
+		Expression<?>[] parameters = input.parameters();
+		// Too many parameters
+		if (parameters.length > signature.getMaxParameters() && !varArgs)
+			return null;
+		// Not enough parameters
+		else if (parameters.length < signature.getMinParameters())
+			return null;
+		Expression<?>[] checked = new Expression[parameters.length];
+
+		// Check parameter types
+		for (int i = 0; i < parameters.length; i++) {
+			Parameter<?> parameter = signature.parameters[varArgs ? 0 : i];
+			//noinspection unchecked
+			Expression<?> expression = parameters[i].getConvertedExpression(parameter.type.getC());
+			if (expression == null) {
+				return null;
+			} else if (parameter.single && !expression.isSingle()) {
+				return null;
+			}
+			checked[i] = expression;
+		}
+
+		// if successful, replace with our known result
+		ExpressionList<?> result = new ExpressionList<>(checked, Object.class, true);
+		this.checkedInputs.put(input, result);
+		return result;
+	}
+
+	/**
+	 * Attempts to parse a function reference from the format it would be stringified in.
+	 * The name can include the source script name for the case of parsing local functions.
+	 * @param name The function name, possibly including its script name
+	 * @return A reference, if one is available
+	 */
+	public static @Nullable DynamicFunctionReference<?> parseFunction(String name) {
+		// Function reference string-ifying appends a () and potentially its source,
+		// e.g. `myFunction() from MyScript.sk` and we should turn that into a valid function.
+		if (name.contains(") from ")) {
+			// The user might be trying to resolve a local function by name only
+			String source = name.substring(name.lastIndexOf(" from ") + 6).trim();
+			Script script = getScript(source);
+			return resolveFunction(name.substring(0, name.lastIndexOf(" from ")).trim(), script);
+		}
+		return resolveFunction(name, null);
+	}
+
+	/**
+	 * Used to resolve a function from its name.
+	 * @param name The function name
+	 * @param script Potentially, the script it is from, if one is known
+	 * @return A function reference, if one is available.
+	 */
+	public static @Nullable DynamicFunctionReference<?> resolveFunction(String name, @Nullable Script script) {
+		if (name.contains("(") && name.contains(")"))
+			name = name.replaceAll("\\(.*\\).*", "").trim();
+		// In the future, if function overloading is supported, we could even use the header
+		// to specify parameter types (e.g. "myFunction(text, player)"
+		DynamicFunctionReference<Object> reference = new DynamicFunctionReference<>(name, script);
+		if (!reference.valid())
+			return null;
+		return reference;
+	}
+
+	private static @Nullable Script getScript(@Nullable String source) {
+		if (source == null || source.isEmpty())
+			return null;
+		@Nullable File file = ScriptLoader.getScriptFromName(source);
+		if (file == null || file.isDirectory())
+			return null;
+		return ScriptLoader.getScript(file);
+	}
+
+	/**
+	 * An index-linking key for a particular set of input expressions.
+	 * Validation only needs to be done once for a set of parameter types,
+	 * so this is used to prevent re-validation.
+	 */
+	public static class Input {
+		private final Class<?>[] types;
+		private transient final Expression<?>[] parameters;
+
+		public Input(Expression<?>... types) {
+			Class<?>[] classes = new Class<?>[types.length];
+			for (int i = 0; i < types.length; i++) {
+				classes[i] = types[i].getReturnType();
+			}
+			this.parameters = types;
+			this.types = classes;
+		}
+
+		private Expression<?>[] parameters() {
+			return parameters;
+		}
+
+		@Override
+		public boolean equals(Object object) {
+			if (this == object)
+				return true;
+			if (!(object instanceof Input input))
+				return false;
+			return Arrays.equals(parameters, input.parameters) && Objects.deepEquals(types, input.types);
+		}
+
+		@Override
+		public int hashCode() {
+			return Arrays.hashCode(types) ^ Arrays.hashCode(parameters);
+		}
+
+	}
+
+}
diff --git a/src/main/java/ch/njol/skript/lang/function/EffFunctionCall.java b/src/main/java/ch/njol/skript/lang/function/EffFunctionCall.java
index b34b99f68ea..10dd821b017 100644
--- a/src/main/java/ch/njol/skript/lang/function/EffFunctionCall.java
+++ b/src/main/java/ch/njol/skript/lang/function/EffFunctionCall.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.lang.function;
 
 import org.bukkit.event.Event;
@@ -48,14 +30,14 @@ public static EffFunctionCall parse(final String line) {
 	}
 	
 	@Override
-	protected void execute(final Event e) {
-		function.execute(e);
+	protected void execute(final Event event) {
+		function.execute(event);
 		function.resetReturnValue(); // Function might have return value that we're ignoring
 	}
 	
 	@Override
-	public String toString(@Nullable final Event e, final boolean debug) {
-		return function.toString(e, debug);
+	public String toString(@Nullable final Event event, final boolean debug) {
+		return function.toString(event, debug);
 	}
 	
 	@Override
diff --git a/src/main/java/ch/njol/skript/lang/function/ExprFunctionCall.java b/src/main/java/ch/njol/skript/lang/function/ExprFunctionCall.java
index e1c31a74231..903bc44b67c 100644
--- a/src/main/java/ch/njol/skript/lang/function/ExprFunctionCall.java
+++ b/src/main/java/ch/njol/skript/lang/function/ExprFunctionCall.java
@@ -1,32 +1,14 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.lang.function;
 
 import ch.njol.skript.lang.Expression;
 import ch.njol.skript.lang.SkriptParser.ParseResult;
 import ch.njol.skript.lang.util.SimpleExpression;
-import org.skriptlang.skript.lang.converter.Converters;
 import ch.njol.skript.util.Utils;
 import ch.njol.util.Kleenean;
 import ch.njol.util.coll.CollectionUtils;
 import org.bukkit.event.Event;
 import org.jetbrains.annotations.Nullable;
+import org.skriptlang.skript.lang.converter.Converters;
 
 public class ExprFunctionCall<T> extends SimpleExpression<T> {
 
@@ -55,17 +37,15 @@ public ExprFunctionCall(FunctionReference<?> function, Class<? extends T>[] expe
 	}
 
 	@Override
-	@Nullable
-	protected T[] get(Event e) {
-		Object[] returnValue = function.execute(e);
+	protected T @Nullable [] get(Event event) {
+		Object[] returnValue = function.execute(event);
 		function.resetReturnValue();
 		return Converters.convert(returnValue, returnTypes, returnType);
 	}
 
 	@Override
-	@Nullable
 	@SuppressWarnings("unchecked")
-	public <R> Expression<? extends R> getConvertedExpression(Class<R>... to) {
+	public <R> @Nullable Expression<? extends R> getConvertedExpression(Class<R>... to) {
 		if (CollectionUtils.containsSuperclass(to, getReturnType()))
 			return (Expression<? extends R>) this;
 		assert function.getReturnType() != null;
@@ -86,8 +66,8 @@ public Class<? extends T> getReturnType() {
 	}
 
 	@Override
-	public String toString(@Nullable Event e, boolean debug) {
-		return function.toString(e, debug);
+	public String toString(@Nullable Event event, boolean debug) {
+		return function.toString(event, debug);
 	}
 
 	@Override
diff --git a/src/main/java/ch/njol/skript/lang/function/Function.java b/src/main/java/ch/njol/skript/lang/function/Function.java
index a6d4ae13a44..89e3b48452f 100644
--- a/src/main/java/ch/njol/skript/lang/function/Function.java
+++ b/src/main/java/ch/njol/skript/lang/function/Function.java
@@ -1,31 +1,12 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.lang.function;
 
-import java.util.Arrays;
-
-import org.bukkit.Bukkit;
-import org.jetbrains.annotations.Nullable;
-
 import ch.njol.skript.SkriptConfig;
 import ch.njol.skript.classes.ClassInfo;
 import ch.njol.util.coll.CollectionUtils;
+import org.bukkit.Bukkit;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.Arrays;
 
 /**
  * Functions can be called using arguments.
@@ -68,9 +49,8 @@ public Parameter<?> getParameter(int index) {
 	public boolean isSingle() {
 		return sign.isSingle();
 	}
-	
-	@Nullable
-	public ClassInfo<T> getReturnType() {
+
+	public @Nullable ClassInfo<T> getReturnType() {
 		return sign.getReturnType();
 	}
 	
@@ -83,9 +63,7 @@ public ClassInfo<T> getReturnType() {
 	 * {@link Signature#getMaxParameters()} elements.
 	 * @return The result(s) of this function
 	 */
-	@SuppressWarnings("null")
-	@Nullable
-	public final T[] execute(Object[][] params) {
+	public final T @Nullable [] execute(Object[][] params) {
 		FunctionEvent<? extends T> e = new FunctionEvent<>(this);
 		
 		// Call function event only if requested by addon
@@ -142,14 +120,13 @@ public final T[] execute(Object[][] params) {
 	 * Executes this function with given parameters. Usually, using
 	 * {@link #execute(Object[][])} is better; it handles optional arguments
 	 * and function event creation automatically.
-	 * @param e Associated function event. This is usually created by Skript.
+	 * @param event Associated function event. This is usually created by Skript.
 	 * @param params Function parameters.
 	 * There must be {@link Signature#getMaxParameters()} amount of them, and
 	 * you need to manually handle default values.
 	 * @return Function return value(s).
 	 */
-	@Nullable
-	public abstract T[] execute(FunctionEvent<?> e, Object[][] params);
+	public abstract T @Nullable [] execute(FunctionEvent<?> event, Object[][] params);
 
 	/**
 	 * Resets the return value of the {@code Function}.
diff --git a/src/main/java/ch/njol/skript/lang/function/FunctionEvent.java b/src/main/java/ch/njol/skript/lang/function/FunctionEvent.java
index c954d434bcd..6e17b1410d1 100644
--- a/src/main/java/ch/njol/skript/lang/function/FunctionEvent.java
+++ b/src/main/java/ch/njol/skript/lang/function/FunctionEvent.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.lang.function;
 
 import org.bukkit.event.Event;
diff --git a/src/main/java/ch/njol/skript/lang/function/FunctionReference.java b/src/main/java/ch/njol/skript/lang/function/FunctionReference.java
index c9fa53ccdbb..98b453cbe50 100644
--- a/src/main/java/ch/njol/skript/lang/function/FunctionReference.java
+++ b/src/main/java/ch/njol/skript/lang/function/FunctionReference.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.lang.function;
 
 
@@ -28,12 +10,13 @@
 import ch.njol.skript.log.RetainingLogHandler;
 import ch.njol.skript.log.SkriptLogger;
 import ch.njol.skript.registrations.Classes;
-import org.skriptlang.skript.lang.converter.Converters;
+import ch.njol.skript.util.Contract;
 import ch.njol.skript.util.LiteralUtils;
 import ch.njol.util.StringUtils;
 import org.bukkit.event.Event;
+import org.skriptlang.skript.util.Executable;
 import org.jetbrains.annotations.Nullable;
-import ch.njol.skript.util.Contract;
+import org.skriptlang.skript.lang.converter.Converters;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -42,32 +25,30 @@
 /**
  * Reference to a Skript function.
  */
-public class FunctionReference<T> implements Contract {
-	
+public class FunctionReference<T> implements Contract, Executable<Event, T[]> {
+
 	/**
 	 * Name of function that is called, for logging purposes.
 	 */
 	final String functionName;
-	
+
 	/**
 	 * Signature of referenced function. If {@link #validateFunction(boolean)}
 	 * succeeds, this is not null.
 	 */
-	@Nullable
-	private Signature<? extends T> signature;
-	
+	private @Nullable Signature<? extends T> signature;
+  
 	/**
 	 * Actual function reference. Null before the function is called for first
 	 * time.
 	 */
-	@Nullable
-	private Function<? extends T> function;
-	
+	private @Nullable Function<? extends T> function;
+
 	/**
 	 * If all function parameters can be condensed to a single list.
 	 */
 	private boolean singleListParam;
-	
+
 	/**
 	 * Definitions of function parameters.
 	 */
@@ -78,26 +59,24 @@ public class FunctionReference<T> implements Contract {
 	 * Used for verifying correctness of the function signature.
 	 */
 	private boolean single;
-	
+
 	/**
 	 * Return types expected from this function. Used for verifying correctness
 	 * of the function signature.
 	 */
 	@Nullable
 	final Class<? extends T>[] returnTypes;
-	
+
 	/**
 	 * Node for {@link #validateFunction(boolean)} to use for logging.
 	 */
-	@Nullable
-	private final Node node;
-	
+	private final @Nullable Node node;
+
 	/**
 	 * Script in which this reference is found. Used for function unload
 	 * safety checks.
 	 */
-	@Nullable
-	public final String script;
+	public final @Nullable String script;
 
 	/**
 	 * The contract for this function (typically the function reference itself).
@@ -126,14 +105,13 @@ public boolean validateParameterArity(boolean first) {
 		// Not enough parameters
 		return parameters.length >= sign.getMinParameters();
 	}
-	
+
 	/**
 	 * Validates this function reference. Prints errors if needed.
 	 * @param first True if this is called while loading a script. False when
 	 * this is called when the function signature changes.
 	 * @return True if validation succeeded.
 	 */
-	@SuppressWarnings("unchecked")
 	public boolean validateFunction(boolean first) {
 		if (!first && script == null)
 			return false;
@@ -154,7 +132,7 @@ public boolean validateFunction(boolean first) {
 			}
 			return false;
 		}
-		
+
 		// Validate that return types are what caller expects they are
 		Class<? extends T>[] returnTypes = this.returnTypes;
 		if (returnTypes != null) {
@@ -188,7 +166,7 @@ public boolean validateFunction(boolean first) {
 				return false;
 			}
 		}
-		
+
 		// Validate parameter count
 		singleListParam = sign.getMaxParameters() == 1 && !sign.getParameter(0).single;
 		if (!singleListParam) { // Check that parameter count is within allowed range
@@ -211,7 +189,7 @@ public boolean validateFunction(boolean first) {
 				return false;
 			}
 		}
-		
+
 		// Not enough parameters
 		if (parameters.length < sign.getMinParameters()) {
 			if (first) {
@@ -224,12 +202,13 @@ public boolean validateFunction(boolean first) {
 			}
 			return false;
 		}
-		
+
 		// Check parameter types
 		for (int i = 0; i < parameters.length; i++) {
 			Parameter<?> p = sign.parameters[singleListParam ? 0 : i];
 			RetainingLogHandler log = SkriptLogger.startRetainingLog();
 			try {
+				//noinspection unchecked
 				Expression<?> e = parameters[i].getConvertedExpression(p.type.getC());
 				if (e == null) {
 					if (first) {
@@ -262,19 +241,19 @@ public boolean validateFunction(boolean first) {
 				log.printLog();
 			}
 		}
-		
+
+		//noinspection unchecked
 		signature = (Signature<? extends T>) sign;
 		sign.calls.add(this);
 
 		Contract contract = sign.getContract();
 		if (contract != null)
 			this.contract = contract;
-		
+
 		return true;
 	}
 
-	@Nullable
-	public Function<? extends T> getFunction() {
+	public @Nullable Function<? extends T> getFunction() {
 		return function;
 	}
 
@@ -284,33 +263,32 @@ public boolean resetReturnValue() {
 		return false;
 	}
 
-	@SuppressWarnings("unchecked")
-	@Nullable
-	protected T[] execute(Event e) {
+	protected T @Nullable [] execute(Event event) {
 		// If needed, acquire the function reference
 		if (function == null)
+			//noinspection unchecked
 			function = (Function<? extends T>) Functions.getFunction(functionName, script);
 
 		if (function == null) { // It might be impossible to resolve functions in some cases!
 			Skript.error("Couldn't resolve call for '" + functionName + "'.");
 			return null; // Return nothing and hope it works
 		}
-		
+
 		// Prepare parameter values for calling
 		Object[][] params = new Object[singleListParam ? 1 : parameters.length][];
 		if (singleListParam && parameters.length > 1) { // All parameters to one list
 			List<Object> l = new ArrayList<>();
 			for (Expression<?> parameter : parameters)
-				l.addAll(Arrays.asList(parameter.getArray(e)));
+				l.addAll(Arrays.asList(parameter.getArray(event)));
 			params[0] = l.toArray();
-			
+
 			// Don't allow mutating across function boundary; same hack is applied to variables
 			for (int i = 0; i < params[0].length; i++) {
 				params[0][i] = Classes.clone(params[0][i]);
 			}
 		} else { // Use parameters in normal way
 			for (int i = 0; i < parameters.length; i++) {
-				Object[] array = parameters[i].getArray(e);
+				Object[] array = parameters[i].getArray(event);
 				params[i] = Arrays.copyOf(array, array.length);
 				// Don't allow mutating across function boundary; same hack is applied to variables
 				for (int j = 0; j < params[i].length; j++) {
@@ -318,7 +296,7 @@ protected T[] execute(Event e) {
 				}
 			}
 		}
-		
+
 		// Execute the function
 		return function.execute(params);
 	}
@@ -332,19 +310,16 @@ public boolean isSingle(Expression<?>... arguments) {
 		return single;
 	}
 
-	@Nullable
-	public Class<? extends T> getReturnType() {
+	public @Nullable Class<? extends T> getReturnType() {
 		//noinspection unchecked
 		return (Class<? extends T>) contract.getReturnType(parameters);
 	}
 
 	@Override
-	@Nullable
-	public Class<?> getReturnType(Expression<?>... arguments) {
+	public @Nullable Class<?> getReturnType(Expression<?>... arguments) {
 		if (signature == null)
 			throw new SkriptAPIException("Signature of function is null when return type is asked!");
 
-		@SuppressWarnings("ConstantConditions")
 		ClassInfo<? extends T> ret = signature.returnType;
 		return ret == null ? null : ret.getC();
 	}
@@ -357,15 +332,48 @@ public Contract getContract() {
 		return contract;
 	}
 
-	public String toString(@Nullable Event e, boolean debug) {
+	public String toString(@Nullable Event event, boolean debug) {
 		StringBuilder b = new StringBuilder(functionName + "(");
 		for (int i = 0; i < parameters.length; i++) {
 			if (i != 0)
 				b.append(", ");
-			b.append(parameters[i].toString(e, debug));
+			b.append(parameters[i].toString(event, debug));
 		}
 		b.append(")");
 		return b.toString();
 	}
-	
+
+	@Override
+	public T[] execute(Event event, Object... arguments) {
+		// If needed, acquire the function reference
+		if (function == null)
+			//noinspection unchecked
+			function = (Function<? extends T>) Functions.getFunction(functionName, script);
+
+		if (function == null) { // It might be impossible to resolve functions in some cases!
+			Skript.error("Couldn't resolve call for '" + functionName + "'.");
+			return null; // Return nothing and hope it works
+		}
+		// We shouldn't trust the caller provided an array of arrays
+		Object[][] consigned = consign(arguments);
+		try {
+			return function.execute(consigned);
+		} finally {
+			this.resetReturnValue();
+		}
+	}
+
+	static Object[][] consign(Object... arguments) {
+		Object[][] consigned = new Object[arguments.length][];
+		for (int i = 0; i < consigned.length; i++) {
+			if (arguments[i] instanceof Object[] || arguments[i] == null) {
+				consigned[i] = (Object[]) arguments[i];
+			} else {
+				consigned[i] = new Object[]{arguments[i]};
+			}
+		}
+		return consigned;
+
+	}
+
 }
diff --git a/src/main/java/ch/njol/skript/lang/function/Functions.java b/src/main/java/ch/njol/skript/lang/function/Functions.java
index ca7c7959708..bac1537d899 100644
--- a/src/main/java/ch/njol/skript/lang/function/Functions.java
+++ b/src/main/java/ch/njol/skript/lang/function/Functions.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.lang.function;
 
 import ch.njol.skript.Skript;
@@ -23,9 +5,6 @@
 import ch.njol.skript.SkriptAddon;
 import ch.njol.skript.classes.ClassInfo;
 import ch.njol.skript.config.SectionNode;
-import ch.njol.skript.lang.ParseContext;
-import ch.njol.skript.lang.SkriptParser;
-import ch.njol.skript.log.SkriptLogger;
 import ch.njol.skript.registrations.Classes;
 import ch.njol.skript.util.Utils;
 import ch.njol.util.NonNullPair;
@@ -53,8 +32,7 @@ public abstract class Functions {
 
 	private Functions() {}
 
-	@Nullable
-	public static ScriptFunction<?> currentFunction = null;
+	public static @Nullable ScriptFunction<?> currentFunction = null;
 
 	/**
 	 * Function namespaces.
@@ -105,8 +83,7 @@ public static JavaFunction<?> registerFunction(JavaFunction<?> function) {
 	 * to get a new signature instance and {@link Functions#registerSignature(Signature)} to register the signature
 	 * @return Script function, or null if something went wrong.
 	 */
-	@Nullable
-	public static Function<?> loadFunction(Script script, SectionNode node, Signature<?> signature) {
+	public static @Nullable Function<?> loadFunction(Script script, SectionNode node, Signature<?> signature) {
 		String name = signature.name;
 		Namespace namespace = getScriptNamespace(script.getConfig().getFileName());
 		if (namespace == null) {
@@ -140,9 +117,7 @@ public static Function<?> loadFunction(Script script, SectionNode node, Signatur
 	 * @return Parsed signature or null if something went wrong.
 	 * @see Functions#registerSignature(Signature)
 	 */
-	@Nullable
-	@SuppressWarnings({"unchecked", "null"})
-	public static Signature<?> parseSignature(String script, String name, String args, @Nullable String returnType, boolean local) {
+	public static @Nullable Signature<?> parseSignature(String script, String name, String args, @Nullable String returnType, boolean local) {
 		List<Parameter<?>> parameters = Parameter.parse(args);
 		if (parameters == null)
 			return null;
@@ -162,6 +137,7 @@ public static Signature<?> parseSignature(String script, String name, String arg
 			if (returnClass == null)
 				return signError("Cannot recognise the type '" + returnType + "'");
 		}
+		//noinspection unchecked
 		return new Signature<>(script, name, parameters.toArray(new Parameter[0]), local, (ClassInfo<Object>) returnClass, singleReturn, null);
 	}
 
@@ -171,8 +147,7 @@ public static Signature<?> parseSignature(String script, String name, String arg
 	 * @return Signature of function, or null if something went wrong.
 	 * @see Functions#parseSignature(String, String, String, String, boolean)
 	 */
-	@Nullable
-	public static Signature<?> registerSignature(Signature<?> signature) {
+	public static @Nullable Signature<?> registerSignature(Signature<?> signature) {
 		// Ensure there are no duplicate functions
 		if (signature.local) {
 			Namespace namespace = getScriptNamespace(signature.script);
@@ -207,8 +182,7 @@ public static Signature<?> registerSignature(Signature<?> signature) {
 	 * @param error Error message.
 	 * @return Null.
 	 */
-	@Nullable
-	private static Function<?> error(String error) {
+	private static @Nullable Function<?> error(String error) {
 		Skript.error(error);
 		return null;
 	}
@@ -218,8 +192,7 @@ private static Function<?> error(String error) {
 	 * @param error Error message.
 	 * @return Null.
 	 */
-	@Nullable
-	private static Signature<?> signError(String error) {
+	private static @Nullable Signature<?> signError(String error) {
 		Skript.error(error);
 		return null;
 	}
@@ -234,8 +207,7 @@ private static Signature<?> signError(String error) {
 	 * @return Function, or null if it does not exist.
 	 */
 	@Deprecated
-	@Nullable
-	public static Function<?> getFunction(String name) {
+	public static @Nullable Function<?> getFunction(String name) {
 		return getGlobalFunction(name);
 	}
 
@@ -247,8 +219,7 @@ public static Function<?> getFunction(String name) {
 	 * @param name Name of function.
 	 * @return Function, or null if it does not exist.
 	 */
-	@Nullable
-	public static Function<?> getGlobalFunction(String name) {
+	public static @Nullable Function<?> getGlobalFunction(String name) {
 		Namespace namespace = globalFunctions.get(name);
 		if (namespace == null)
 			return null;
@@ -264,8 +235,7 @@ public static Function<?> getGlobalFunction(String name) {
 	 * @param script The script where the function is declared in. Used to get local functions.
 	 * @return Function, or null if it does not exist.
 	 */
-	@Nullable
-	public static Function<?> getLocalFunction(String name, String script) {
+	public static @Nullable Function<?> getLocalFunction(String name, String script) {
 		Namespace namespace = null;
 		Function<?> function = null;
 		namespace = getScriptNamespace(script);
@@ -284,8 +254,7 @@ public static Function<?> getLocalFunction(String name, String script) {
 	 * @param script The script where the function is declared in. Used to get local functions.
 	 * @return Function, or null if it does not exist.
 	 */
-	@Nullable
-	public static Function<?> getFunction(String name, @Nullable String script) {
+	public static @Nullable Function<?> getFunction(String name, @Nullable String script) {
 		if (script == null)
 			return getGlobalFunction(name);
 		Function<?> function = getLocalFunction(name, script);
@@ -302,8 +271,7 @@ public static Function<?> getFunction(String name, @Nullable String script) {
 	 * @return Signature, or null if function does not exist.
 	 */
 	@Deprecated
-	@Nullable
-	public static Signature<?> getSignature(String name) {
+	public static @Nullable Signature<?> getSignature(String name) {
 		return getGlobalSignature(name);
 	}
 
@@ -313,8 +281,7 @@ public static Signature<?> getSignature(String name) {
 	 * @param name Name of function.
 	 * @return Signature, or null if function does not exist.
 	 */
-	@Nullable
-	public static Signature<?> getGlobalSignature(String name) {
+	public static @Nullable Signature<?> getGlobalSignature(String name) {
 		Namespace namespace = globalFunctions.get(name);
 		if (namespace == null)
 			return null;
@@ -328,8 +295,7 @@ public static Signature<?> getGlobalSignature(String name) {
 	 * @param script The script where the function is declared in. Used to get local functions.
 	 * @return Signature, or null if function does not exist.
 	 */
-	@Nullable
-	public static Signature<?> getLocalSignature(String name, String script) {
+	public static @Nullable Signature<?> getLocalSignature(String name, String script) {
 		Namespace namespace = null;
 		Signature<?> signature = null;
 		namespace = getScriptNamespace(script);
@@ -346,8 +312,7 @@ public static Signature<?> getLocalSignature(String name, String script) {
 	 * @param script The script where the function is declared in. Used to get local functions.
 	 * @return Signature, or null if function does not exist.
 	 */
-	@Nullable
-	public static Signature<?> getSignature(String name, @Nullable String script) {
+	public static @Nullable Signature<?> getSignature(String name, @Nullable String script) {
 		if (script == null)
 			return getGlobalSignature(name);
 		Signature<?> signature = getLocalSignature(name, script);
@@ -356,8 +321,7 @@ public static Signature<?> getSignature(String name, @Nullable String script) {
 		return signature;
 	}
 
-	@Nullable
-	public static Namespace getScriptNamespace(String script) {
+	public static @Nullable Namespace getScriptNamespace(String script) {
 		return namespaces.get(new Namespace.Key(Namespace.Origin.SCRIPT, script));
 	}
 
diff --git a/src/main/java/ch/njol/skript/lang/function/JavaFunction.java b/src/main/java/ch/njol/skript/lang/function/JavaFunction.java
index de215868f09..74c19cb8e20 100644
--- a/src/main/java/ch/njol/skript/lang/function/JavaFunction.java
+++ b/src/main/java/ch/njol/skript/lang/function/JavaFunction.java
@@ -1,27 +1,8 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.lang.function;
 
-import org.jetbrains.annotations.Nullable;
-
 import ch.njol.skript.classes.ClassInfo;
 import ch.njol.skript.util.Contract;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * @author Peter Güttinger
@@ -41,17 +22,12 @@ public JavaFunction(String name, Parameter<?>[] parameters, ClassInfo<T> returnT
 	}
 	
 	@Override
-	@Nullable
-	public abstract T[] execute(FunctionEvent<?> e, Object[][] params);
-	
-	@Nullable
-	private String[] description = null;
-	@Nullable
-	private String[] examples = null;
-	@Nullable
-	private String[] keywords;
-	@Nullable
-	private String since = null;
+	public abstract T @Nullable [] execute(FunctionEvent<?> event, Object[][] params);
+
+	private String @Nullable [] description = null;
+	private String @Nullable [] examples = null;
+	private String @Nullable [] keywords;
+	private @Nullable String since = null;
 	
 	/**
 	 * Only used for Skript's documentation.
@@ -97,24 +73,20 @@ public JavaFunction<T> since(final String since) {
 		this.since = since;
 		return this;
 	}
-	
-	@Nullable
-	public String[] getDescription() {
+
+	public String @Nullable [] getDescription() {
 		return description;
 	}
-	
-	@Nullable
-	public String[] getExamples() {
+
+	public String @Nullable [] getExamples() {
 		return examples;
 	}
 
-	@Nullable
-	public String[] getKeywords() {
+	public String @Nullable [] getKeywords() {
 		return keywords;
 	}
-	
-	@Nullable
-	public String getSince() {
+
+	public @Nullable String getSince() {
 		return since;
 	}
 
diff --git a/src/main/java/ch/njol/skript/lang/function/Namespace.java b/src/main/java/ch/njol/skript/lang/function/Namespace.java
index 5a33aa7ff08..123428c7ce3 100644
--- a/src/main/java/ch/njol/skript/lang/function/Namespace.java
+++ b/src/main/java/ch/njol/skript/lang/function/Namespace.java
@@ -1,30 +1,12 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.lang.function;
 
+import org.jetbrains.annotations.Nullable;
+
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Objects;
 
-import org.jetbrains.annotations.Nullable;
-
 /**
  * Contains a set of functions.
  */
@@ -52,8 +34,7 @@ public static class Key {
 		
 		private final Origin origin;
 
-		@Nullable
-		private final String scriptName;
+		private final @Nullable String scriptName;
 
 		public Key(Origin origin, @Nullable String scriptName) {
 			super();
@@ -65,8 +46,7 @@ public Origin getOrigin() {
 			return origin;
 		}
 
-		@Nullable
-		public String getScriptName() {
+		public @Nullable String getScriptName() {
 			return scriptName;
 		}
 
@@ -156,14 +136,12 @@ public Namespace() {
 		this.signatures = new HashMap<>();
 		this.functions = new HashMap<>();
 	}
-	
-	@Nullable
-	public Signature<?> getSignature(String name, boolean local) {
+
+	public @Nullable Signature<?> getSignature(String name, boolean local) {
 		return signatures.get(new Info(name, local));
 	}
 
-	@Nullable
-	public Signature<?> getSignature(String name) {
+	public @Nullable Signature<?> getSignature(String name) {
 		Signature<?> signature = getSignature(name, true);
 		return signature == null ? getSignature(name, false) : signature;
 	}
@@ -187,14 +165,12 @@ public boolean removeSignature(Signature<?> sign) {
 	public Collection<Signature<?>> getSignatures() {
 		return signatures.values();
 	}
-	
-	@Nullable
-	public Function<?> getFunction(String name, boolean local) {
+
+	public @Nullable Function<?> getFunction(String name, boolean local) {
 		return functions.get(new Info(name, local));
 	}
 
-	@Nullable
-	public Function<?> getFunction(String name) {
+	public @Nullable Function<?> getFunction(String name) {
 		Function<?> function = getFunction(name, true);
 		return function == null ? getFunction(name, false) : function;
 	}
diff --git a/src/main/java/ch/njol/skript/lang/function/Parameter.java b/src/main/java/ch/njol/skript/lang/function/Parameter.java
index ea6072f4333..e9ab79f63ec 100644
--- a/src/main/java/ch/njol/skript/lang/function/Parameter.java
+++ b/src/main/java/ch/njol/skript/lang/function/Parameter.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.lang.function;
 
 import ch.njol.skript.Skript;
@@ -61,8 +43,7 @@ public final class Parameter<T> {
 	 * Expression that will provide default value of this parameter
 	 * when the function is called.
 	 */
-	@Nullable
-	final Expression<? extends T> def;
+	final @Nullable Expression<? extends T> def;
 	
 	/**
 	 * Whether this parameter takes one or many values.
@@ -84,10 +65,8 @@ public Parameter(String name, ClassInfo<T> type, boolean single, @Nullable Expre
 	public ClassInfo<T> getType() {
 		return type;
 	}
-	
-	@SuppressWarnings("unchecked")
-	@Nullable
-	public static <T> Parameter<T> newInstance(String name, ClassInfo<T> type, boolean single, @Nullable String def) {
+
+	public static <T> @Nullable Parameter<T> newInstance(String name, ClassInfo<T> type, boolean single, @Nullable String def) {
 		if (!Variable.isValidVariableName(name, true, false)) {
 			Skript.error("A parameter's name must be a valid variable name.");
 			// ... because it will be made available as local variable
@@ -99,6 +78,7 @@ public static <T> Parameter<T> newInstance(String name, ClassInfo<T> type, boole
 			
 			// Parse the default value expression
 			try {
+				//noinspection unchecked
 				d = new SkriptParser(def, SkriptParser.ALL_FLAGS, ParseContext.DEFAULT).parseExpression(type.getC());
 				if (d == null || LiteralUtils.hasUnparsedLiteral(d)) {
 					log.printErrors("Can't understand this expression: " + def);
@@ -118,8 +98,7 @@ public static <T> Parameter<T> newInstance(String name, ClassInfo<T> type, boole
 	 * @param args The string to parse.
 	 * @return The parsed parameters
 	 */
-	@Nullable
-	public static List<Parameter<?>> parse(String args) {
+	public static @Nullable List<Parameter<?>> parse(String args) {
 		List<Parameter<?>> params = new ArrayList<>();
 		boolean caseInsensitive = SkriptConfig.caseInsensitiveVariables.value();
 		int j = 0;
@@ -188,8 +167,7 @@ public String getName() {
 	 * Get the Expression that will be used to provide the default value of this parameter when the function is called.
 	 * @return Expression that will provide default value of this parameter
 	 */
-	@Nullable
-	public Expression<? extends T> getDefaultExpression() {
+	public @Nullable Expression<? extends T> getDefaultExpression() {
 		return def;
 	}
 	
@@ -203,7 +181,11 @@ public boolean isSingleValue() {
 	
 	@Override
 	public String toString() {
-		return name + ": " + Utils.toEnglishPlural(type.getCodeName(), !single) + (def != null ? " = " + def.toString(null, true) : "");
+		return toString(Skript.debug());
+	}
+
+	public String toString(boolean debug) {
+		return name + ": " + Utils.toEnglishPlural(type.getCodeName(), !single) + (def != null ? " = " + def.toString(null, debug) : "");
 	}
 	
 }
diff --git a/src/main/java/ch/njol/skript/lang/function/ScriptFunction.java b/src/main/java/ch/njol/skript/lang/function/ScriptFunction.java
index 356c58a07ae..c6441333b19 100644
--- a/src/main/java/ch/njol/skript/lang/function/ScriptFunction.java
+++ b/src/main/java/ch/njol/skript/lang/function/ScriptFunction.java
@@ -1,35 +1,16 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.lang.function;
 
 import ch.njol.skript.classes.ClassInfo;
+import ch.njol.skript.config.SectionNode;
 import ch.njol.skript.lang.Expression;
 import ch.njol.skript.lang.ReturnHandler;
-import org.bukkit.event.Event;
-import org.jetbrains.annotations.ApiStatus;
-import org.skriptlang.skript.lang.script.Script;
-import org.jetbrains.annotations.Nullable;
-
-import ch.njol.skript.config.SectionNode;
 import ch.njol.skript.lang.Trigger;
 import ch.njol.skript.lang.util.SimpleEvent;
 import ch.njol.skript.variables.Variables;
+import org.bukkit.event.Event;
+import org.jetbrains.annotations.ApiStatus;
+import org.jetbrains.annotations.Nullable;
+import org.skriptlang.skript.lang.script.Script;
 
 public class ScriptFunction<T> extends Function<T> implements ReturnHandler<T> {
 
@@ -61,21 +42,21 @@ public ScriptFunction(Signature<T> sign, SectionNode node) {
 	// REMIND track possible types of local variables (including undefined variables) (consider functions, commands, and EffChange) - maybe make a general interface for this purpose
 	// REM: use patterns, e.g. {_a%b%} is like "a.*", and thus subsequent {_axyz} may be set and of that type.
 	@Override
-	public T @Nullable [] execute(final FunctionEvent<?> e, final Object[][] params) {
+	public T @Nullable [] execute(FunctionEvent<?> event, Object[][] params) {
 		Parameter<?>[] parameters = getSignature().getParameters();
 		for (int i = 0; i < parameters.length; i++) {
-			Parameter<?> p = parameters[i];
+			Parameter<?> parameter = parameters[i];
 			Object[] val = params[i];
-			if (p.single && val.length > 0) {
-				Variables.setVariable(p.name, val[0], e, true);
+			if (parameter.single && val.length > 0) {
+				Variables.setVariable(parameter.name, val[0], event, true);
 			} else {
 				for (int j = 0; j < val.length; j++) {
-					Variables.setVariable(p.name + "::" + (j + 1), val[j], e, true);
+					Variables.setVariable(parameter.name + "::" + (j + 1), val[j], event, true);
 				}
 			}
 		}
 		
-		trigger.execute(e);
+		trigger.execute(event);
 		ClassInfo<T> returnType = getReturnType();
 		return returnType != null ? returnValues : null;
 	}
diff --git a/src/main/java/ch/njol/skript/lang/function/Signature.java b/src/main/java/ch/njol/skript/lang/function/Signature.java
index 720bcef84d4..f046fecc6e6 100644
--- a/src/main/java/ch/njol/skript/lang/function/Signature.java
+++ b/src/main/java/ch/njol/skript/lang/function/Signature.java
@@ -1,26 +1,10 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.lang.function;
 
+import ch.njol.skript.Skript;
 import ch.njol.skript.classes.ClassInfo;
-import org.jetbrains.annotations.Nullable;
+import ch.njol.skript.util.Utils;
 import ch.njol.skript.util.Contract;
+import org.jetbrains.annotations.Nullable;
 
 import java.util.Collection;
 import java.util.Collections;
@@ -56,8 +40,7 @@ public class Signature<T> {
 	 * is null. void is never used as return type, because it is not registered
 	 * to Skript's type system.
 	 */
-	@Nullable
-	final ClassInfo<T> returnType;
+	final @Nullable ClassInfo<T> returnType;
 	
 	/**
 	 * Whether this function returns a single value, or multiple ones.
@@ -73,14 +56,12 @@ public class Signature<T> {
 	/**
 	 * The class path for the origin of this signature.
 	 */
-	@Nullable
-	final String originClassPath;
+	final @Nullable String originClassPath;
 
 	/**
 	 * An overriding contract for this function (e.g. to base its return on its arguments).
 	 */
-	@Nullable
-	final Contract contract;
+	final @Nullable Contract contract;
 
 	public Signature(String script,
 					 String name,
@@ -131,8 +112,7 @@ public boolean isLocal() {
 		return local;
 	}
 
-	@Nullable
-	public ClassInfo<T> getReturnType() {
+	public @Nullable ClassInfo<T> getReturnType() {
 		return returnType;
 	}
 	
@@ -144,8 +124,7 @@ public String getOriginClassPath() {
 		return originClassPath;
 	}
 
-	@Nullable
-	public Contract getContract() {
+	public @Nullable Contract getContract() {
 		return contract;
 	}
 
@@ -176,5 +155,34 @@ public int getMinParameters() {
 	public int hashCode() {
 		return name.hashCode();
 	}
-	
+
+	@Override
+	public String toString() {
+		return toString(true, Skript.debug());
+	}
+
+	public String toString(boolean includeReturnType, boolean debug) {
+		StringBuilder signatureBuilder = new StringBuilder();
+
+		if (local)
+			signatureBuilder.append("local ");
+		signatureBuilder.append(name);
+
+		signatureBuilder.append('(');
+		int lastParameterIndex = parameters.length - 1;
+		for (int i = 0; i < parameters.length; i++) {
+			signatureBuilder.append(parameters[i].toString(debug));
+			if (i != lastParameterIndex)
+				signatureBuilder.append(", ");
+		}
+		signatureBuilder.append(')');
+
+		if (includeReturnType && returnType != null) {
+			signatureBuilder.append(" :: ");
+			signatureBuilder.append(Utils.toEnglishPlural(returnType.getCodeName(), !single));
+		}
+
+		return signatureBuilder.toString();
+	}
+
 }
diff --git a/src/main/java/ch/njol/skript/lang/function/SimpleJavaFunction.java b/src/main/java/ch/njol/skript/lang/function/SimpleJavaFunction.java
index 4bb80405edb..32d264ac361 100644
--- a/src/main/java/ch/njol/skript/lang/function/SimpleJavaFunction.java
+++ b/src/main/java/ch/njol/skript/lang/function/SimpleJavaFunction.java
@@ -1,27 +1,8 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.lang.function;
 
-import org.jetbrains.annotations.Nullable;
-
 import ch.njol.skript.classes.ClassInfo;
 import ch.njol.skript.util.Contract;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * A {@link JavaFunction} which doesn't make use of
@@ -41,19 +22,16 @@ public SimpleJavaFunction(String name, Parameter<?>[] parameters, ClassInfo<T> r
 	public SimpleJavaFunction(String name, Parameter<?>[] parameters, ClassInfo<T> returnType, boolean single, Contract contract) {
 		super(name, parameters, returnType, single, contract);
 	}
-	
-	@SuppressWarnings("ConstantConditions")
-	@Nullable
+
 	@Override
-	public final T[] execute(FunctionEvent<?> e, Object[][] params) {
+	public final T @Nullable [] execute(FunctionEvent<?> event, Object[][] params) {
 		for (Object[] param : params) {
 			if (param == null || param.length == 0 || param[0] == null)
 				return null;
 		}
 		return executeSimple(params);
 	}
-	
-	@Nullable
-	public abstract T[] executeSimple(Object[][] params);
+
+	public abstract T @Nullable [] executeSimple(Object[][] params);
 	
 }
diff --git a/src/main/java/ch/njol/skript/lang/parser/ParserInstance.java b/src/main/java/ch/njol/skript/lang/parser/ParserInstance.java
index 8ed8cd5a919..a490875d13d 100644
--- a/src/main/java/ch/njol/skript/lang/parser/ParserInstance.java
+++ b/src/main/java/ch/njol/skript/lang/parser/ParserInstance.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.lang.parser;
 
 import ch.njol.skript.ScriptLoader;
@@ -31,6 +13,7 @@
 import ch.njol.skript.structures.StructOptions.OptionsData;
 import ch.njol.util.Kleenean;
 import ch.njol.util.coll.CollectionUtils;
+import com.google.common.base.Preconditions;
 import org.bukkit.event.Event;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
@@ -39,7 +22,6 @@
 import org.skriptlang.skript.lang.experiment.ExperimentSet;
 import org.skriptlang.skript.lang.experiment.Experimented;
 import org.skriptlang.skript.lang.script.Script;
-import org.skriptlang.skript.lang.script.ScriptEvent;
 import org.skriptlang.skript.lang.structure.Structure;
 
 import java.io.File;
@@ -112,8 +94,7 @@ public void reset() {
 
 	// Script API
 
-	@Nullable
-	private Script currentScript = null;
+	private @Nullable Script currentScript = null;
 
 	/**
 	 * Internal method for updating the current script. Allows null parameter.
@@ -131,12 +112,18 @@ private void setCurrentScript(@Nullable Script currentScript) {
 		);
 
 		// "Script" events
-		if (previous != null)
-			previous.getEvents(ScriptEvent.ScriptInactiveEvent.class)
-				.forEach(eventHandler -> eventHandler.onInactive(currentScript));
-		if (currentScript != null)
-			currentScript.getEvents(ScriptEvent.ScriptActiveEvent.class)
-				.forEach(eventHandler -> eventHandler.onActive(previous));
+		if (previous != null) { // 'previous' is becoming inactive
+			ScriptLoader.eventRegistry().events(ScriptActivityChangeEvent.class)
+					.forEach(event -> event.onActivityChange(this, previous, false, currentScript));
+			previous.eventRegistry().events(ScriptActivityChangeEvent.class)
+					.forEach(event -> event.onActivityChange(this, previous, false, currentScript));
+		}
+		if (currentScript != null) { // 'currentScript' is becoming active
+			ScriptLoader.eventRegistry().events(ScriptActivityChangeEvent.class)
+					.forEach(event -> event.onActivityChange(this, currentScript, true, previous));
+			currentScript.eventRegistry().events(ScriptActivityChangeEvent.class)
+					.forEach(event -> event.onActivityChange(this, currentScript, true, previous));
+		}
 	}
 
 	/**
@@ -151,8 +138,7 @@ public Script getCurrentScript() {
 
 	// Structure API
 
-	@Nullable
-	private Structure currentStructure = null;
+	private @Nullable Structure currentStructure = null;
 
 	/**
 	 * Updates the Structure currently being handled by this ParserInstance.
@@ -165,8 +151,7 @@ public void setCurrentStructure(@Nullable Structure structure) {
 	/**
 	 * @return The Structure currently being handled by this ParserInstance.
 	 */
-	@Nullable
-	public Structure getCurrentStructure() {
+	public @Nullable Structure getCurrentStructure() {
 		return currentStructure;
 	}
 
@@ -191,8 +176,7 @@ public final boolean isCurrentStructure(Class<? extends Structure>... structureC
 
 	// Event API
 
-	@Nullable
-	private String currentEventName;
+	private @Nullable String currentEventName;
 
 	private Class<? extends Event> @Nullable [] currentEvents = null;
 
@@ -200,8 +184,7 @@ public void setCurrentEventName(@Nullable String currentEventName) {
 		this.currentEventName = currentEventName;
 	}
 
-	@Nullable
-	public String getCurrentEventName() {
+	public @Nullable String getCurrentEventName() {
 		return currentEventName;
 	}
 
@@ -245,6 +228,8 @@ public void deleteCurrentEvent() {
 	 * See also {@link #isCurrentEvent(Class[])} for checking with multiple argument classes
 	 */
 	public boolean isCurrentEvent(Class<? extends Event> event) {
+		if (currentEvents == null)
+			return false;
 		for (Class<? extends Event> currentEvent : currentEvents) {
 			// check that current event is same or child of event we want
 			if (event.isAssignableFrom(currentEvent))
@@ -298,12 +283,11 @@ public List<TriggerSection> getCurrentSections() {
 	 * Returns {@code null} if {@link #isCurrentSection(Class)} returns {@code false}.
 	 * @see #getCurrentSections()
 	 */
-	@Nullable
-	@SuppressWarnings("unchecked")
-	public <T extends TriggerSection> T getCurrentSection(Class<T> sectionClass) {
+	public <T extends TriggerSection> @Nullable T getCurrentSection(Class<T> sectionClass) {
 		for (int i = currentSections.size(); i-- > 0;) {
 			TriggerSection triggerSection = currentSections.get(i);
 			if (sectionClass.isInstance(triggerSection))
+				//noinspection unchecked
 				return (T) triggerSection;
 		}
 		return null;
@@ -314,17 +298,78 @@ public <T extends TriggerSection> T getCurrentSection(Class<T> sectionClass) {
 	 * Modifications to the returned list are not saved.
 	 * @see #getCurrentSections()
 	 */
-	@NotNull
-	@SuppressWarnings("unchecked")
-	public <T extends TriggerSection> List<T> getCurrentSections(Class<T> sectionClass) {
+	public <T extends TriggerSection> @NotNull List<T> getCurrentSections(Class<T> sectionClass) {
 		List<T> list = new ArrayList<>();
 		for (TriggerSection triggerSection : currentSections) {
 			if (sectionClass.isInstance(triggerSection))
+				//noinspection unchecked
 				list.add((T) triggerSection);
 		}
 		return list;
 	}
 
+	/**
+	 * Returns the sections from the current section (inclusive) until the specified section (exclusive).
+	 * <p>
+	 * If we have the following sections:
+	 * <pre>{@code
+	 * Section1
+	 *   └ Section2
+	 *       └ Section3} (we are here)</pre>
+	 * And we call {@code getSectionsUntil(Section1)}, the result will be {@code [Section2, Section3]}.
+	 *
+	 * @param section The section to stop at. (exclusive)
+	 * @return A list of sections from the current section (inclusive) until the specified section (exclusive).
+	 */
+	public List<TriggerSection> getSectionsUntil(TriggerSection section) {
+		return new ArrayList<>(currentSections.subList(currentSections.indexOf(section) + 1, currentSections.size()));
+	}
+
+	/**
+	 * Returns a list of sections up to the specified number of levels from the current section.
+	 * <p>
+	 * If we have the following sections:
+	 * <pre>{@code
+	 * Section1
+	 *   └ Section2
+	 *       └ Section3} (we are here)</pre>
+	 * And we call {@code getSections(2)}, the result will be {@code [Section2, Section3]}.
+	 *
+	 * @param levels The number of levels to retrieve from the current section upwards. Must be greater than 0.
+	 * @return A list of sections up to the specified number of levels.
+	 * @throws IllegalArgumentException if the levels is less than 1.
+	 */
+	public List<TriggerSection> getSections(int levels) {
+		Preconditions.checkArgument(levels > 0, "Depth must be at least 1");
+		return new ArrayList<>(currentSections.subList(Math.max(currentSections.size() - levels, 0), currentSections.size()));
+	}
+
+	/**
+	 * Returns a list of sections to the specified number of levels from the current section.
+	 * Only counting sections of the specified type.
+	 * <p>
+	 * If we have the following sections:
+	 * <pre>{@code
+	 * Section1
+	 *   └ LoopSection2
+	 *       └ Section3
+	 *           └ LoopSection4} (we are here)</pre>
+	 * And we call {@code getSections(2, LoopSection.class)}, the result will be {@code [LoopSection2, Section3, LoopSection4]}.
+	 *
+	 * @param levels The number of levels to retrieve from the current section upwards. Must be greater than 0.
+	 * @param type The class type of the sections to count.
+	 * @return A list of sections of the specified type up to the specified number of levels.
+	 * @throws IllegalArgumentException if the levels is less than 1.
+	 */
+	public List<TriggerSection> getSections(int levels, Class<? extends TriggerSection> type) {
+		Preconditions.checkArgument(levels > 0, "Depth must be at least 1");
+		List<? extends TriggerSection> sections = getCurrentSections(type);
+		if (sections.isEmpty())
+			return new ArrayList<>();
+		TriggerSection section = sections.get(Math.max(sections.size() - levels, 0));
+		return new ArrayList<>(currentSections.subList(currentSections.indexOf(section), currentSections.size()));
+	}
+
 	/**
 	 * @return Whether {@link #getCurrentSections()} contains
 	 * a section instance of the given class (or subclass).
@@ -388,8 +433,7 @@ public HandlerList getHandlers() {
 		return handlers;
 	}
 
-	@Nullable
-	private Node node;
+	private @Nullable Node node;
 
 	/**
 	 * @param node The node to mark as being handled. This is mainly used for logging.
@@ -403,8 +447,7 @@ public void setNode(@Nullable Node node) {
 	 * @return The node currently marked as being handled. This is mainly used for logging.
 	 * Null indicates no node is currently being handled (that the ParserInstance is aware of).
 	 */
-	@Nullable
-	public Node getNode() {
+	public @Nullable Node getNode() {
 		return node;
 	}
 
@@ -422,13 +465,13 @@ public String getIndentation() {
 
 	@Override
 	public boolean hasExperiment(String featureName) {
-		return Skript.experiments().isUsing(this.getCurrentScript(), featureName);
+		return this.isActive() && Skript.experiments().isUsing(this.getCurrentScript(), featureName);
 	}
 
 
 	@Override
 	public boolean hasExperiment(Experiment experiment) {
-		return Skript.experiments().isUsing(this.getCurrentScript(), experiment);
+		return this.isActive() && Skript.experiments().isUsing(this.getCurrentScript(), experiment);
 	}
 
 	/**
@@ -492,7 +535,7 @@ protected final ParserInstance getParser() {
 		}
 
 		/**
-		 * @deprecated See {@link ScriptEvent}.
+		 * @deprecated See {@link ScriptLoader.LoaderEvent}.
 		 */
 		@Deprecated
 		public void onCurrentScriptChange(@Nullable Config currentScript) { }
@@ -549,6 +592,29 @@ private List<? extends Data> getDataInstances() {
 		return dataList;
 	}
 
+	/**
+	 * Called when a {@link Script} is made active or inactive in a {@link ParserInstance}.
+	 * This event will trigger <b>after</b> the change in activity has occurred.
+	 * @see #isActive()
+	 */
+	@FunctionalInterface
+	public interface ScriptActivityChangeEvent extends ScriptLoader.LoaderEvent, Script.Event {
+
+		/**
+		 * The method that is called when this event triggers.
+		 * @param parser The ParserInstance where the activity change occurred.
+		 * @param script The Script this event was registered for.
+		 * @param active Whether <code>script</code> became active or inactive within <code>parser</code>.
+		 * @param other The Script that was made active or inactive.
+		 *  Whether it was made active or inactive is the negation of the <code>active</code>.
+		 *  That is to say, if <code>script</code> became active, then <code>other</code> became inactive.
+		 *  Null if <code>parser</code> was inactive (meaning no script became inactive)
+		 *   or became inactive (meaning no script became active).
+		 */
+		void onActivityChange(ParserInstance parser, Script script, boolean active, @Nullable Script other);
+
+	}
+
 	// Backup API
 
 	/**
@@ -558,7 +624,7 @@ private List<? extends Data> getDataInstances() {
 	 *  That is, the contents of any collections will remain the same, but there is no guarantee that
 	 *  the contents themselves will remain unchanged.
 	 * @see #backup()
-	 * @see #restoreBackup(Backup) 
+	 * @see #restoreBackup(Backup)
 	 */
 	public static class Backup {
 
@@ -636,9 +702,8 @@ public HashMap<String, String> getCurrentOptions() {
 	/**
 	 * @deprecated Use {@link #getCurrentStructure()}
 	 */
-	@Nullable
 	@Deprecated
-	public SkriptEvent getCurrentSkriptEvent() {
+	public @Nullable SkriptEvent getCurrentSkriptEvent() {
 		Structure structure = getCurrentStructure();
 		if (structure instanceof SkriptEvent)
 			return (SkriptEvent) structure;
diff --git a/src/main/java/ch/njol/skript/lang/util/ContainerExpression.java b/src/main/java/ch/njol/skript/lang/util/ContainerExpression.java
index 355f642c007..4b71417416a 100644
--- a/src/main/java/ch/njol/skript/lang/util/ContainerExpression.java
+++ b/src/main/java/ch/njol/skript/lang/util/ContainerExpression.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.lang.util;
 
 import ch.njol.skript.lang.Expression;
@@ -47,14 +29,12 @@ protected Object[] get(Event e) {
 	}
 
 	@Override
-	@Nullable
-	public Iterator<Object> iterator(Event event) {
+	public @Nullable Iterator<Object> iterator(Event event) {
 		Iterator<? extends Container<?>> iterator = expr.iterator(event);
 		if (iterator == null)
 			return null;
-		return new Iterator<Object>() {
-			@Nullable
-			private Iterator<?> current;
+		return new Iterator<>() {
+			private @Nullable Iterator<?> current;
 
 			@Override
 			public boolean hasNext() {
diff --git a/src/main/java/ch/njol/skript/lang/util/ContextlessEvent.java b/src/main/java/ch/njol/skript/lang/util/ContextlessEvent.java
index 3e9208a2694..9e786176ffa 100644
--- a/src/main/java/ch/njol/skript/lang/util/ContextlessEvent.java
+++ b/src/main/java/ch/njol/skript/lang/util/ContextlessEvent.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.lang.util;
 
 import ch.njol.skript.lang.parser.ParserInstance;
@@ -47,8 +29,7 @@ public static ContextlessEvent get() {
 	 * This method should never be called.
 	 */
 	@Override
-	@NotNull
-	public HandlerList getHandlers() {
+	public @NotNull HandlerList getHandlers() {
 		throw new IllegalStateException();
 	}
 
diff --git a/src/main/java/ch/njol/skript/lang/util/ConvertedExpression.java b/src/main/java/ch/njol/skript/lang/util/ConvertedExpression.java
index 4d6228112f0..2a3b332813d 100644
--- a/src/main/java/ch/njol/skript/lang/util/ConvertedExpression.java
+++ b/src/main/java/ch/njol/skript/lang/util/ConvertedExpression.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.lang.util;
 
 import ch.njol.skript.classes.Changer;
@@ -24,7 +6,7 @@
 import ch.njol.skript.lang.Expression;
 import ch.njol.skript.lang.SkriptParser.ParseResult;
 import ch.njol.skript.registrations.Classes;
-import ch.njol.util.Checker;
+import ch.njol.skript.util.Utils;
 import ch.njol.util.Kleenean;
 import ch.njol.util.coll.CollectionUtils;
 import org.bukkit.event.Event;
@@ -33,13 +15,10 @@
 import org.skriptlang.skript.lang.converter.ConverterInfo;
 import org.skriptlang.skript.lang.converter.Converters;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-import java.util.NoSuchElementException;
+import java.util.*;
+import java.util.function.Predicate;
 import java.util.stream.Collectors;
+import java.util.function.Predicate;
 
 /**
  * Represents a expression converted to another type. This, and not Expression, is the required return type of {@link SimpleExpression#getConvertedExpr(Class...)} because this
@@ -93,27 +72,33 @@ public ConvertedExpression(Expression<? extends F> source, Class<T> to, Collecti
 	}
 
 	@SafeVarargs
-	@Nullable
-	public static <F, T> ConvertedExpression<F, T> newInstance(Expression<F> from, Class<T>... to) {
+	public static <F, T> @Nullable ConvertedExpression<F, T> newInstance(Expression<F> from, Class<T>... to) {
 		assert !CollectionUtils.containsSuperclass(to, from.getReturnType());
-		// we track a list of converters that may work
-		List<ConverterInfo<? super F, ? extends T>> converters = new ArrayList<>();
-		for (Class<T> type : to) { // REMIND try more converters? -> also change WrapperExpression (and maybe ExprLoopValue)
-			assert type != null;
-			// casting <? super ? extends F> to <? super F> is wrong, but since the converter is only used for values returned by the expression
-			// (which are instances of "<? extends F>") this won't result in any ClassCastExceptions.
-			for (Class<? extends F> checking : from.possibleReturnTypes()) {
-				//noinspection unchecked
-				ConverterInfo<? super F, ? extends T> converter = (ConverterInfo<? super F, ? extends T>) Converters.getConverterInfo(checking, type);
-				if (converter != null)
-					converters.add(converter);
+
+		// we might be able to cast some (or all) of the possible return types to T
+		// for possible return types that can't be directly cast, regular converters will be used
+		List<ConverterInfo<? extends F, ? extends T>> infos = new ArrayList<>();
+		for (Class<? extends F> type : from.possibleReturnTypes()) {
+			if (CollectionUtils.containsSuperclass(to, type)) { // this type is of T, build a converter simply casting
+				// noinspection unchecked - 'type' is a desired type in 'to'
+				Class<T> toType = (Class<T>) type;
+				infos.add(new ConverterInfo<>(type, toType, toType::cast, 0));
+			} else { // this possible return type is not included in 'to'
+				// build all converters for converting the possible return type into any of the types of 'to'
+				for (Class<T> toType : to) {
+					ConverterInfo<? extends F, T> converter = Converters.getConverterInfo(type, toType);
+					if (converter != null)
+						infos.add(converter);
+				}
 			}
-			int size = converters.size();
-			if (size == 1) // if there is only one info, there is no need to wrap it in a list
-				return new ConvertedExpression<>(from, type, converters.get(0));
-			if (size > 1)
-				return new ConvertedExpression<>(from, type, converters, true);
 		}
+		if (!infos.isEmpty()) { // there are converters for (at least some of) the return types
+			// a note: casting <? extends F> to <? super F> is wrong, but since the converter is used only for values
+			//         returned by the expression (which are instances of <? extends F>), this won't result in any CCEs
+			// noinspection rawtypes, unchecked
+			return new ConvertedExpression(from, Utils.getSuperType(infos.stream().map(ConverterInfo::getTo).toArray(Class[]::new)), infos, true);
+		}
+
 		return null;
 	}
 
@@ -146,20 +131,17 @@ public boolean isSingle() {
 	}
 
 	@Override
-	@Nullable
 	@SuppressWarnings("unchecked")
-	public <R> Expression<? extends R> getConvertedExpression(Class<R>... to) {
+	public <R> @Nullable Expression<? extends R> getConvertedExpression(Class<R>... to) {
 		if (CollectionUtils.containsSuperclass(to, this.to))
 			return (Expression<? extends R>) this;
 		return source.getConvertedExpression(to);
 	}
 
-	@Nullable
-	private ClassInfo<? super T> returnTypeInfo;
+	private @Nullable ClassInfo<? super T> returnTypeInfo;
 
 	@Override
-	@Nullable
-	public Class<?>[] acceptChange(ChangeMode mode) {
+	public Class<?> @Nullable [] acceptChange(ChangeMode mode) {
 		Class<?>[] validClasses = source.acceptChange(mode);
 		if (validClasses == null) {
 			ClassInfo<? super T> returnTypeInfo;
@@ -171,7 +153,7 @@ public Class<?>[] acceptChange(ChangeMode mode) {
 	}
 
 	@Override
-	public void change(Event event, @Nullable Object[] delta, ChangeMode mode) {
+	public void change(Event event, Object @Nullable [] delta, ChangeMode mode) {
 		ClassInfo<? super T> returnTypeInfo = this.returnTypeInfo;
 		if (returnTypeInfo != null) {
 			Changer<? super T> changer = returnTypeInfo.getChanger();
@@ -183,8 +165,7 @@ public void change(Event event, @Nullable Object[] delta, ChangeMode mode) {
 	}
 
 	@Override
-	@Nullable
-	public T getSingle(Event event) {
+	public @Nullable T getSingle(Event event) {
 		F value = source.getSingle(event);
 		if (value == null)
 			return null;
@@ -202,18 +183,18 @@ public T[] getAll(Event event) {
 	}
 
 	@Override
-	public boolean check(Event event, Checker<? super T> checker, boolean negated) {
+	public boolean check(Event event, Predicate<? super T> checker, boolean negated) {
 		return negated ^ check(event, checker);
 	}
 
 	@Override
-	public boolean check(Event event, Checker<? super T> checker) {
-		return source.check(event, (Checker<F>) value -> {
+	public boolean check(Event event, Predicate<? super T> checker) {
+		return source.check(event, (Predicate<F>) value -> {
 			T convertedValue = converter.convert(value);
 			if (convertedValue == null) {
 				return false;
 			}
-			return checker.check(convertedValue);
+			return checker.test(convertedValue);
 		});
 	}
 
@@ -243,14 +224,12 @@ public boolean isLoopOf(String input) {
 	}
 
 	@Override
-	@Nullable
-	public Iterator<T> iterator(Event event) {
+	public @Nullable Iterator<T> iterator(Event event) {
 		Iterator<? extends F> iterator = source.iterator(event);
 		if (iterator == null)
 			return null;
-		return new Iterator<T>() {
-			@Nullable
-			T next = null;
+		return new Iterator<>() {
+			@Nullable T next = null;
 
 			@Override
 			public boolean hasNext() {
@@ -295,8 +274,7 @@ public Expression<? extends T> simplify() {
 	}
 
 	@Override
-	@Nullable
-	public Object[] beforeChange(Expression<?> changed, @Nullable Object[] delta) {
+	public Object @Nullable [] beforeChange(Expression<?> changed, Object @Nullable [] delta) {
 		return source.beforeChange(changed, delta); // Forward to source
 		// TODO this is not entirely safe, even though probably works well enough
 	}
diff --git a/src/main/java/ch/njol/skript/lang/util/ConvertedLiteral.java b/src/main/java/ch/njol/skript/lang/util/ConvertedLiteral.java
index 45fbb1bf98b..d28effb9faf 100644
--- a/src/main/java/ch/njol/skript/lang/util/ConvertedLiteral.java
+++ b/src/main/java/ch/njol/skript/lang/util/ConvertedLiteral.java
@@ -1,27 +1,8 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.lang.util;
 
 import ch.njol.skript.SkriptAPIException;
 import ch.njol.skript.lang.Literal;
 import ch.njol.skript.registrations.Classes;
-import ch.njol.util.Checker;
 import ch.njol.util.coll.CollectionUtils;
 import ch.njol.util.coll.iterator.ArrayIterator;
 import org.bukkit.event.Event;
@@ -30,6 +11,7 @@
 import org.skriptlang.skript.lang.converter.Converters;
 
 import java.util.Iterator;
+import java.util.function.Predicate;
 
 /**
  * @see SimpleLiteral
@@ -46,9 +28,8 @@ public ConvertedLiteral(Literal<F> source, T[] data, Class<T> to) {
 	}
 
 	@Override
-	@Nullable
 	@SuppressWarnings("unchecked")
-	public <R> Literal<? extends R> getConvertedExpression(Class<R>... to) {
+	public <R> @Nullable Literal<? extends R> getConvertedExpression(Class<R>... to) {
 		if (CollectionUtils.containsSuperclass(to, this.to))
 			return (Literal<? extends R>) this;
 		return ((Literal<F>) source).getConvertedExpression(to);
@@ -87,18 +68,17 @@ public T getSingle(Event event) {
 	}
 
 	@Override
-	@Nullable
-	public Iterator<T> iterator(Event event) {
+	public @Nullable Iterator<T> iterator(Event event) {
 		return new ArrayIterator<>(data);
 	}
 
 	@Override
-	public boolean check(Event event, Checker<? super T> checker) {
+	public boolean check(Event event, Predicate<? super T> checker) {
 		return SimpleExpression.check(data, checker, false, getAnd());
 	}
 
 	@Override
-	public boolean check(Event event, Checker<? super T> checker, boolean negated) {
+	public boolean check(Event event, Predicate<? super T> checker, boolean negated) {
 		return SimpleExpression.check(data, checker, negated, getAnd());
 	}
 
diff --git a/src/main/java/ch/njol/skript/lang/util/SimpleEvent.java b/src/main/java/ch/njol/skript/lang/util/SimpleEvent.java
index 81ee117e39d..5f26638893f 100644
--- a/src/main/java/ch/njol/skript/lang/util/SimpleEvent.java
+++ b/src/main/java/ch/njol/skript/lang/util/SimpleEvent.java
@@ -1,30 +1,11 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.lang.util;
 
-import org.bukkit.event.Event;
-import org.jetbrains.annotations.Nullable;
-
 import ch.njol.skript.SkriptAPIException;
 import ch.njol.skript.lang.Literal;
 import ch.njol.skript.lang.SkriptEvent;
 import ch.njol.skript.lang.SkriptParser.ParseResult;
+import org.bukkit.event.Event;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * A very basic SkriptEvent which returns true for all events (i.e. all registered events).
diff --git a/src/main/java/ch/njol/skript/lang/util/SimpleExpression.java b/src/main/java/ch/njol/skript/lang/util/SimpleExpression.java
index c576cd8d774..556ffbde7ba 100644
--- a/src/main/java/ch/njol/skript/lang/util/SimpleExpression.java
+++ b/src/main/java/ch/njol/skript/lang/util/SimpleExpression.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.lang.util;
 
 import ch.njol.skript.Skript;
@@ -25,27 +7,27 @@
 import ch.njol.skript.classes.ClassInfo;
 import ch.njol.skript.lang.Expression;
 import ch.njol.skript.lang.ExpressionType;
+import ch.njol.skript.lang.Loopable;
 import ch.njol.skript.registrations.Classes;
 import ch.njol.skript.util.Utils;
-import ch.njol.util.Checker;
 import ch.njol.util.Kleenean;
 import ch.njol.util.coll.CollectionUtils;
 import ch.njol.util.coll.iterator.ArrayIterator;
+import com.google.common.collect.PeekingIterator;
 import org.bukkit.event.Event;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.skriptlang.skript.lang.converter.Converter;
-import org.skriptlang.skript.lang.converter.ConverterInfo;
 
 import java.lang.reflect.Array;
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Iterator;
 import java.util.List;
+import java.util.function.Predicate;
 
 /**
  * An implementation of the {@link Expression} interface. You should usually extend this class to make a new expression.
- * 
+ *
  * @see Skript#registerExpression(Class, Class, ExpressionType, String...)
  */
 public abstract class SimpleExpression<T> implements Expression<T> {
@@ -55,8 +37,7 @@ public abstract class SimpleExpression<T> implements Expression<T> {
 	protected SimpleExpression() {}
 
 	@Override
-	@Nullable
-	public final T getSingle(Event event) {
+	public final @Nullable T getSingle(Event event) {
 		T[] values = getArray(event);
 		if (values.length == 0)
 			return null;
@@ -66,10 +47,10 @@ public final T getSingle(Event event) {
 	}
 
 	@Override
-	@SuppressWarnings("unchecked")
 	public T[] getAll(Event event) {
 		T[] values = get(event);
 		if (values == null) {
+			//noinspection unchecked
 			T[] emptyArray = (T[]) Array.newInstance(getReturnType(), 0);
 			assert emptyArray != null;
 			return emptyArray;
@@ -82,6 +63,7 @@ public T[] getAll(Event event) {
 				numNonNull++;
 		if (numNonNull == values.length)
 			return Arrays.copyOf(values, values.length);
+		//noinspection unchecked
 		T[] valueArray = (T[]) Array.newInstance(getReturnType(), numNonNull);
 		assert valueArray != null;
 		int i = 0;
@@ -92,10 +74,10 @@ public T[] getAll(Event event) {
 	}
 
 	@Override
-	@SuppressWarnings("unchecked")
 	public final T[] getArray(Event event) {
 		T[] values = get(event);
 		if (values == null) {
+			//noinspection unchecked
 			return (T[]) Array.newInstance(getReturnType(), 0);
 		}
 		if (values.length == 0)
@@ -110,6 +92,7 @@ public final T[] getArray(Event event) {
 			if (values.length == 1 && values[0] != null)
 				return Arrays.copyOf(values, 1);
 			int rand = Utils.random(0, numNonNull);
+			//noinspection unchecked
 			T[] valueArray = (T[]) Array.newInstance(getReturnType(), 1);
 			for (T value : values) {
 				if (value != null) {
@@ -125,6 +108,7 @@ public final T[] getArray(Event event) {
 
 		if (numNonNull == values.length)
 			return Arrays.copyOf(values, values.length);
+		//noinspection unchecked
 		T[] valueArray = (T[]) Array.newInstance(getReturnType(), numNonNull);
 		int i = 0;
 		for (T value : values)
@@ -136,25 +120,24 @@ public final T[] getArray(Event event) {
 	/**
 	 * This is the internal method to get an expression's values.<br>
 	 * To get the expression's value from the outside use {@link #getSingle(Event)} or {@link #getArray(Event)}.
-	 * 
+	 *
 	 * @param event The event with which this expression is evaluated.
 	 * @return An array of values for this event. May not contain nulls.
 	 */
-	@Nullable
-	protected abstract T[] get(Event event);
+	protected abstract T @Nullable [] get(Event event);
 
 	@Override
-	public final boolean check(Event event, Checker<? super T> checker) {
+	public final boolean check(Event event, Predicate<? super T> checker) {
 		return check(event, checker, false);
 	}
 
 	@Override
-	public final boolean check(Event event, Checker<? super T> checker, boolean negated) {
+	public final boolean check(Event event, Predicate<? super T> checker, boolean negated) {
 		return check(get(event), checker, negated, getAnd());
 	}
 
 	// TODO return a kleenean (UNKNOWN if 'values' is null or empty)
-	public static <T> boolean check(@Nullable T[] values, Checker<? super T> checker, boolean invert, boolean and) {
+	public static <T> boolean check(T @Nullable [] values, Predicate<? super T> checker, boolean invert, boolean and) {
 		if (values == null)
 			return invert;
 		boolean hasElement = false;
@@ -162,7 +145,7 @@ public static <T> boolean check(@Nullable T[] values, Checker<? super T> checker
 			if (value == null)
 				continue;
 			hasElement = true;
-			boolean b = checker.check(value);
+			boolean b = checker.test(value);
 			if (and && !b)
 				return invert;
 			if (!and && b)
@@ -177,15 +160,14 @@ public static <T> boolean check(@Nullable T[] values, Checker<? super T> checker
 	 * Converts this expression to another type. Unless the expression is special, the default implementation is sufficient.
 	 * <p>
 	 * This method is never called with a supertype of the return type of this expression, or the return type itself.
-	 * 
+	 *
 	 * @param to The desired return type of the returned expression
 	 * @return Expression with the desired return type or null if it can't be converted to the given type
 	 * @see Expression#getConvertedExpression(Class...)
 	 * @see ConvertedExpression#newInstance(Expression, Class...)
 	 * @see Converter
 	 */
-	@Nullable
-	protected <R> ConvertedExpression<T, ? extends R> getConvertedExpr(Class<R>... to) {
+	protected <R> @Nullable ConvertedExpression<T, ? extends R> getConvertedExpr(Class<R>... to) {
 		assert !CollectionUtils.containsSuperclass(to, getReturnType());
 		return ConvertedExpression.newInstance(this, to);
 	}
@@ -200,48 +182,18 @@ public static <T> boolean check(@Nullable T[] values, Checker<? super T> checker
 	 * @return The converted expression
 	 */
 	@Override
-	@Nullable
 	@SuppressWarnings("unchecked")
-	public <R> Expression<? extends R> getConvertedExpression(Class<R>... to) {
+	public <R> @Nullable Expression<? extends R> getConvertedExpression(Class<R>... to) {
 		// check whether this expression is already of type R
 		if (CollectionUtils.containsSuperclass(to, getReturnType()))
 			return (Expression<? extends R>) this;
-
-		// we might be to cast some of the possible return types to R
-		List<ConverterInfo<? extends T, R>> infos = new ArrayList<>();
-		for (Class<? extends T> type : this.possibleReturnTypes()) {
-			if (CollectionUtils.containsSuperclass(to, type)) { // this type is of R
-				// build a converter that for casting to R
-				// safety check is present in the event that we do not get this type at runtime
-				final Class<R> toType = (Class<R>) type;
-				infos.add(new ConverterInfo<>(getReturnType(), toType, fromObject -> {
-					if (toType.isInstance(fromObject))
-						return (R) fromObject;
-					return null;
-				}, 0));
-			}
-		}
-		int size = infos.size();
-		if (size == 1) { // if there is only one info, there is no need to wrap it in a list
-			ConverterInfo<? extends T, R> info = infos.get(0);
-			//noinspection rawtypes
-			return new ConvertedExpression(this, info.getTo(), info);
-		}
-		if (size > 1) {
-			//noinspection rawtypes
-			return new ConvertedExpression(this, Utils.getSuperType(infos.stream().map(ConverterInfo::getTo).toArray(Class[]::new)), infos, false);
-		}
-
-		// attempt traditional conversion with proper converters
 		return this.getConvertedExpr(to);
 	}
 
-	@Nullable
-	private ClassInfo<?> returnTypeInfo;
+	private @Nullable ClassInfo<?> returnTypeInfo;
 
 	@Override
-	@Nullable
-	public Class<?>[] acceptChange(ChangeMode mode) {
+	public Class<?> @Nullable [] acceptChange(ChangeMode mode) {
 		ClassInfo<?> returnTypeInfo = this.returnTypeInfo;
 		if (returnTypeInfo == null)
 			this.returnTypeInfo = returnTypeInfo = Classes.getSuperClassInfo(getReturnType());
@@ -252,14 +204,14 @@ public Class<?>[] acceptChange(ChangeMode mode) {
 	}
 
 	@Override
-	@SuppressWarnings("unchecked")
-	public void change(Event event, @Nullable Object[] delta, ChangeMode mode) {
+	public void change(Event event, Object @Nullable [] delta, ChangeMode mode) {
 		ClassInfo<?> returnTypeInfo = this.returnTypeInfo;
 		if (returnTypeInfo == null)
 			throw new UnsupportedOperationException();
 		Changer<?> changer = returnTypeInfo.getChanger();
 		if (changer == null)
 			throw new UnsupportedOperationException();
+		//noinspection unchecked
 		((Changer<T>) changer).change(getArray(event), delta, mode);
 	}
 
@@ -267,7 +219,7 @@ public void change(Event event, @Nullable Object[] delta, ChangeMode mode) {
 	 * {@inheritDoc}
 	 * <p>
 	 * This implementation sets the time but returns false.
-	 * 
+	 *
 	 * @see #setTime(int, Class, Expression...)
 	 * @see #setTime(int, Expression, Class...)
 	 */
@@ -328,7 +280,7 @@ protected final boolean setTime(int time, Expression<?> mustbeDefaultVar, Class<
 		}
 		if (mustbeDefaultVar == null) {
 			Skript.exception(new SkriptAPIException("Default expression was null. If the default expression can be null, don't be using" +
-					" 'SimpleExpression#setTime(int, Expression<?>, Class<? extends Event>...)' instead use the setTime without an expression if null."));
+				" 'SimpleExpression#setTime(int, Expression<?>, Class<? extends Event>...)' instead use the setTime without an expression if null."));
 			return false;
 		}
 		if (!mustbeDefaultVar.isDefault())
@@ -355,9 +307,16 @@ public boolean isLoopOf(String input) {
 		return false;
 	}
 
+	/**
+	 * {@inheritDoc}
+	 * Overriding this method, returning an {@link Iterator}, ensure to override {@link Loopable#supportsLoopPeeking()}
+	 * Or returning an {@link PeekingIterator}, ensure to set up {@link PeekingIterator#peek()}
+	 *
+	 * @param event The event to be used for evaluation
+	 * @return {@link ArrayIterator}
+	 */
 	@Override
-	@Nullable
-	public Iterator<? extends T> iterator(Event event) {
+	public @Nullable Iterator<? extends T> iterator(Event event) {
 		return new ArrayIterator<>(getArray(event));
 	}
 
@@ -380,4 +339,9 @@ public Expression<? extends T> simplify() {
 	public boolean getAnd() {
 		return true;
 	}
+
+	@Override
+	public boolean supportsLoopPeeking() {
+		return true;
+	}
 }
diff --git a/src/main/java/ch/njol/skript/lang/util/SimpleLiteral.java b/src/main/java/ch/njol/skript/lang/util/SimpleLiteral.java
index e6c5fc9e854..fdb2235b34b 100644
--- a/src/main/java/ch/njol/skript/lang/util/SimpleLiteral.java
+++ b/src/main/java/ch/njol/skript/lang/util/SimpleLiteral.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.lang.util;
 
 import ch.njol.skript.classes.Changer;
@@ -29,7 +11,6 @@
 import ch.njol.skript.registrations.Classes;
 import ch.njol.skript.util.StringMode;
 import ch.njol.skript.util.Utils;
-import ch.njol.util.Checker;
 import ch.njol.util.Kleenean;
 import ch.njol.util.coll.CollectionUtils;
 import ch.njol.util.coll.iterator.NonNullIterator;
@@ -39,6 +20,7 @@
 
 import java.lang.reflect.Array;
 import java.util.Arrays;
+import java.util.function.Predicate;
 
 /**
  * Represents a literal, i.e. a static value like a number or a string.
@@ -52,8 +34,7 @@ public class SimpleLiteral<T> implements Literal<T>, DefaultExpression<T> {
 	private final boolean isDefault;
 	private final boolean and;
 
-	@Nullable
-	private UnparsedLiteral source = null;
+	private @Nullable UnparsedLiteral source = null;
 
 	protected transient T[] data;
 
@@ -136,9 +117,8 @@ public Class<T> getReturnType() {
 	}
 
 	@Override
-	@Nullable
 	@SuppressWarnings("unchecked")
-	public <R> Literal<? extends R> getConvertedExpression(Class<R>... to) {
+	public <R> @Nullable Literal<? extends R> getConvertedExpression(Class<R>... to) {
 		if (CollectionUtils.containsSuperclass(to, type))
 			return (Literal<? extends R>) this;
 		R[] parsedData = Converters.convert(this.data(), to, (Class<R>) Utils.getSuperType(to));
@@ -170,12 +150,12 @@ public boolean isDefault() {
 	}
 
 	@Override
-	public boolean check(Event event, Checker<? super T> checker, boolean negated) {
+	public boolean check(Event event, Predicate<? super T> checker, boolean negated) {
 		return SimpleExpression.check(data, checker, negated, getAnd());
 	}
 
 	@Override
-	public boolean check(Event event, Checker<? super T> checker) {
+	public boolean check(Event event, Predicate<? super T> checker) {
 		return SimpleExpression.check(data, checker, false, getAnd());
 	}
 
@@ -183,8 +163,7 @@ public boolean check(Event event, Checker<? super T> checker) {
 	private ClassInfo<? super T> returnTypeInfo;
 
 	@Override
-	@Nullable
-	public Class<?>[] acceptChange(ChangeMode mode) {
+	public Class<?> @Nullable [] acceptChange(ChangeMode mode) {
 		ClassInfo<? super T> returnTypeInfo = this.returnTypeInfo;
 		if (returnTypeInfo == null)
 			this.returnTypeInfo = returnTypeInfo = Classes.getSuperClassInfo(getReturnType());
@@ -193,7 +172,7 @@ public Class<?>[] acceptChange(ChangeMode mode) {
 	}
 
 	@Override
-	public void change(final Event event, final @Nullable Object[] delta, final ChangeMode mode) throws UnsupportedOperationException {
+	public void change(final Event event, final Object @Nullable [] delta, final ChangeMode mode) throws UnsupportedOperationException {
 		final ClassInfo<? super T> returnTypeInfo = this.returnTypeInfo;
 		if (returnTypeInfo == null)
 			throw new UnsupportedOperationException();
diff --git a/src/main/java/ch/njol/skript/lang/util/common/AnyAmount.java b/src/main/java/ch/njol/skript/lang/util/common/AnyAmount.java
new file mode 100644
index 00000000000..9232f45826e
--- /dev/null
+++ b/src/main/java/ch/njol/skript/lang/util/common/AnyAmount.java
@@ -0,0 +1,49 @@
+package ch.njol.skript.lang.util.common;
+
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * A provider for anything with a (number) amount/size.
+ * Anything implementing this (or convertible to this) can be used by the {@link ch.njol.skript.expressions.ExprAmount}
+ * property expression.
+ *
+ * @see AnyProvider
+ */
+@FunctionalInterface
+public interface AnyAmount extends AnyProvider {
+
+	/**
+	 * @return This thing's amount/size
+	 */
+	@NotNull Number amount();
+
+	/**
+	 * This is called before {@link #setAmount(Number)}.
+	 * If the result is false, setting the name will never be attempted.
+	 *
+	 * @return Whether this supports being set
+	 */
+	default boolean supportsAmountChange() {
+		return false;
+	}
+
+	/**
+	 * The behaviour for changing this thing's name, if possible.
+	 * If not possible, then {@link #supportsAmountChange()} should return false and this
+	 * may throw an error.
+	 *
+	 * @param amount The name to change
+	 * @throws UnsupportedOperationException If this is impossible
+	 */
+	default void setAmount(Number amount) throws UnsupportedOperationException {
+		throw new UnsupportedOperationException();
+	}
+
+	/**
+	 * @return Whether the amount of this is zero, i.e. empty
+	 */
+	default boolean isEmpty() {
+		return this.amount().intValue() == 0;
+	}
+
+}
diff --git a/src/main/java/ch/njol/skript/lang/util/common/AnyContains.java b/src/main/java/ch/njol/skript/lang/util/common/AnyContains.java
new file mode 100644
index 00000000000..c56472e9b55
--- /dev/null
+++ b/src/main/java/ch/njol/skript/lang/util/common/AnyContains.java
@@ -0,0 +1,48 @@
+package ch.njol.skript.lang.util.common;
+
+import org.jetbrains.annotations.ApiStatus;
+import org.jetbrains.annotations.UnknownNullability;
+
+/**
+ * A provider for anything that contains other things.
+ * Anything implementing this (or convertible to this) can be used by the {@link ch.njol.skript.conditions.CondContains}
+ * conditions.
+ *
+ * @see AnyProvider
+ */
+@FunctionalInterface
+public interface AnyContains<Type> extends AnyProvider {
+
+	/**
+	 * If {@link #isSafeToCheck(Object)} returns false, values will not be passed to this
+	 * method and will instead return false.
+	 * <br/>
+	 * The null-ness of the parameter depends on whether {@link #isSafeToCheck(Object)} permits null values.
+	 *
+	 * @param value The value to test
+	 * @return Whether this contains {@code value}
+	 */
+	boolean contains(@UnknownNullability Type value);
+
+	/**
+	 * Objects are checked versus this before being cast for {@link #contains(Object)}.
+	 * If your contains method doesn't accept all objects (e.g. for a {@link java.util.List#contains(Object)} call)
+	 * then it can exclude unwanted types (or null values) here.
+	 *
+	 * @param value The value to check
+	 * @return Whether the value is safe to call {@link #contains(Object)} with
+	 */
+	default boolean isSafeToCheck(Object value) {
+		return true;
+	}
+
+	/**
+	 * The internal method used to verify an object and then check its container.
+	 */
+	@ApiStatus.Internal
+	default boolean checkSafely(Object value) {
+		//noinspection unchecked
+		return this.isSafeToCheck(value) && this.contains((Type) value);
+	}
+
+}
diff --git a/src/main/java/ch/njol/skript/lang/util/common/AnyNamed.java b/src/main/java/ch/njol/skript/lang/util/common/AnyNamed.java
new file mode 100644
index 00000000000..4da763d229d
--- /dev/null
+++ b/src/main/java/ch/njol/skript/lang/util/common/AnyNamed.java
@@ -0,0 +1,42 @@
+package ch.njol.skript.lang.util.common;
+
+import org.jetbrains.annotations.UnknownNullability;
+
+/**
+ * A provider for anything with a (text) name.
+ * Anything implementing this (or convertible to this) can be used by the {@link ch.njol.skript.expressions.ExprName}
+ * property expression.
+ *
+ * @see AnyProvider
+ */
+@FunctionalInterface
+public interface AnyNamed extends AnyProvider {
+
+	/**
+	 * @return This thing's name
+	 */
+	@UnknownNullability String name();
+
+	/**
+	 * This is called before {@link #setName(String)}.
+	 * If the result is false, setting the name will never be attempted.
+	 *
+	 * @return Whether this supports being set
+	 */
+	default boolean supportsNameChange() {
+		return false;
+	}
+
+	/**
+	 * The behaviour for changing this thing's name, if possible.
+	 * If not possible, then {@link #supportsNameChange()} should return false and this
+	 * may throw an error.
+	 *
+	 * @param name The name to change
+	 * @throws UnsupportedOperationException If this is impossible
+	 */
+	default void setName(String name) throws UnsupportedOperationException {
+		throw new UnsupportedOperationException();
+	}
+
+}
diff --git a/src/main/java/ch/njol/skript/lang/util/common/AnyProvider.java b/src/main/java/ch/njol/skript/lang/util/common/AnyProvider.java
new file mode 100644
index 00000000000..110a96ce810
--- /dev/null
+++ b/src/main/java/ch/njol/skript/lang/util/common/AnyProvider.java
@@ -0,0 +1,28 @@
+package ch.njol.skript.lang.util.common;
+
+/**
+ * 'AnyProvider' types are holders for common properties (e.g. name, size) where
+ * it is highly likely that things other than Skript may wish to register
+ * exponents of the property.
+ * <br/>
+ * <br/>
+ * If possible, types should implement an {@link AnyProvider} subtype directly for
+ * the best possible parsing efficiency.
+ * However, implementing the interface may not be possible if:
+ * <ul>
+ *     <li>registering an existing class from a third-party library</li>
+ *     <li>the subtype getter method conflicts with the type's own methods
+ *     or erasure</li>
+ *     <li>the presence of the supertype might confuse the class's design</li>
+ * </ul>
+ * In these cases, a converter from the class to the AnyX type can be registered.
+ * The converter should not permit right-chaining or unsafe casts.
+ * <br/>
+ * <br/>
+ * The root provider supertype cannot include its own common methods, since these
+ * may conflict between things that provide two values (e.g. something declaring
+ * both a name and a size)
+ */
+public interface AnyProvider {
+
+}
diff --git a/src/main/java/ch/njol/skript/lang/util/common/AnyValued.java b/src/main/java/ch/njol/skript/lang/util/common/AnyValued.java
new file mode 100644
index 00000000000..93c36715c19
--- /dev/null
+++ b/src/main/java/ch/njol/skript/lang/util/common/AnyValued.java
@@ -0,0 +1,110 @@
+package ch.njol.skript.lang.util.common;
+
+import ch.njol.skript.classes.ClassInfo;
+import ch.njol.skript.lang.ParseContext;
+import ch.njol.skript.registrations.Classes;
+import ch.njol.skript.util.StringMode;
+import com.sun.jdi.request.StepRequest;
+import org.jetbrains.annotations.UnknownNullability;
+import org.skriptlang.skript.lang.converter.Converters;
+
+/**
+ * A provider for anything with a value.
+ * Anything implementing this (or convertible to this) can be used by the {@link ch.njol.skript.expressions.ExprValue}
+ * property expression.
+ *
+ * @see AnyProvider
+ */
+public interface AnyValued<Type> extends AnyProvider {
+
+	/**
+	 * @return This thing's value
+	 */
+	@UnknownNullability
+	Type value();
+
+	default <Converted> Converted convertedValue(ClassInfo<Converted> expected) {
+		Type value = value();
+		if (value == null)
+			return null;
+		if (expected.getC().isInstance(value))
+			return expected.getC().cast(value);
+
+		// For strings, it is probably better to use toString/Parser in either
+		// direction, instead of a converter
+
+		if (expected.getC() == String.class)
+			//noinspection unchecked
+			return (Converted) Classes.toString(value, StringMode.MESSAGE);
+		if (value instanceof String string
+			&& expected.getParser() != null
+			&& expected.getParser().canParse(ParseContext.CONFIG)) {
+			return expected.getParser().parse(string, ParseContext.CONFIG);
+		}
+
+		return Converters.convert(value, expected.getC());
+	}
+
+	/**
+	 * This is called before {@link #changeValue(Object)}.
+	 * If the result is false, setting the value will never be attempted.
+	 *
+	 * @return Whether this supports being set
+	 */
+	default boolean supportsValueChange() {
+		return false;
+	}
+
+	/**
+	 * The behaviour for changing this thing's value, if possible.
+	 * If not possible, then {@link #supportsValueChange()} should return false and this
+	 * may throw an error.
+	 *
+	 * @param value The new value
+	 * @throws UnsupportedOperationException If this is impossible
+	 */
+	default void changeValue(Type value) throws UnsupportedOperationException {
+		throw new UnsupportedOperationException();
+	}
+
+	/**
+	 *
+	 * @return The type of values this accepts (or provides)
+	 */
+	Class<Type> valueType();
+
+	/**
+	 * A default implementation of 'resetting' the value (setting it to null).
+	 * Implementations should override this if different behaviour is required.
+	 *
+	 * @throws UnsupportedOperationException If changing is not supported
+	 */
+	default void resetValue() throws UnsupportedOperationException {
+		this.changeValueSafely(null);
+	}
+
+	/**
+	 * This method can be overridden to filter out bad values (e.g. null, objects of the wrong type, etc.)
+	 * and make sure {@link #changeValue(Object)} is not called with a bad parameter.
+	 *
+	 * @param value The (unchecked) new value
+	 */
+	default void changeValueSafely(Object value) throws UnsupportedOperationException {
+		Class<Type> typeClass = this.valueType();
+		ClassInfo<? super Type> classInfo = Classes.getSuperClassInfo(typeClass);
+		if (value == null) {
+			this.changeValue(null);
+		} else if (typeClass == String.class) {
+			this.changeValue(typeClass.cast(Classes.toString(value, StringMode.MESSAGE)));
+		} else if (value instanceof String string
+			&& classInfo.getParser() != null
+			&& classInfo.getParser().canParse(ParseContext.CONFIG)) {
+			Type convert = (Type) classInfo.getParser().parse(string, ParseContext.CONFIG);
+			this.changeValue(convert);
+		} else {
+			Type convert = Converters.convert(value, typeClass);
+			this.changeValue(convert);
+		}
+	}
+
+}
diff --git a/src/main/java/ch/njol/skript/localization/Adjective.java b/src/main/java/ch/njol/skript/localization/Adjective.java
index 71e54804548..bbae6c443ec 100644
--- a/src/main/java/ch/njol/skript/localization/Adjective.java
+++ b/src/main/java/ch/njol/skript/localization/Adjective.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.localization;
 
 import java.util.HashMap;
@@ -75,9 +57,7 @@ protected void onValueChange() {
 	@Override
 	public String toString() {
 		validate();
-		if (Skript.testing())
-			Skript.warning("Invalid use of Adjective.toString()");
-		return "" + def;
+		return def;
 	}
 	
 	public String toString(int gender, int flags) {
diff --git a/src/main/java/ch/njol/skript/localization/ArgsMessage.java b/src/main/java/ch/njol/skript/localization/ArgsMessage.java
index 786cf135fce..21e4f739281 100644
--- a/src/main/java/ch/njol/skript/localization/ArgsMessage.java
+++ b/src/main/java/ch/njol/skript/localization/ArgsMessage.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.localization;
 
 import java.util.IllegalFormatException;
diff --git a/src/main/java/ch/njol/skript/localization/FormattedMessage.java b/src/main/java/ch/njol/skript/localization/FormattedMessage.java
index 601cd5ff9aa..f9cb2c88251 100644
--- a/src/main/java/ch/njol/skript/localization/FormattedMessage.java
+++ b/src/main/java/ch/njol/skript/localization/FormattedMessage.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.localization;
 
 import java.util.IllegalFormatException;
diff --git a/src/main/java/ch/njol/skript/localization/GeneralWords.java b/src/main/java/ch/njol/skript/localization/GeneralWords.java
index 219a91b756b..f4d7679f229 100644
--- a/src/main/java/ch/njol/skript/localization/GeneralWords.java
+++ b/src/main/java/ch/njol/skript/localization/GeneralWords.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.localization;
 
 /**
diff --git a/src/main/java/ch/njol/skript/localization/Language.java b/src/main/java/ch/njol/skript/localization/Language.java
index d6fdf217b7a..aa61d532ea5 100644
--- a/src/main/java/ch/njol/skript/localization/Language.java
+++ b/src/main/java/ch/njol/skript/localization/Language.java
@@ -1,29 +1,12 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.localization;
 
 import ch.njol.skript.Skript;
-import ch.njol.skript.SkriptAddon;
 import ch.njol.skript.config.Config;
 import ch.njol.skript.util.ExceptionUtils;
 import ch.njol.skript.util.FileUtils;
 import ch.njol.skript.util.Version;
+import org.skriptlang.skript.addon.SkriptAddon;
+import org.skriptlang.skript.localization.Localizer;
 import org.bukkit.plugin.Plugin;
 import org.jetbrains.annotations.Nullable;
 
@@ -43,17 +26,17 @@
  * @author Peter Güttinger
  */
 public class Language {
-	
+
 	/**
 	 * Some flags
 	 */
 	public static final int F_PLURAL = 1, F_DEFINITE_ARTICLE = 2, F_INDEFINITE_ARTICLE = 4;
-	
+
 	/**
 	 * masks out article flags - useful if the article has been added already (e.g. by an adjective)
 	 */
 	public static final int NO_ARTICLE_MASK = ~(F_DEFINITE_ARTICLE | F_INDEFINITE_ARTICLE);
-	
+
 	/**
 	 * Name of the localised language
 	 */
@@ -64,12 +47,12 @@ public class Language {
 	@Nullable
 	private static HashMap<String, String> localizedLanguage = null;
 	
-	private static final HashMap<Plugin, Version> langVersion = new HashMap<>();
+	private static final HashMap<String, Version> langVersion = new HashMap<>();
 	
 	public static String getName() {
 		return name;
 	}
-	
+
 	@Nullable
 	private static String get_i(String key) {
 		String value;
@@ -85,11 +68,11 @@ private static String get_i(String key) {
 			missingEntryError(key);
 		return null;
 	}
-	
+
 	/**
 	 * Gets a string from the language file with the given key, or the key itself if the key does
 	 * not exist.
-	 * 
+	 *
 	 * @param key The message's key (case-insensitive)
 	 * @return The requested message if it exists or the key otherwise
 	 */
@@ -97,10 +80,10 @@ public static String get(String key) {
 		String s = get_i("" + key.toLowerCase(Locale.ENGLISH));
 		return s == null ? "" + key.toLowerCase(Locale.ENGLISH) : s;
 	}
-	
+
 	/**
 	 * Equal to {@link #get(String)}, but returns null instead of the key if the key cannot be found.
-	 * 
+	 *
 	 * @param key The message's key (case-insensitive)
 	 * @return The requested message or null if it doesn't exist
 	 */
@@ -108,11 +91,11 @@ public static String get(String key) {
 	public static String get_(String key) {
 		return get_i("" + key.toLowerCase(Locale.ENGLISH));
 	}
-	
+
 	public static void missingEntryError(String key) {
 		Skript.error("Missing entry '" + key.toLowerCase(Locale.ENGLISH) + "' in the default/english language file");
 	}
-	
+
 	/**
 	 * Gets a string and uses it as format in {@link String#format(String, Object...)}.
 	 *
@@ -131,7 +114,7 @@ public static String format(String key, Object... args) {
 			return key;
 		}
 	}
-	
+
 	/**
 	 * Gets a localized string surrounded by spaces, or a space if the string is empty
 	 *
@@ -143,10 +126,10 @@ public static String getSpaced(String key) {
 			return " ";
 		return " " + s + " ";
 	}
-	
+
 	@SuppressWarnings("null")
 	private static final Pattern listSplitPattern = Pattern.compile("\\s*,\\s*");
-	
+
 	/**
 	 * Gets a list of strings.
 	 *
@@ -160,7 +143,7 @@ public static String[] getList(String key) {
 		assert r != null;
 		return r;
 	}
-	
+
 	/**
 	 * @return Whether the given key exists in any loaded language file.
 	 */
@@ -183,46 +166,80 @@ public static boolean isInitialized() {
 		return !defaultLanguage.isEmpty();
 	}
 
+	@Nullable
+	private static String getSanitizedLanguageDirectory(SkriptAddon addon) {
+		Localizer localizer = addon.localizer();
+		if (localizer == null) {
+			return null;
+		}
+		String languageFileDirectory = localizer.languageFileDirectory();
+		if (languageFileDirectory == null) {
+			return null;
+		}
+		// sanitization
+		languageFileDirectory = languageFileDirectory.replace('\\', '/');
+		if (languageFileDirectory.startsWith("/")) {
+			languageFileDirectory = languageFileDirectory.substring(1);
+		}
+		if (languageFileDirectory.endsWith("/")) {
+			languageFileDirectory = languageFileDirectory.substring(0, languageFileDirectory.length() - 1);
+		}
+		return languageFileDirectory;
+	}
+
 	public static void loadDefault(SkriptAddon addon) {
-		if (addon.getLanguageFileDirectory() == null)
+		String languageFileDirectory = getSanitizedLanguageDirectory(addon);
+		if (languageFileDirectory == null) {
 			return;
+		}
 
-		InputStream defaultIs = addon.plugin.getResource(addon.getLanguageFileDirectory() +  "/default.lang");
-		InputStream englishIs = addon.plugin.getResource(addon.getLanguageFileDirectory() + "/english.lang");
+		Class<?> source = addon.source();
+		assert source != null; // getSanitizedLanguageDirectory call means source should not be null
+		try (
+			InputStream defaultIs = source.getResourceAsStream("/" + languageFileDirectory + "/default.lang");
+			InputStream englishIs = source.getResourceAsStream("/" + languageFileDirectory + "/english.lang")
+		) {
 
-		if (defaultIs == null) {
-			if (englishIs == null) {
-				throw new IllegalStateException(addon + " is missing the required default.lang file!");
-			} else {
-				defaultIs = englishIs;
-				englishIs = null;
+			InputStream defaultLangIs = defaultIs;
+			InputStream englishLangIs = englishIs;
+			if (defaultLangIs == null) {
+				if (englishLangIs == null) {
+					throw new IllegalStateException(addon + " is missing the required default.lang file!");
+				} else {
+					defaultLangIs = englishLangIs;
+					englishLangIs = null;
+				}
 			}
-		}
-		HashMap<String, String> def = load(defaultIs, "default", false);
-		HashMap<String, String> en = load(englishIs, "english", addon == Skript.getAddonInstance());
 
-		String v = def.get("version");
-		if (v == null)
-			Skript.warning("Missing version in default.lang");
+			Map<String, String> def = load(defaultLangIs, "default", false);
+			Map<String, String> en = load(englishLangIs, "english", addon instanceof org.skriptlang.skript.Skript);
 
-		langVersion.put(addon.plugin, v == null ? Skript.getVersion() : new Version(v));
-		def.remove("version");
-		defaultLanguage.putAll(def);
+			String v = def.get("version");
+			if (v == null)
+				Skript.warning("Missing version in default.lang");
 
-		if (localizedLanguage == null)
-			localizedLanguage = new HashMap<>();
-		localizedLanguage.putAll(en);
+			langVersion.put(addon.name(), v == null ? Skript.getVersion() : new Version(v));
+			def.remove("version");
+			defaultLanguage.putAll(def);
 
-		for (LanguageChangeListener l : listeners)
-			l.onLanguageChange();
+			if (localizedLanguage == null)
+				localizedLanguage = new HashMap<>();
+			localizedLanguage.putAll(en);
+
+			for (LanguageChangeListener l : listeners)
+				l.onLanguageChange();
+
+		} catch (IOException e) {
+			throw new RuntimeException(e);
+		}
 	}
-	
+
 	public static boolean load(String name) {
-		name = "" + name.toLowerCase(Locale.ENGLISH);
+		name = name.toLowerCase(Locale.ENGLISH);
 
 		localizedLanguage = new HashMap<>();
-		boolean exists = load(Skript.getAddonInstance(), name, true);
-		for (SkriptAddon addon : Skript.getAddons()) {
+		boolean exists = load(Skript.instance(), name, true);
+		for (SkriptAddon addon : Skript.instance().addons()) {
 			exists |= load(addon, name, false);
 		}
 		if (!exists) {
@@ -241,22 +258,44 @@ public static boolean load(String name) {
 
 		return true;
 	}
-	
+
 	private static boolean load(SkriptAddon addon, String name, boolean tryUpdate) {
-		if (addon.getLanguageFileDirectory() == null)
+		String languageFileDirectory = getSanitizedLanguageDirectory(addon);
+		if (languageFileDirectory == null) {
 			return false;
+		}
+
+		Class<?> source = addon.source();
+
 		// Backwards addon compatibility
-		if (name.equals("english") && addon.plugin.getResource(addon.getLanguageFileDirectory() + "/default.lang") == null)
-			return true;
+		if (name.equals("english")) {
+			try (InputStream is = source.getResourceAsStream("/" + languageFileDirectory + "/default.lang")) {
+				if (is == null) {
+					return true;
+				}
+			} catch (IOException e) {
+				throw new RuntimeException(e);
+			}
+		}
 
-		HashMap<String, String> l = load(addon.plugin.getResource(addon.getLanguageFileDirectory() + "/" + name + ".lang"), name, tryUpdate);
-		File file = new File(addon.plugin.getDataFolder(), addon.getLanguageFileDirectory() + File.separator + name + ".lang");
-		try {
-			if (file.exists())
-				l.putAll(load(new FileInputStream(file), name, tryUpdate));
-		} catch (FileNotFoundException e) {
-			assert false;
+		Map<String, String> l;
+		try (InputStream is = source.getResourceAsStream("/" + languageFileDirectory + "/" + name + ".lang")) {
+			l = load(is, name, tryUpdate);
+		} catch (IOException e) {
+			throw new RuntimeException(e);
 		}
+
+		String dataFileDirectory = addon.localizer().dataFileDirectory();
+		if (dataFileDirectory != null) { // attempt to load language files from disk
+			File file = new File(dataFileDirectory, File.separator + name + ".lang");
+			try {
+				if (file.exists())
+					l.putAll(load(new FileInputStream(file), name, tryUpdate));
+			} catch (FileNotFoundException e) {
+				assert false;
+			}
+		}
+
 		if (l.isEmpty())
 			return false;
 		if (!l.containsKey("version")) {
@@ -264,7 +303,7 @@ private static boolean load(SkriptAddon addon, String name, boolean tryUpdate) {
 		} else {
 			try {
 				Version v = new Version("" + l.get("version"));
-				Version lv = langVersion.get(addon.plugin);
+				Version lv = langVersion.get(addon.name());
 				assert lv != null; // set in loadDefault()
 				if (v.isSmallerThan(lv))
 					Skript.warning(addon + "'s language file " + name + ".lang is outdated, some messages will be english.");
@@ -290,14 +329,14 @@ private static boolean load(SkriptAddon addon, String name, boolean tryUpdate) {
 		return true;
 	}
 	
-	private static HashMap<String, String> load(@Nullable InputStream in, String name, boolean tryUpdate) {
+	private static Map<String, String> load(@Nullable InputStream in, String name, boolean tryUpdate) {
 		if (in == null)
 			return new HashMap<>();
 
 		try {
 			Config langConfig = new Config(in, name + ".lang", false, false, ":");
 
-			String langVersion = langConfig.get("version");
+			String langVersion = langConfig.getValue("version");
 			if (tryUpdate && (langVersion == null || Skript.getVersion().compareTo(new Version(langVersion)) != 0)) {
 				String langFileName = "lang/" + name + ".lang";
 
@@ -335,22 +374,22 @@ private static HashMap<String, String> load(@Nullable InputStream in, String nam
 	}
 
 	private static final List<LanguageChangeListener> listeners = new ArrayList<>();
-	
+
 	public enum LanguageListenerPriority {
 		EARLIEST, NORMAL, LATEST
 	}
-	
+
 	private static final int[] priorityStartIndices = new int[LanguageListenerPriority.values().length];
-	
+
 	/**
 	 * Registers a listener. The listener will immediately be called if a language has already been loaded.
-	 * 
+	 *
 	 * @param listener the listener to register
 	 */
 	public static void addListener(LanguageChangeListener listener) {
 		addListener(listener, LanguageListenerPriority.NORMAL);
 	}
-	
+
 	public static void addListener(LanguageChangeListener listener, LanguageListenerPriority priority) {
 		listeners.add(priorityStartIndices[priority.ordinal()], listener);
 		for (int i = priority.ordinal() + 1; i < LanguageListenerPriority.values().length; i++)
diff --git a/src/main/java/ch/njol/skript/localization/LanguageChangeListener.java b/src/main/java/ch/njol/skript/localization/LanguageChangeListener.java
index ed9e60ee19c..5dcb854eeef 100644
--- a/src/main/java/ch/njol/skript/localization/LanguageChangeListener.java
+++ b/src/main/java/ch/njol/skript/localization/LanguageChangeListener.java
@@ -1,23 +1,6 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.localization;
 
+@FunctionalInterface
 public interface LanguageChangeListener {
 
 	void onLanguageChange();
diff --git a/src/main/java/ch/njol/skript/localization/Message.java b/src/main/java/ch/njol/skript/localization/Message.java
index fe157ba41a5..486ae7033d0 100644
--- a/src/main/java/ch/njol/skript/localization/Message.java
+++ b/src/main/java/ch/njol/skript/localization/Message.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.localization;
 
 import java.util.ArrayList;
diff --git a/src/main/java/ch/njol/skript/localization/Noun.java b/src/main/java/ch/njol/skript/localization/Noun.java
index 7dc4f22ce2b..40b74f289f3 100644
--- a/src/main/java/ch/njol/skript/localization/Noun.java
+++ b/src/main/java/ch/njol/skript/localization/Noun.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.localization;
 
 import ch.njol.skript.Skript;
diff --git a/src/main/java/ch/njol/skript/localization/PluralizingArgsMessage.java b/src/main/java/ch/njol/skript/localization/PluralizingArgsMessage.java
index 7e745b31054..a4bdf7c446d 100644
--- a/src/main/java/ch/njol/skript/localization/PluralizingArgsMessage.java
+++ b/src/main/java/ch/njol/skript/localization/PluralizingArgsMessage.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.localization;
 
 import ch.njol.util.StringUtils;
diff --git a/src/main/java/ch/njol/skript/localization/RegexMessage.java b/src/main/java/ch/njol/skript/localization/RegexMessage.java
index 2f685eab1b4..956de4b2eb1 100644
--- a/src/main/java/ch/njol/skript/localization/RegexMessage.java
+++ b/src/main/java/ch/njol/skript/localization/RegexMessage.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.localization;
 
 import java.util.regex.Matcher;
diff --git a/src/main/java/ch/njol/skript/log/BlockingLogHandler.java b/src/main/java/ch/njol/skript/log/BlockingLogHandler.java
index 2e93b8e3a4d..9ace55dfa4c 100644
--- a/src/main/java/ch/njol/skript/log/BlockingLogHandler.java
+++ b/src/main/java/ch/njol/skript/log/BlockingLogHandler.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.log;
 
 /**
diff --git a/src/main/java/ch/njol/skript/log/BukkitLoggerFilter.java b/src/main/java/ch/njol/skript/log/BukkitLoggerFilter.java
index 434a60f4149..03c10c9ec94 100644
--- a/src/main/java/ch/njol/skript/log/BukkitLoggerFilter.java
+++ b/src/main/java/ch/njol/skript/log/BukkitLoggerFilter.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.log;
 
 import java.util.logging.Filter;
diff --git a/src/main/java/ch/njol/skript/log/CountingLogHandler.java b/src/main/java/ch/njol/skript/log/CountingLogHandler.java
index 3e70cb365ee..b1e785c25aa 100644
--- a/src/main/java/ch/njol/skript/log/CountingLogHandler.java
+++ b/src/main/java/ch/njol/skript/log/CountingLogHandler.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.log;
 
 import java.util.logging.Level;
@@ -34,7 +16,7 @@ public class CountingLogHandler extends LogHandler {
 	public CountingLogHandler(Level minimum) {
 		this.minimum = minimum.intValue();
 	}
-	
+
 	@Override
 	public LogResult log(LogEntry entry) {
 		if (entry.level.intValue() >= minimum)
diff --git a/src/main/java/ch/njol/skript/log/ErrorDescLogHandler.java b/src/main/java/ch/njol/skript/log/ErrorDescLogHandler.java
index 40659deb816..f7f0b4d98af 100644
--- a/src/main/java/ch/njol/skript/log/ErrorDescLogHandler.java
+++ b/src/main/java/ch/njol/skript/log/ErrorDescLogHandler.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.log;
 
 import java.util.logging.Level;
diff --git a/src/main/java/ch/njol/skript/log/ErrorQuality.java b/src/main/java/ch/njol/skript/log/ErrorQuality.java
index e781b90c740..1232f1a2412 100644
--- a/src/main/java/ch/njol/skript/log/ErrorQuality.java
+++ b/src/main/java/ch/njol/skript/log/ErrorQuality.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.log;
 
 /**
diff --git a/src/main/java/ch/njol/skript/log/FilteringLogHandler.java b/src/main/java/ch/njol/skript/log/FilteringLogHandler.java
index 46c95b202c9..81c81c434bd 100644
--- a/src/main/java/ch/njol/skript/log/FilteringLogHandler.java
+++ b/src/main/java/ch/njol/skript/log/FilteringLogHandler.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.log;
 
 import java.util.logging.Level;
diff --git a/src/main/java/ch/njol/skript/log/HandlerList.java b/src/main/java/ch/njol/skript/log/HandlerList.java
index 8da16744523..a67de8c16b7 100644
--- a/src/main/java/ch/njol/skript/log/HandlerList.java
+++ b/src/main/java/ch/njol/skript/log/HandlerList.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.log;
 
 import java.util.Iterator;
diff --git a/src/main/java/ch/njol/skript/log/LogEntry.java b/src/main/java/ch/njol/skript/log/LogEntry.java
index 80c48f1b4ad..0fc0bbc78b9 100644
--- a/src/main/java/ch/njol/skript/log/LogEntry.java
+++ b/src/main/java/ch/njol/skript/log/LogEntry.java
@@ -1,34 +1,14 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.log;
 
-import java.util.logging.Level;
-
+import ch.njol.skript.Skript;
+import ch.njol.skript.config.Config;
+import ch.njol.skript.config.Node;
 import ch.njol.skript.localization.ArgsMessage;
 import ch.njol.skript.util.Utils;
-
 import org.bukkit.ChatColor;
 import org.jetbrains.annotations.Nullable;
 
-import ch.njol.skript.Skript;
-import ch.njol.skript.config.Config;
-import ch.njol.skript.config.Node;
+import java.util.logging.Level;
 
 public class LogEntry {
 
@@ -127,11 +107,6 @@ void logged() {
 			SkriptLogger.LOGGER.warning(" # LogEntry '" + message + "'" + from + " logged" + findCaller());
 	}
 
-	@Override
-	protected void finalize() {
-		assert used : message + from;
-	}
-
 	@Override
 	public String toString() {
 		if (node == null || level.intValue() < Level.WARNING.intValue())
@@ -171,7 +146,7 @@ public String toFormattedString() {
 			from = ChatColor.GRAY + "   " + from + "\n";
 
 		return
-			String.format(lineInfoMsg, String.valueOf(node.getLine()), c.getFileName()) + // String.valueOf is to convert the line number (int) to a String
+			String.format(lineInfoMsg, node.getLine(), c.getFileName()) +
 			String.format(detailsMsg, message.replaceAll("§", "&")) + from +
 			String.format(lineDetailsMsg, node.save().trim().replaceAll("§", "&"));
 	}
diff --git a/src/main/java/ch/njol/skript/log/LogHandler.java b/src/main/java/ch/njol/skript/log/LogHandler.java
index 09b5a5c9a9c..5a52957857a 100644
--- a/src/main/java/ch/njol/skript/log/LogHandler.java
+++ b/src/main/java/ch/njol/skript/log/LogHandler.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.log;
 
 import java.io.Closeable;
diff --git a/src/main/java/ch/njol/skript/log/ParseLogHandler.java b/src/main/java/ch/njol/skript/log/ParseLogHandler.java
index c391b474fc7..a0a740bc611 100644
--- a/src/main/java/ch/njol/skript/log/ParseLogHandler.java
+++ b/src/main/java/ch/njol/skript/log/ParseLogHandler.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.log;
 
 import org.jetbrains.annotations.Nullable;
diff --git a/src/main/java/ch/njol/skript/log/RedirectingLogHandler.java b/src/main/java/ch/njol/skript/log/RedirectingLogHandler.java
index a9bd8b9277c..89057f20470 100644
--- a/src/main/java/ch/njol/skript/log/RedirectingLogHandler.java
+++ b/src/main/java/ch/njol/skript/log/RedirectingLogHandler.java
@@ -1,60 +1,56 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.log;
 
-import org.bukkit.Bukkit;
 import org.bukkit.command.CommandSender;
 import org.jetbrains.annotations.Nullable;
 
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
 import java.util.logging.Level;
 
 /**
- * Redirects the log to a {@link CommandSender}.
+ * Redirects the log to one or more {@link CommandSender}s.
  */
 public class RedirectingLogHandler extends LogHandler {
 
-	private final CommandSender recipient;
-	
-	private final String prefix;
-	
+	private final Collection<CommandSender> recipients;
 	private int numErrors = 0;
-	
+	private final String prefix;
+
 	public RedirectingLogHandler(CommandSender recipient, @Nullable String prefix) {
-		this.recipient = recipient;
+		this(Collections.singletonList(recipient), prefix);
+	}
+
+	public RedirectingLogHandler(Collection<CommandSender> recipients, @Nullable String prefix) {
+		this.recipients = new ArrayList<>(recipients);
 		this.prefix = prefix == null ? "" : prefix;
 	}
-	
+
 	@Override
 	public LogResult log(LogEntry entry) {
-		SkriptLogger.sendFormatted(recipient, prefix + entry.toFormattedString());
-		if (entry.level == Level.SEVERE)
+		return log(entry, null);
+	}
+
+	public LogResult log(LogEntry entry, @Nullable CommandSender ignore) {
+		String formattedMessage = prefix + entry.toFormattedString();
+		for (CommandSender recipient : recipients) {
+			if (recipient == ignore)
+				continue;
+			SkriptLogger.sendFormatted(recipient, formattedMessage);
+		}
+		if (entry.level == Level.SEVERE) {
 			numErrors++;
+		}
 		return LogResult.DO_NOT_LOG;
 	}
-	
+
 	@Override
 	public RedirectingLogHandler start() {
 		return SkriptLogger.startLogHandler(this);
 	}
-	
+
 	public int numErrors() {
 		return numErrors;
 	}
-
 }
+
diff --git a/src/main/java/ch/njol/skript/log/RetainingLogHandler.java b/src/main/java/ch/njol/skript/log/RetainingLogHandler.java
index ea685f0113c..52a89344e7a 100644
--- a/src/main/java/ch/njol/skript/log/RetainingLogHandler.java
+++ b/src/main/java/ch/njol/skript/log/RetainingLogHandler.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.log;
 
 import java.util.ArrayList;
@@ -25,22 +7,47 @@
 import java.util.LinkedList;
 import java.util.logging.Level;
 
-import org.bukkit.Bukkit;
 import org.bukkit.command.CommandSender;
 import org.jetbrains.annotations.Nullable;
 
 import ch.njol.skript.Skript;
+import org.jetbrains.annotations.ApiStatus;
+import org.jetbrains.annotations.Contract;
 
 /**
  * @author Peter Güttinger
  */
 public class RetainingLogHandler extends LogHandler {
-	
+
 	private final Deque<LogEntry> log = new LinkedList<>();
 	private int numErrors = 0;
-	
+
 	boolean printedErrorOrLog = false;
-	
+
+	/**
+	 * Internal method for creating a backup of this log.
+	 * @return A new RetainingLogHandler containing the contents of this RetainingLogHandler.
+	 */
+	@ApiStatus.Internal
+	@Contract("-> new")
+	public RetainingLogHandler backup() {
+		RetainingLogHandler copy = new RetainingLogHandler();
+		copy.numErrors = this.numErrors;
+		copy.printedErrorOrLog = this.printedErrorOrLog;
+		copy.log.addAll(this.log);
+		return copy;
+	}
+
+	/**
+	 * Internal method for restoring a backup of this log.
+	 */
+	@ApiStatus.Internal
+	public void restore(RetainingLogHandler copy) {
+		this.numErrors = copy.numErrors;
+		this.log.clear();
+		this.log.addAll(copy.log);
+	}
+
 	@Override
 	public LogResult log(LogEntry entry) {
 		log.add(entry);
@@ -49,40 +56,40 @@ public LogResult log(LogEntry entry) {
 		printedErrorOrLog = false;
 		return LogResult.CACHED;
 	}
-	
+
 	@Override
 	public void onStop() {
 		if (!printedErrorOrLog && Skript.testing())
 			SkriptLogger.LOGGER.warning("Retaining log wasn't instructed to print anything at " + SkriptLogger.getCaller());
 	}
-	
+
 	@Override
 	public RetainingLogHandler start() {
 		SkriptLogger.startLogHandler(this);
 		return this;
 	}
-	
+
 	public final boolean printErrors() {
 		return printErrors(null);
 	}
-	
+
 	/**
 	 * Prints all retained errors or the given one if no errors were retained.
 	 * <p>
 	 * This handler is stopped if not already done.
-	 * 
+	 *
 	 * @param def Error to print if no errors were logged, can be null to not print any error if there are none
 	 * @return Whether there were any errors
 	 */
 	public final boolean printErrors(@Nullable String def) {
 		return printErrors(def, ErrorQuality.SEMANTIC_ERROR);
 	}
-	
+
 	public final boolean printErrors(@Nullable String def, ErrorQuality quality) {
 		assert !printedErrorOrLog;
 		printedErrorOrLog = true;
 		stop();
-		
+
 		boolean hasError = false;
 		for (LogEntry e : log) {
 			if (e.getLevel().intValue() >= Level.SEVERE.intValue()) {
@@ -92,18 +99,18 @@ public final boolean printErrors(@Nullable String def, ErrorQuality quality) {
 				e.discarded("not printed");
 			}
 		}
-		
+
 		if (!hasError && def != null)
 			SkriptLogger.log(SkriptLogger.SEVERE, def);
-		
+
 		return hasError;
 	}
-	
+
 	/**
 	 * Sends all retained error messages to the given recipient.
 	 * <p>
 	 * This handler is stopped if not already done.
-	 * 
+	 *
 	 * @param recipient
 	 * @param def Error to send if no errors were logged, can be null to not print any error if there are none
 	 * @return Whether there were any errors to send
@@ -123,13 +130,13 @@ public final boolean printErrors(CommandSender recipient, @Nullable String def)
 				e.discarded("not printed");
 			}
 		}
-		
+
 		if (!hasError && def != null) {
 			SkriptLogger.sendFormatted(recipient, def);
 		}
 		return hasError;
 	}
-	
+
 	/**
 	 * Prints all retained log messages.
 	 * <p>
@@ -141,11 +148,11 @@ public final void printLog() {
 		stop();
 		SkriptLogger.logAll(log);
 	}
-	
+
 	public boolean hasErrors() {
 		return numErrors != 0;
 	}
-	
+
 	@Nullable
 	public LogEntry getFirstError() {
 		for (LogEntry e : log) {
@@ -154,7 +161,7 @@ public LogEntry getFirstError() {
 		}
 		return null;
 	}
-	
+
 	public LogEntry getFirstError(String def) {
 		for (LogEntry e : log) {
 			if (e.getLevel().intValue() >= Level.SEVERE.intValue())
@@ -162,7 +169,7 @@ public LogEntry getFirstError(String def) {
 		}
 		return new LogEntry(SkriptLogger.SEVERE, def);
 	}
-	
+
 	/**
 	 * Clears the list of retained log messages.
 	 */
@@ -172,18 +179,18 @@ public void clear() {
 		log.clear();
 		numErrors = 0;
 	}
-	
+
 	public int size() {
 		return log.size();
 	}
-	
+
 	@SuppressWarnings("null")
 	public Collection<LogEntry> getLog() {
 		// if something is grabbing the log entries, they're probably handling them manually
 		printedErrorOrLog = true;
 		return Collections.unmodifiableCollection(log);
 	}
-	
+
 	public Collection<LogEntry> getErrors() {
 		Collection<LogEntry> r = new ArrayList<>();
 		for (LogEntry e : log) {
@@ -192,9 +199,9 @@ public Collection<LogEntry> getErrors() {
 		}
 		return r;
 	}
-	
+
 	public int getNumErrors() {
 		return numErrors;
 	}
-	
+
 }
diff --git a/src/main/java/ch/njol/skript/log/SkriptLogger.java b/src/main/java/ch/njol/skript/log/SkriptLogger.java
index 7ccf88e7566..ad4ffdeaf23 100644
--- a/src/main/java/ch/njol/skript/log/SkriptLogger.java
+++ b/src/main/java/ch/njol/skript/log/SkriptLogger.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.log;
 
 import java.util.Collection;
diff --git a/src/main/java/ch/njol/skript/log/TestingLogHandler.java b/src/main/java/ch/njol/skript/log/TestingLogHandler.java
new file mode 100644
index 00000000000..08a79c55fcf
--- /dev/null
+++ b/src/main/java/ch/njol/skript/log/TestingLogHandler.java
@@ -0,0 +1,54 @@
+package ch.njol.skript.log;
+
+import ch.njol.skript.config.Node;
+import ch.njol.skript.lang.parser.ParserInstance;
+import ch.njol.skript.test.runner.EvtTestCase;
+import ch.njol.skript.test.runner.TestTracker;
+import org.skriptlang.skript.lang.structure.Structure;
+
+import java.util.logging.Level;
+
+/**
+ * Counts logged messages of a certain type and logs parse errors to {@link TestTracker}
+ */
+public class TestingLogHandler extends LogHandler {
+
+	private final int minimum;
+	private int count;
+	private final ParserInstance parser;
+
+	public TestingLogHandler(Level minimum) {
+		this.minimum = minimum.intValue();
+		this.parser = ParserInstance.get();
+	}
+
+	@Override
+	public LogResult log(LogEntry entry) {
+		if (entry.level.intValue() >= minimum) {
+			count++;
+			Structure struct = parser.getCurrentStructure();
+			Node node = parser.getNode();
+
+			String name = struct instanceof EvtTestCase test ? test.getTestName() : struct != null ? struct.getSyntaxTypeName() : null;
+			TestTracker.parsingStarted(name);
+
+			if (node != null) {
+				TestTracker.testFailed(entry.getMessage(), parser.getCurrentScript(), node.getLine());
+			} else {
+				TestTracker.testFailed(entry.getMessage());
+			}
+		}
+		return LogResult.LOG;
+	}
+
+	@Override
+	public TestingLogHandler start() {
+		SkriptLogger.startLogHandler(this);
+		return this;
+	}
+
+	public int getCount() {
+		return count;
+	}
+
+}
diff --git a/src/main/java/ch/njol/skript/log/TimingLogHandler.java b/src/main/java/ch/njol/skript/log/TimingLogHandler.java
index a42c26d4b4b..d989d27004c 100644
--- a/src/main/java/ch/njol/skript/log/TimingLogHandler.java
+++ b/src/main/java/ch/njol/skript/log/TimingLogHandler.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 
 /**
  * A {@link LogHandler} that records the time since its creation.
diff --git a/src/main/java/ch/njol/skript/log/Verbosity.java b/src/main/java/ch/njol/skript/log/Verbosity.java
index 176461cf401..181ce578db0 100644
--- a/src/main/java/ch/njol/skript/log/Verbosity.java
+++ b/src/main/java/ch/njol/skript/log/Verbosity.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.log;
 
 /**
diff --git a/src/main/java/ch/njol/skript/patterns/ChoicePatternElement.java b/src/main/java/ch/njol/skript/patterns/ChoicePatternElement.java
index c2d5c392eff..9494a14a521 100644
--- a/src/main/java/ch/njol/skript/patterns/ChoicePatternElement.java
+++ b/src/main/java/ch/njol/skript/patterns/ChoicePatternElement.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.patterns;
 
 import org.jetbrains.annotations.Nullable;
diff --git a/src/main/java/ch/njol/skript/patterns/GroupPatternElement.java b/src/main/java/ch/njol/skript/patterns/GroupPatternElement.java
index 42c41f8bcb3..6d2437634a5 100644
--- a/src/main/java/ch/njol/skript/patterns/GroupPatternElement.java
+++ b/src/main/java/ch/njol/skript/patterns/GroupPatternElement.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.patterns;
 
 import org.jetbrains.annotations.Nullable;
diff --git a/src/main/java/ch/njol/skript/patterns/Keyword.java b/src/main/java/ch/njol/skript/patterns/Keyword.java
index c4159af547b..b2cd512e294 100644
--- a/src/main/java/ch/njol/skript/patterns/Keyword.java
+++ b/src/main/java/ch/njol/skript/patterns/Keyword.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.patterns;
 
 import com.google.common.base.MoreObjects;
diff --git a/src/main/java/ch/njol/skript/patterns/LiteralPatternElement.java b/src/main/java/ch/njol/skript/patterns/LiteralPatternElement.java
index c4e7d23d9a1..6a18fa9bfa8 100644
--- a/src/main/java/ch/njol/skript/patterns/LiteralPatternElement.java
+++ b/src/main/java/ch/njol/skript/patterns/LiteralPatternElement.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.patterns;
 
 import org.jetbrains.annotations.Nullable;
diff --git a/src/main/java/ch/njol/skript/patterns/MalformedPatternException.java b/src/main/java/ch/njol/skript/patterns/MalformedPatternException.java
index 461e995754e..e9260ed907f 100644
--- a/src/main/java/ch/njol/skript/patterns/MalformedPatternException.java
+++ b/src/main/java/ch/njol/skript/patterns/MalformedPatternException.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.patterns;
 
 import org.jetbrains.annotations.Nullable;
diff --git a/src/main/java/ch/njol/skript/patterns/MatchResult.java b/src/main/java/ch/njol/skript/patterns/MatchResult.java
index 819c78f4361..c58e09d0d1d 100644
--- a/src/main/java/ch/njol/skript/patterns/MatchResult.java
+++ b/src/main/java/ch/njol/skript/patterns/MatchResult.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.patterns;
 
 import ch.njol.skript.lang.Expression;
diff --git a/src/main/java/ch/njol/skript/patterns/OptionalPatternElement.java b/src/main/java/ch/njol/skript/patterns/OptionalPatternElement.java
index 55c0456d90a..0ce91a75951 100644
--- a/src/main/java/ch/njol/skript/patterns/OptionalPatternElement.java
+++ b/src/main/java/ch/njol/skript/patterns/OptionalPatternElement.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.patterns;
 
 import org.jetbrains.annotations.Nullable;
diff --git a/src/main/java/ch/njol/skript/patterns/ParseTagPatternElement.java b/src/main/java/ch/njol/skript/patterns/ParseTagPatternElement.java
index bb53a39b5f7..187129b805a 100644
--- a/src/main/java/ch/njol/skript/patterns/ParseTagPatternElement.java
+++ b/src/main/java/ch/njol/skript/patterns/ParseTagPatternElement.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.patterns;
 
 import org.jetbrains.annotations.Nullable;
diff --git a/src/main/java/ch/njol/skript/patterns/PatternCompiler.java b/src/main/java/ch/njol/skript/patterns/PatternCompiler.java
index 36323cf1dc8..dcc9e088c07 100644
--- a/src/main/java/ch/njol/skript/patterns/PatternCompiler.java
+++ b/src/main/java/ch/njol/skript/patterns/PatternCompiler.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.patterns;
 
 import ch.njol.skript.lang.SkriptParser;
diff --git a/src/main/java/ch/njol/skript/patterns/PatternElement.java b/src/main/java/ch/njol/skript/patterns/PatternElement.java
index e3a442a1082..c67069b1236 100644
--- a/src/main/java/ch/njol/skript/patterns/PatternElement.java
+++ b/src/main/java/ch/njol/skript/patterns/PatternElement.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.patterns;
 
 import org.jetbrains.annotations.Nullable;
diff --git a/src/main/java/ch/njol/skript/patterns/RegexPatternElement.java b/src/main/java/ch/njol/skript/patterns/RegexPatternElement.java
index 93000db6872..502703dc032 100644
--- a/src/main/java/ch/njol/skript/patterns/RegexPatternElement.java
+++ b/src/main/java/ch/njol/skript/patterns/RegexPatternElement.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.patterns;
 
 import ch.njol.skript.lang.SkriptParser;
diff --git a/src/main/java/ch/njol/skript/patterns/SkriptPattern.java b/src/main/java/ch/njol/skript/patterns/SkriptPattern.java
index d57bd5134d1..87079e89c71 100644
--- a/src/main/java/ch/njol/skript/patterns/SkriptPattern.java
+++ b/src/main/java/ch/njol/skript/patterns/SkriptPattern.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.patterns;
 
 import ch.njol.skript.lang.Expression;
diff --git a/src/main/java/ch/njol/skript/patterns/TypePatternElement.java b/src/main/java/ch/njol/skript/patterns/TypePatternElement.java
index bef5ad2dce9..c337648d52b 100644
--- a/src/main/java/ch/njol/skript/patterns/TypePatternElement.java
+++ b/src/main/java/ch/njol/skript/patterns/TypePatternElement.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.patterns;
 
 import ch.njol.skript.Skript;
@@ -209,7 +191,9 @@ public MatchResult match(String expr, MatchResult matchResult) {
 							}
 						}
 					} finally {
-						expressionLogHandler.printError();
+						if (!expressionLogHandler.isStopped()) { // we have already printed the logs
+							expressionLogHandler.printError();
+						}
 					}
 				}
 
diff --git a/src/main/java/ch/njol/skript/registrations/Classes.java b/src/main/java/ch/njol/skript/registrations/Classes.java
index 1f29173fe4e..39f0b2dc772 100644
--- a/src/main/java/ch/njol/skript/registrations/Classes.java
+++ b/src/main/java/ch/njol/skript/registrations/Classes.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.registrations;
 
 import java.io.ByteArrayInputStream;
@@ -39,10 +21,12 @@
 
 import ch.njol.skript.command.Commands;
 import ch.njol.skript.entity.EntityData;
+import ch.njol.skript.util.Date;
 import ch.njol.skript.util.Utils;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.Chunk;
+import org.jetbrains.annotations.Contract;
 import org.jetbrains.annotations.Nullable;
 
 import ch.njol.skript.Skript;
@@ -75,16 +59,16 @@
  * @author Peter Güttinger
  */
 public abstract class Classes {
-	
+
 	private Classes() {}
-	
+
 	@Nullable
 	private static ClassInfo<?>[] classInfos = null;
 	private final static List<ClassInfo<?>> tempClassInfos = new ArrayList<>();
 	private final static HashMap<Class<?>, ClassInfo<?>> exactClassInfos = new HashMap<>();
 	private final static HashMap<Class<?>, ClassInfo<?>> superClassInfos = new HashMap<>();
 	private final static HashMap<String, ClassInfo<?>> classInfosByCodeName = new HashMap<>();
-	
+
 	/**
 	 * @param info info about the class to register
 	 */
@@ -107,11 +91,11 @@ public static <T> void registerClass(final ClassInfo<T> info) {
 				throw e;
 		}
 	}
-	
+
 	public static void onRegistrationsStop() {
-		
+
 		sortClassInfos();
-		
+
 		// validate serializeAs
 		for (final ClassInfo<?> ci : getClassInfos()) {
 			if (ci.getSerializeAs() != null) {
@@ -123,7 +107,7 @@ public static void onRegistrationsStop() {
 				}
 			}
 		}
-		
+
 		// register to Yggdrasil
 		for (final ClassInfo<?> ci : getClassInfos()) {
 			final Serializer<?> s = ci.getSerializer();
@@ -133,17 +117,17 @@ public static void onRegistrationsStop() {
 
 		EntityData.onRegistrationStop();
 	}
-	
+
 	/**
 	 * Sorts the class infos according to sub/superclasses and relations set with {@link ClassInfo#before(String...)} and {@link ClassInfo#after(String...)}.
 	 */
 	@SuppressFBWarnings("LI_LAZY_INIT_STATIC")
 	private static void sortClassInfos() {
 		assert classInfos == null;
-		
+
 		if (!Skript.testing() && SkriptConfig.addonSafetyChecks.value())
 			removeNullElements();
-		
+
 		// merge before, after & sub/supertypes in after
 		for (final ClassInfo<?> ci : tempClassInfos) {
 			final Set<String> before = ci.before();
@@ -166,7 +150,7 @@ private static void sortClassInfos() {
 					ci.after().add(ci2.getCodeName());
 			}
 		}
-		
+
 		// remove unresolvable dependencies (and print a warning if testing)
 		for (final ClassInfo<?> ci : tempClassInfos) {
 			final Set<String> s = new HashSet<>();
@@ -188,9 +172,9 @@ private static void sortClassInfos() {
 			if (!s.isEmpty() && Skript.testing())
 				Skript.warning(s.size() + " dependency/ies could not be resolved for " + ci + ": " + StringUtils.join(s, ", "));
 		}
-		
+
 		final List<ClassInfo<?>> classInfos = new ArrayList<>(tempClassInfos.size());
-		
+
 		boolean changed = true;
 		while (changed) {
 			changed = false;
@@ -206,9 +190,9 @@ private static void sortClassInfos() {
 				}
 			}
 		}
-		
+
 		Classes.classInfos = classInfos.toArray(new ClassInfo[classInfos.size()]);
-		
+
 		// check for circular dependencies
 		if (!tempClassInfos.isEmpty()) {
 			final StringBuilder b = new StringBuilder();
@@ -219,7 +203,7 @@ private static void sortClassInfos() {
 			}
 			throw new IllegalStateException("ClassInfos with circular dependencies detected: " + b.toString());
 		}
-		
+
 		// debug message
 		if (Skript.debug()) {
 			final StringBuilder b = new StringBuilder();
@@ -230,9 +214,9 @@ private static void sortClassInfos() {
 			}
 			Skript.info("All registered classes in order: " + b.toString());
 		}
-		
+
 	}
-	
+
 	@SuppressWarnings({"null", "unused"})
 	private static void removeNullElements() {
 		Iterator<ClassInfo<?>> it = tempClassInfos.iterator();
@@ -242,12 +226,12 @@ private static void removeNullElements() {
 				it.remove();
 		}
 	}
-	
+
 	private static void checkAllowClassInfoInteraction() {
 		if (Skript.isAcceptRegistrations())
 			throw new IllegalStateException("Cannot use classinfos until registration is over");
 	}
-	
+
 	@SuppressWarnings("null")
 	public static List<ClassInfo<?>> getClassInfos() {
 		checkAllowClassInfoInteraction();
@@ -256,10 +240,10 @@ public static List<ClassInfo<?>> getClassInfos() {
 			return Collections.emptyList();
 		return Collections.unmodifiableList(Arrays.asList(ci));
 	}
-	
+
 	/**
 	 * This method can be called even while Skript is loading.
-	 * 
+	 *
 	 * @param codeName
 	 * @return The ClassInfo with the given code name
 	 * @throws SkriptAPIException If the given class was not registered
@@ -270,10 +254,10 @@ public static ClassInfo<?> getClassInfo(final String codeName) {
 			throw new SkriptAPIException("No class info found for " + codeName);
 		return ci;
 	}
-	
+
 	/**
 	 * This method can be called even while Skript is loading.
-	 * 
+	 *
 	 * @param codeName
 	 * @return The class info registered with the given code name or null if the code name is invalid or not yet registered
 	 */
@@ -281,12 +265,12 @@ public static ClassInfo<?> getClassInfo(final String codeName) {
 	public static ClassInfo<?> getClassInfoNoError(final @Nullable String codeName) {
 		return classInfosByCodeName.get(codeName);
 	}
-	
+
 	/**
 	 * Gets the class info for the given class.
 	 * <p>
 	 * This method can be called even while Skript is loading.
-	 * 
+	 *
 	 * @param c The exact class to get the class info for.
 	 * @return The class info for the given class or null if no info was found.
 	 */
@@ -295,14 +279,15 @@ public static ClassInfo<?> getClassInfoNoError(final @Nullable String codeName)
 	public static <T> ClassInfo<T> getExactClassInfo(final @Nullable Class<T> c) {
 		return (ClassInfo<T>) exactClassInfos.get(c);
 	}
-	
+
 	/**
 	 * Gets the class info of the given class or its closest registered superclass. This method will never return null unless <tt>c</tt> is null.
-	 * 
+	 *
 	 * @param c
 	 * @return The closest superclass's info
 	 */
 	@SuppressWarnings("unchecked")
+	@Contract(pure = true, value = "!null -> !null")
 	public static <T> ClassInfo<? super T> getSuperClassInfo(final Class<T> c) {
 		assert c != null;
 		checkAllowClassInfoInteraction();
@@ -334,7 +319,7 @@ public static ClassInfo<?> getSuperClassInfo(Class<?>... classes) {
 
 	/**
 	 * Gets all the class info of the given class in closest order to ending on object. This list will never be empty unless <tt>c</tt> is null.
-	 * 
+	 *
 	 * @param c the class to check if assignable from
 	 * @return The closest list of superclass infos
 	 */
@@ -350,10 +335,10 @@ public static <T> List<ClassInfo<? super T>> getAllSuperClassInfos(Class<T> c) {
 		}
 		return list;
 	}
-	
+
 	/**
 	 * Gets a class by its code name
-	 * 
+	 *
 	 * @param codeName
 	 * @return the class with the given code name
 	 * @throws SkriptAPIException If the given class was not registered
@@ -362,10 +347,10 @@ public static Class<?> getClass(final String codeName) {
 		checkAllowClassInfoInteraction();
 		return getClassInfo(codeName).getC();
 	}
-	
+
 	/**
 	 * As the name implies
-	 * 
+	 *
 	 * @param name
 	 * @return the class info or null if the name was not recognised
 	 */
@@ -384,10 +369,10 @@ public static ClassInfo<?> getClassInfoFromUserInput(String name) {
 		}
 		return null;
 	}
-	
+
 	/**
 	 * As the name implies
-	 * 
+	 *
 	 * @param name
 	 * @return the class or null if the name was not recognized
 	 */
@@ -397,10 +382,10 @@ public static Class<?> getClassFromUserInput(final String name) {
 		final ClassInfo<?> ci = getClassInfoFromUserInput(name);
 		return ci == null ? null : ci.getC();
 	}
-	
+
 	/**
 	 * Gets the default of a class
-	 * 
+	 *
 	 * @param codeName
 	 * @return the expression holding the default value or null if this class doesn't have one
 	 * @throws SkriptAPIException If the given class was not registered
@@ -410,10 +395,10 @@ public static DefaultExpression<?> getDefaultExpression(final String codeName) {
 		checkAllowClassInfoInteraction();
 		return getClassInfo(codeName).getDefaultExpression();
 	}
-	
+
 	/**
 	 * Gets the default expression of a class
-	 * 
+	 *
 	 * @param c The class
 	 * @return The expression holding the default value or null if this class doesn't have one
 	 */
@@ -423,7 +408,7 @@ public static <T> DefaultExpression<T> getDefaultExpression(final Class<T> c) {
 		final ClassInfo<T> ci = getExactClassInfo(c);
 		return ci == null ? null : ci.getDefaultExpression();
 	}
-	
+
 	/**
 	 * Clones the given object by calling {@link ClassInfo#clone(Object)},
 	 * getting the {@link ClassInfo} from the closest registered superclass
@@ -445,10 +430,10 @@ public static Object clone(Object obj) {
 			return classInfo.clone(obj);
 		}
 	}
-	
+
 	/**
 	 * Gets the name a class was registered with.
-	 * 
+	 *
 	 * @param c The exact class
 	 * @return The name of the class or null if the given class wasn't registered.
 	 */
@@ -458,12 +443,12 @@ public static String getExactClassName(final Class<?> c) {
 		final ClassInfo<?> ci = exactClassInfos.get(c);
 		return ci == null ? null : ci.getCodeName();
 	}
-	
+
 	/**
 	 * Parses without trying to convert anything.
 	 * <p>
 	 * Can log an error xor other log messages.
-	 * 
+	 *
 	 * @param s
 	 * @param c
 	 * @return The parsed object
@@ -490,14 +475,14 @@ public static <T> T parseSimple(final String s, final Class<T> c, final ParseCon
 		}
 		return null;
 	}
-	
+
 	/**
 	 * Parses a string to get an object of the desired type.
 	 * <p>
 	 * Instead of repeatedly calling this with the same class argument, you should get a parser with {@link #getParser(Class)} and use it for parsing.
 	 * <p>
 	 * Can log an error if it returned null.
-	 * 
+	 *
 	 * @param s The string to parse
 	 * @param c The desired type. The returned value will be of this type or a subclass if it.
 	 * @return The parsed object
@@ -533,10 +518,10 @@ public static <T> T parse(final String s, final Class<T> c, final ParseContext c
 		}
 		return null;
 	}
-	
+
 	/**
 	 * Gets a parser for parsing instances of the desired type from strings. The returned parser may only be used for parsing, i.e. you must not use its toString methods.
-	 * 
+	 *
 	 * @param to
 	 * @return A parser to parse object of the desired type
 	 */
@@ -564,12 +549,12 @@ public static <T> Parser<? extends T> getParser(final Class<T> to) {
 		}
 		return null;
 	}
-	
+
 	/**
 	 * Gets a parser for an exactly known class. You should usually use {@link #getParser(Class)} instead of this method.
 	 * <p>
 	 * The main benefit of this method is that it's the only class info method of Skript that can be used while Skript is initializing and thus useful for parsing configs.
-	 * 
+	 *
 	 * @param c
 	 * @return A parser to parse object of the desired type
 	 */
@@ -587,7 +572,7 @@ public static <T> Parser<? extends T> getExactParser(final Class<T> c) {
 			return ci == null ? null : ci.getParser();
 		}
 	}
-	
+
 	private static <F, T> Parser<T> createConvertedParser(final Parser<?> parser, final Converter<F, T> converter) {
 		return new Parser<T>() {
 			@SuppressWarnings("unchecked")
@@ -599,19 +584,19 @@ public T parse(final String s, final ParseContext context) {
 					return null;
 				return converter.convert((F) f);
 			}
-			
+
 			@Override
 			public String toString(final T o, final int flags) {
 				throw new UnsupportedOperationException();
 			}
-			
+
 			@Override
 			public String toVariableNameString(final T o) {
 				throw new UnsupportedOperationException();
 			}
         };
 	}
-	
+
 	/**
 	 * @param o Any object, preferably not an array: use {@link Classes#toString(Object[], boolean)} instead.
 	 * @return String representation of the object (using a parser if found or {@link String#valueOf(Object)} otherwise).
@@ -623,15 +608,15 @@ public String toVariableNameString(final T o) {
 	public static String toString(final @Nullable Object o) {
 		return toString(o, StringMode.MESSAGE, 0);
 	}
-	
+
 	public static String getDebugMessage(final @Nullable Object o) {
 		return toString(o, StringMode.DEBUG, 0);
 	}
-	
+
 	public static <T> String toString(final @Nullable T o, final StringMode mode) {
 		return toString(o, mode, 0);
 	}
-	
+
 	private static <T> String toString(final @Nullable T o, final StringMode mode, final int flags) {
 		assert flags == 0 || mode == StringMode.MESSAGE;
 		if (o == null)
@@ -661,23 +646,23 @@ private static <T> String toString(final @Nullable T o, final StringMode mode, f
 		}
 		return mode == StringMode.VARIABLE_NAME ? "object:" + o : "" + o;
 	}
-	
+
 	public static String toString(final Object[] os, final int flags, final boolean and) {
 		return toString(os, and, null, StringMode.MESSAGE, flags);
 	}
-	
+
 	public static String toString(final Object[] os, final int flags, final @Nullable ChatColor c) {
 		return toString(os, true, c, StringMode.MESSAGE, flags);
 	}
-	
+
 	public static String toString(final Object[] os, final boolean and) {
 		return toString(os, and, null, StringMode.MESSAGE, 0);
 	}
-	
+
 	public static String toString(final Object[] os, final boolean and, final StringMode mode) {
 		return toString(os, and, null, mode, 0);
 	}
-	
+
 	private static String toString(final Object[] os, final boolean and, final @Nullable ChatColor c, final StringMode mode, final int flags) {
 		if (os.length == 0)
 			return toString(null);
@@ -697,15 +682,15 @@ private static String toString(final Object[] os, final boolean and, final @Null
 		}
 		return "" + b.toString();
 	}
-	
+
 	/**
 	 * consists of {@link Yggdrasil#MAGIC_NUMBER} and {@link Variables#YGGDRASIL_VERSION}
 	 */
 	private final static byte[] YGGDRASIL_START = {(byte) 'Y', (byte) 'g', (byte) 'g', 0, (Variables.YGGDRASIL_VERSION >>> 8) & 0xFF, Variables.YGGDRASIL_VERSION & 0xFF};
-	
+
 	@SuppressWarnings("null")
 	private final static Charset UTF_8 = Charset.forName("UTF-8");
-	
+
 	private static byte[] getYggdrasilStart(final ClassInfo<?> c) throws NotSerializableException {
 		assert Enum.class.isAssignableFrom(Kleenean.class) && Tag.getType(Kleenean.class) == Tag.T_ENUM : Tag.getType(Kleenean.class); // TODO why is this check here?
 		final Tag t = Tag.getType(c.getC());
@@ -724,60 +709,65 @@ private static byte[] getYggdrasilStart(final ClassInfo<?> c) throws NotSerializ
 		assert i == r.length;
 		return r;
 	}
-	
+
 	/**
 	 * Must be called on the appropriate thread for the given value (i.e. the main thread currently)
 	 */
-	public static SerializedVariable.@Nullable Value serialize(@Nullable Object o) {
-		if (o == null)
+	public static SerializedVariable.@Nullable Value serialize(@Nullable Object object) {
+		if (object == null)
 			return null;
-		
+
 		// temporary
 		assert Bukkit.isPrimaryThread();
 		
-		ClassInfo<?> ci = getSuperClassInfo(o.getClass());
-		if (ci.getSerializeAs() != null) {
-			ci = getExactClassInfo(ci.getSerializeAs());
-			if (ci == null) {
-				assert false : o.getClass();
+		ClassInfo<?> classInfo = getSuperClassInfo(object.getClass());
+		if (classInfo.getSerializeAs() != null) {
+			classInfo = getExactClassInfo(classInfo.getSerializeAs());
+			if (classInfo == null) {
+				assert false : object.getClass();
 				return null;
 			}
-			o = Converters.convert(o, ci.getC());
-			if (o == null) {
-				assert false : ci.getCodeName();
+			object = Converters.convert(object, classInfo.getC());
+			if (object == null) {
+				assert false : classInfo.getCodeName();
 				return null;
 			}
 		}
 		
-		final Serializer<?> s = ci.getSerializer();
-		if (s == null) // value cannot be saved
+		Serializer<?> serializer = classInfo.getSerializer();
+		if (serializer == null) // value cannot be saved
 			return null;
 		
-		assert s.mustSyncDeserialization() ? Bukkit.isPrimaryThread() : true;
+		assert !serializer.mustSyncDeserialization() || Bukkit.isPrimaryThread();
 		
 		try {
-			final ByteArrayOutputStream bout = new ByteArrayOutputStream();
-			final YggdrasilOutputStream yout = Variables.yggdrasil.newOutputStream(bout);
-			yout.writeObject(o);
-			yout.flush();
-			yout.close();
-			final byte[] r = bout.toByteArray();
-			final byte[] start = getYggdrasilStart(ci);
+			ByteArrayOutputStream byteOutputStream = new ByteArrayOutputStream();
+			YggdrasilOutputStream yggdrasilOutputStream = Variables.yggdrasil.newOutputStream(byteOutputStream);
+
+			yggdrasilOutputStream.writeObject(object);
+			yggdrasilOutputStream.flush();
+			yggdrasilOutputStream.close();
+
+			byte[] byteArray = byteOutputStream.toByteArray();
+			byte[] start = getYggdrasilStart(classInfo);
 			for (int i = 0; i < start.length; i++)
-				assert r[i] == start[i] : o + " (" + ci.getC().getName() + "); " + Arrays.toString(start) + ", " + Arrays.toString(r);
-			final byte[] r2 = new byte[r.length - start.length];
-			System.arraycopy(r, start.length, r2, 0, r2.length);
-			
-			Object d;
-			assert equals(o, d = deserialize(ci, new ByteArrayInputStream(r2))) : o + " (" + o.getClass() + ") != " + d + " (" + (d == null ? null : d.getClass()) + "): " + Arrays.toString(r);
+				assert byteArray[i] == start[i] : object + " (" + classInfo.getC().getName() + "); " + Arrays.toString(start) + ", " + Arrays.toString(byteArray);
+			byte[] byteArrayCopy = new byte[byteArray.length - start.length];
+			System.arraycopy(byteArray, start.length, byteArrayCopy, 0, byteArrayCopy.length);
+
+			Object deserialized;
+			assert equals(object,
+				deserialized = deserialize(classInfo, new ByteArrayInputStream(byteArrayCopy)))
+				: object + " (" + object.getClass() + ") != " + deserialized + " ("
+				+ (deserialized == null ? null : deserialized.getClass()) + "): " + Arrays.toString(byteArray);
 			
-			return new SerializedVariable.Value(ci.getCodeName(), r2);
-		} catch (final IOException e) { // shouldn't happen
-			Skript.exception(e);
+			return new SerializedVariable.Value(classInfo.getCodeName(), byteArrayCopy);
+		} catch (IOException ex) { // shouldn't happen
+			Skript.exception(ex);
 			return null;
 		}
 	}
-	
+
 	private static boolean equals(final @Nullable Object o, final @Nullable Object d) {
 		if (o instanceof Chunk) { // CraftChunk does neither override equals nor is it a "coordinate-specific singleton" like Block
 			if (!(d instanceof Chunk))
@@ -787,12 +777,12 @@ private static boolean equals(final @Nullable Object o, final @Nullable Object d
 		}
 		return o == null ? d == null : o.equals(d);
 	}
-	
+
 	@Nullable
 	public static Object deserialize(final ClassInfo<?> type, final byte[] value) {
 		return deserialize(type, new ByteArrayInputStream(value));
 	}
-	
+
 	@Nullable
 	public static Object deserialize(final String type, final byte[] value) {
 		final ClassInfo<?> ci = getClassInfoNoError(type);
@@ -800,7 +790,7 @@ public static Object deserialize(final String type, final byte[] value) {
 			return null;
 		return deserialize(ci, new ByteArrayInputStream(value));
 	}
-	
+
 	@Nullable
 	public static Object deserialize(final ClassInfo<?> type, InputStream value) {
 		Serializer<?> s;
@@ -825,12 +815,12 @@ public static Object deserialize(final ClassInfo<?> type, InputStream value) {
 			} catch (final IOException e) {}
 		}
 	}
-	
+
 	/**
 	 * Deserialises an object.
 	 * <p>
 	 * This method must only be called from Bukkits main thread!
-	 * 
+	 *
 	 * @param type
 	 * @param value
 	 * @return Deserialised value or null if the input is invalid
@@ -847,5 +837,5 @@ public static Object deserialize(final String type, final String value) {
 			return null;
 		return s.deserialize(value);
 	}
-	
+
 }
diff --git a/src/main/java/ch/njol/skript/registrations/Comparators.java b/src/main/java/ch/njol/skript/registrations/Comparators.java
index cbc02e90b4b..e69de29bb2d 100644
--- a/src/main/java/ch/njol/skript/registrations/Comparators.java
+++ b/src/main/java/ch/njol/skript/registrations/Comparators.java
@@ -1,120 +0,0 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
-package ch.njol.skript.registrations;
-
-import ch.njol.skript.classes.Comparator;
-import ch.njol.skript.classes.Comparator.Relation;
-import org.jetbrains.annotations.Nullable;
-
-/**
- * @deprecated Use {@link org.skriptlang.skript.lang.comparator.Comparators}
- */
-@Deprecated
-public class Comparators {
-
-	private Comparators() {}
-
-	/**
-	 * Registers a {@link Comparator}.
-	 *
-	 * @param t1
-	 * @param t2
-	 * @param c
-	 * @throws IllegalArgumentException if any given class is equal to <code>Object.class</code>
-	 */
-	public static <T1, T2> void registerComparator(final Class<T1> t1, final Class<T2> t2, final Comparator<T1, T2> c) {
-		org.skriptlang.skript.lang.comparator.Comparators.registerComparator(t1, t2, new org.skriptlang.skript.lang.comparator.Comparator<T1, T2>() {
-			@Override
-			public org.skriptlang.skript.lang.comparator.Relation compare(T1 o1, T2 o2) {
-				return getFromOld(c.compare(o1, o2));
-			}
-
-			@Override
-			public boolean supportsOrdering() {
-				return c.supportsOrdering();
-			}
-		});
-	}
-
-	public static Relation compare(final @Nullable Object o1, final @Nullable Object o2) {
-		return getFromNew(org.skriptlang.skript.lang.comparator.Comparators.compare(o1, o2));
-	}
-
-	public static java.util.Comparator<Object> getJavaComparator() {
-		return (o1, o2) -> compare(o1, o2).getRelation();
-	}
-
-	@Nullable
-	public static <F, S> Comparator<? super F, ? super S> getComparator(final Class<F> f, final Class<S> s) {
-		org.skriptlang.skript.lang.comparator.Comparator<F, S> newComp =
-			org.skriptlang.skript.lang.comparator.Comparators.getComparator(f, s);
-		if (newComp == null)
-			return null;
-		return new Comparator<F, S>() {
-			@Override
-			public Relation compare(F f, S s) {
-				return getFromNew(newComp.compare(f, s));
-			}
-
-			@Override
-			public boolean supportsOrdering() {
-				return newComp.supportsOrdering();
-			}
-		};
-	}
-
-	private static Relation getFromNew(org.skriptlang.skript.lang.comparator.Relation newRelation) {
-		switch (newRelation) {
-			case EQUAL:
-				return Relation.EQUAL;
-			case NOT_EQUAL:
-				return Relation.NOT_EQUAL;
-			case SMALLER:
-				return Relation.SMALLER;
-			case SMALLER_OR_EQUAL:
-				return Relation.SMALLER_OR_EQUAL;
-			case GREATER:
-				return Relation.GREATER;
-			case GREATER_OR_EQUAL:
-				return Relation.GREATER_OR_EQUAL;
-			default:
-				throw new IllegalArgumentException("Unexpected value: " + newRelation);
-		}
-	}
-
-	private static org.skriptlang.skript.lang.comparator.Relation getFromOld(Relation oldRelation) {
-		switch (oldRelation) {
-			case EQUAL:
-				return org.skriptlang.skript.lang.comparator.Relation.EQUAL;
-			case NOT_EQUAL:
-				return org.skriptlang.skript.lang.comparator.Relation.NOT_EQUAL;
-			case SMALLER:
-				return org.skriptlang.skript.lang.comparator.Relation.SMALLER;
-			case SMALLER_OR_EQUAL:
-				return org.skriptlang.skript.lang.comparator.Relation.SMALLER_OR_EQUAL;
-			case GREATER:
-				return org.skriptlang.skript.lang.comparator.Relation.GREATER;
-			case GREATER_OR_EQUAL:
-				return org.skriptlang.skript.lang.comparator.Relation.GREATER_OR_EQUAL;
-			default:
-				throw new IllegalArgumentException("Unexpected value: " + oldRelation);
-		}
-	}
-
-}
diff --git a/src/main/java/ch/njol/skript/registrations/Converters.java b/src/main/java/ch/njol/skript/registrations/Converters.java
index b139ff2b872..183ab302295 100644
--- a/src/main/java/ch/njol/skript/registrations/Converters.java
+++ b/src/main/java/ch/njol/skript/registrations/Converters.java
@@ -1,189 +1,104 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.registrations;
 
 import ch.njol.skript.classes.Converter;
-import ch.njol.skript.classes.Converter.ConverterInfo;
+import ch.njol.skript.util.Utils;
 import org.jetbrains.annotations.Nullable;
+import org.skriptlang.skript.lang.converter.ConverterInfo;
 
 import java.util.List;
 import java.util.stream.Collectors;
 
 /**
- * Contains all registered converters and allows operating with them.
+ * <h2>WARNING! This class has been removed in this update.</h2>
+ * This class stub has been left behind to prevent loading errors from outdated addons,
+ * but its functionality has been largely removed.
+ *
  * @deprecated Use {@link org.skriptlang.skript.lang.converter.Converters}
  */
-@Deprecated
+@Deprecated(forRemoval = true)
+@SuppressWarnings("removal")
 public abstract class Converters {
-	
-	private Converters() {}
-	
+
+	static {
+		Utils.loadedRemovedClassWarning(Converters.class);
+	}
+
 	@SuppressWarnings("unchecked")
+	@Deprecated(forRemoval = true)
 	public static <F, T> List<ConverterInfo<?, ?>> getConverters() {
 		return org.skriptlang.skript.lang.converter.Converters.getConverterInfos().stream()
 			.map(unknownInfo -> {
-				org.skriptlang.skript.lang.converter.ConverterInfo<F, T> info = (org.skriptlang.skript.lang.converter.ConverterInfo<F, T>) unknownInfo;
-				return new ConverterInfo<>(info.getFrom(), info.getTo(), info.getConverter()::convert, info.getFlags());
+				org.skriptlang.skript.lang.converter.ConverterInfo<F, T> info =
+					(org.skriptlang.skript.lang.converter.ConverterInfo<F, T>) unknownInfo;
+				return new ConverterInfo<>(info.getFrom(), info.getTo(), info.getConverter(), info.getFlags());
 			})
 			.collect(Collectors.toList());
 	}
-	
-	/**
-	 * Registers a converter.
-	 * 
-	 * @param from Type that the converter converts from.
-	 * @param to  Type that the converter converts to.
-	 * @param converter Actual converter.
-	 */
+
+	@Deprecated(forRemoval = true)
 	public static <F, T> void registerConverter(Class<F> from, Class<T> to, Converter<F, T> converter) {
 		registerConverter(from, to, converter, 0);
 	}
-	
+
+	@Deprecated(forRemoval = true)
 	public static <F, T> void registerConverter(Class<F> from, Class<T> to, Converter<F, T> converter, int options) {
 		org.skriptlang.skript.lang.converter.Converters.registerConverter(from, to, converter::convert, options);
 	}
-	
-	// REMIND how to manage overriding of converters? - shouldn't actually matter
-	public static void createMissingConverters() {
-		org.skriptlang.skript.lang.converter.Converters.createChainedConverters();
-	}
-	
-	/**
-	 * Converts the given value to the desired type. If you want to convert multiple values of the same type you should use {@link #getConverter(Class, Class)} to get a
-	 * converter to convert the values.
-	 * 
-	 * @param o
-	 * @param to
-	 * @return The converted value or null if no converter exists or the converter returned null for the given value.
-	 */
-	@Nullable
-	public static <F, T> T convert(final @Nullable F o, final Class<T> to) {
+
+	@Deprecated(forRemoval = true)
+	public static <F, T> T convert(@Nullable F o, Class<T> to) {
 		return org.skriptlang.skript.lang.converter.Converters.convert(o, to);
 	}
-	
-	/**
-	 * Converts an object into one of the given types.
-	 * <p>
-	 * This method does not convert the object if it is already an instance of any of the given classes.
-	 * 
-	 * @param o
-	 * @param to
-	 * @return The converted object
-	 */
-	@Nullable
-	public static <F, T> T convert(final @Nullable F o, final Class<? extends T>[] to) {
+
+	@Deprecated(forRemoval = true)
+	public static <F, T> T convert(@Nullable F o, Class<? extends T>[] to) {
 		return org.skriptlang.skript.lang.converter.Converters.convert(o, to);
 	}
-	
-	/**
-	 * Converts all entries in the given array to the desired type, using {@link #convert(Object, Class)} to convert every single value. If you want to convert an array of values
-	 * of a known type, consider using {@link #convert(Object[], Class, Converter)} for much better performance.
-	 * 
-	 * @param o
-	 * @param to
-	 * @return A T[] array without null elements
-	 */
-	@Nullable
-	public static <T> T[] convertArray(final @Nullable Object[] o, final Class<T> to) {
+
+	@Deprecated(forRemoval = true)
+	public static <T> T[] convertArray(@Nullable Object[] o, Class<T> to) {
 		T[] converted = org.skriptlang.skript.lang.converter.Converters.convert(o, to);
 		if (converted.length == 0) // no longer nullable with new converter classes
 			return null;
 		return converted;
 	}
-	
-	/**
-	 * Converts multiple objects into any of the given classes.
-	 * 
-	 * @param o
-	 * @param to
-	 * @param superType The component type of the returned array
-	 * @return The converted array
-	 */
-	public static <T> T[] convertArray(final @Nullable Object[] o, final Class<? extends T>[] to, final Class<T> superType) {
+
+	@Deprecated(forRemoval = true)
+	public static <T> T[] convertArray(@Nullable Object[] o, Class<? extends T>[] to,
+									   Class<T> superType) {
 		return org.skriptlang.skript.lang.converter.Converters.convert(o, to, superType);
 	}
 
-	/**
-	 * Strictly converts an array to a non-null array of the specified class.
-	 * Uses registered {@link ch.njol.skript.registrations.Converters} to convert.
-	 *
-	 * @param original The array to convert
-	 * @param to       What to convert {@code original} to
-	 * @return {@code original} converted to an array of {@code to}
-	 * @throws ClassCastException if one of {@code original}'s
-	 * elements cannot be converted to a {@code to}
-	 */
+	@Deprecated(forRemoval = true)
 	public static <T> T[] convertStrictly(Object[] original, Class<T> to) throws ClassCastException {
 		return org.skriptlang.skript.lang.converter.Converters.convertStrictly(original, to);
 	}
 
-	/**
-	 * Strictly converts an object to the specified class
-	 *
-	 * @param original The object to convert
-	 * @param to What to convert {@code original} to
-	 * @return {@code original} converted to a {@code to}
-	 * @throws ClassCastException if {@code original} could not be converted to a {@code to}
-	 */
+	@Deprecated(forRemoval = true)
 	public static <T> T convertStrictly(Object original, Class<T> to) throws ClassCastException {
 		return org.skriptlang.skript.lang.converter.Converters.convertStrictly(original, to);
 	}
-	
-	/**
-	 * Tests whether a converter between the given classes exists.
-	 * 
-	 * @param from
-	 * @param to
-	 * @return Whether a converter exists
-	 */
-	public static boolean converterExists(final Class<?> from, final Class<?> to) {
+
+	@Deprecated(forRemoval = true)
+	public static boolean converterExists(Class<?> from, Class<?> to) {
 		return org.skriptlang.skript.lang.converter.Converters.converterExists(from, to);
 	}
-	
-	public static boolean converterExists(final Class<?> from, final Class<?>... to) {
+
+	@Deprecated(forRemoval = true)
+	public static boolean converterExists(Class<?> from, Class<?>... to) {
 		return org.skriptlang.skript.lang.converter.Converters.converterExists(from, to);
 	}
-	
-	/**
-	 * Gets a converter
-	 * 
-	 * @param from
-	 * @param to
-	 * @return the converter or null if none exist
-	 */
-	@Nullable
-	public static <F, T> Converter<? super F, ? extends T> getConverter(final Class<F> from, final Class<T> to) {
+
+	@Deprecated(forRemoval = true)
+	public static <F, T> Converter<? super F, ? extends T> getConverter(Class<F> from, Class<T> to) {
 		org.skriptlang.skript.lang.converter.Converter<F, T> converter =
 			org.skriptlang.skript.lang.converter.Converters.getConverter(from, to);
 		if (converter == null)
 			return null;
 		return (Converter<F, T>) converter::convert;
 	}
-	
-	/**
-	 * Gets a converter that has been registered before.
-	 * 
-	 * @param from
-	 * @param to
-	 * @return The converter info or null if no converters were found.
-	 */
-	@Nullable
+
+	@Deprecated(forRemoval = true)
 	public static <F, T> ConverterInfo<? super F, ? extends T> getConverterInfo(Class<F> from, Class<T> to) {
 		org.skriptlang.skript.lang.converter.ConverterInfo<F, T> info =
 			org.skriptlang.skript.lang.converter.Converters.getConverterInfo(from, to);
@@ -191,20 +106,16 @@ public static boolean converterExists(final Class<?> from, final Class<?>... to)
 			return null;
 		return new ConverterInfo<>(info.getFrom(), info.getTo(), info.getConverter()::convert, info.getFlags());
 	}
-	
-	/**
-	 * @param from
-	 * @param to
-	 * @param conv
-	 * @return The converted array
-	 * @throws ArrayStoreException if the given class is not a superclass of all objects returned by the converter
-	 */
-	public static <F, T> T[] convertUnsafe(final F[] from, final Class<?> to, final Converter<? super F, ? extends T> conv) {
+
+	@Deprecated(forRemoval = true)
+	public static <F, T> T[] convertUnsafe(F[] from, Class<?> to,
+										   Converter<? super F, ? extends T> conv) {
 		return org.skriptlang.skript.lang.converter.Converters.convertUnsafe(from, to, conv::convert);
 	}
-	
-	public static <F, T> T[] convert(final F[] from, final Class<T> to, final Converter<? super F, ? extends T> conv) {
+
+	@Deprecated(forRemoval = true)
+	public static <F, T> T[] convert(F[] from, Class<T> to, Converter<? super F, ? extends T> conv) {
 		return org.skriptlang.skript.lang.converter.Converters.convert(from, to, conv::convert);
 	}
-	
+
 }
diff --git a/src/main/java/ch/njol/skript/registrations/DefaultClasses.java b/src/main/java/ch/njol/skript/registrations/DefaultClasses.java
index 2065e6a5ff0..54f6842e44b 100644
--- a/src/main/java/ch/njol/skript/registrations/DefaultClasses.java
+++ b/src/main/java/ch/njol/skript/registrations/DefaultClasses.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.registrations;
 
 import org.bukkit.Location;
@@ -32,31 +14,34 @@
 
 // When using these fields, be aware all ClassInfo's must be registered!
 public class DefaultClasses {
-	
+
 	public static ClassInfo<Object> OBJECT = getClassInfo(Object.class);
-	
+
+	// Java
 	public static ClassInfo<Number> NUMBER = getClassInfo(Number.class);
 	public static ClassInfo<Long> LONG = getClassInfo(Long.class);
 	public static ClassInfo<Boolean> BOOLEAN = getClassInfo(Boolean.class);
 	public static ClassInfo<String> STRING = getClassInfo(String.class);
-	
-	public static ClassInfo<World> WORLD = getClassInfo(World.class);
+
+	// Bukkit
+	public static ClassInfo<OfflinePlayer> OFFLINE_PLAYER = getClassInfo(OfflinePlayer.class);
 	public static ClassInfo<Location> LOCATION = getClassInfo(Location.class);
 	public static ClassInfo<Vector> VECTOR = getClassInfo(Vector.class);
-	
+	public static ClassInfo<Player> PLAYER = getClassInfo(Player.class);
+	public static ClassInfo<World> WORLD = getClassInfo(World.class);
+
+	// Skript
 	public static ClassInfo<Color> COLOR = getClassInfo(Color.class);
 	public static ClassInfo<Date> DATE = getClassInfo(Date.class);
 	public static ClassInfo<Timespan> TIMESPAN = getClassInfo(Timespan.class);
-	public static ClassInfo<OfflinePlayer> OFFLINE_PLAYER = getClassInfo(OfflinePlayer.class);
-	public static ClassInfo<Player> PLAYER = getClassInfo(Player.class);
 
 	@NotNull
-	private static <T> ClassInfo<T> getClassInfo(Class<T> tClass) {
+	private static <T> ClassInfo<T> getClassInfo(Class<T> type) {
 		//noinspection ConstantConditions
-		ClassInfo<T> classInfo = Classes.getExactClassInfo(tClass);
+		ClassInfo<T> classInfo = Classes.getExactClassInfo(type);
 		if (classInfo == null)
 			throw new NullPointerException();
 		return classInfo;
 	}
-	
+
 }
diff --git a/src/main/java/ch/njol/skript/registrations/EventValues.java b/src/main/java/ch/njol/skript/registrations/EventValues.java
index e53b7b220a2..fe8043d7e06 100644
--- a/src/main/java/ch/njol/skript/registrations/EventValues.java
+++ b/src/main/java/ch/njol/skript/registrations/EventValues.java
@@ -1,109 +1,24 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.registrations;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import org.bukkit.event.Event;
-import org.jetbrains.annotations.Nullable;
-
-import com.google.common.collect.ImmutableList;
 import ch.njol.skript.Skript;
-import org.skriptlang.skript.lang.converter.Converter;
-import org.skriptlang.skript.lang.converter.Converters;
 import ch.njol.skript.expressions.base.EventValueExpression;
 import ch.njol.skript.util.Getter;
 import ch.njol.util.Kleenean;
+import com.google.common.collect.ImmutableList;
+import org.bukkit.event.Event;
+import org.jetbrains.annotations.Nullable;
+import org.skriptlang.skript.lang.converter.Converter;
+import org.skriptlang.skript.lang.converter.Converters;
+
+import java.util.ArrayList;
+import java.util.List;
 
-/**
- * @author Peter Güttinger
- */
 public class EventValues {
-	
-	private EventValues() {}
-	
-	private final static class EventValueInfo<E extends Event, T> {
-		
-		public final Class<E> event;
-		public final Class<T> c;
-		public final Getter<T, E> getter;
-		@Nullable
-		public final Class<? extends E>[] excludes;
-		@Nullable
-		public final String excludeErrorMessage;
-		
-		public EventValueInfo(Class<E> event, Class<T> c, Getter<T, E> getter, @Nullable String excludeErrorMessage, @Nullable Class<? extends E>[] excludes) {
-			assert event != null;
-			assert c != null;
-			assert getter != null;
-			this.event = event;
-			this.c = c;
-			this.getter = getter;
-			this.excludes = excludes;
-			this.excludeErrorMessage = excludeErrorMessage;
-		}
-		
-		/**
-		 * Get the class that represents the Event.
-		 * @return The class of the Event associated with this event value
-		 */
-		public Class<E> getEventClass() {
-			return event;
-		}
-		
-		/**
-		 * Get the class that represents Value.
-		 * @return The class of the Value associated with this event value
-		 */
-		public Class<T> getValueClass() {
-			return c;
-		}
-		
-		/**
-		 * Get the classes that represent the excluded for this Event value.
-		 * @return The classes of the Excludes associated with this event value
-		 */
-		@Nullable
-		public Class<? extends E>[] getExcludes() {
-			if (excludes != null)
-				return Arrays.copyOf(excludes, excludes.length);
-			return new Class[0];
-		}
-		
-		/**
-		 * Get the error message used when encountering an exclude value.
-		 * @return The error message to use when encountering an exclude
-		 */
-		@Nullable
-		public String getExcludeErrorMessage() {
-			return excludeErrorMessage;
-		}
-	}
 
-	private final static List<EventValueInfo<?, ?>> defaultEventValues = new ArrayList<>(30);
-	private final static List<EventValueInfo<?, ?>> futureEventValues = new ArrayList<>();
-	private final static List<EventValueInfo<?, ?>> pastEventValues = new ArrayList<>();
+	private EventValues() {}
 
 	/**
-	 * The past time of an event value. Represented by "past" or "former".
+	 * The past value of an event value. Represented by "past" or "former".
 	 */
 	public static final int TIME_PAST = -1;
 
@@ -117,6 +32,10 @@ public String getExcludeErrorMessage() {
 	 */
 	public static final int TIME_FUTURE = 1;
 
+	private final static List<EventValueInfo<?, ?>> defaultEventValues = new ArrayList<>(30);
+	private final static List<EventValueInfo<?, ?>> futureEventValues = new ArrayList<>();
+	private final static List<EventValueInfo<?, ?>> pastEventValues = new ArrayList<>();
+
 	/**
 	 * Get Event Values list for the specified time
 	 * @param time The time of the event values. One of
@@ -137,27 +56,43 @@ public String getExcludeErrorMessage() {
 		throw new IllegalArgumentException("time must be -1, 0, or 1");
 	}
 
+	/**
+	 * Registers an event value, specified by the provided {@link Converter}, with excluded events.
+	 * Uses the default time, {@link #TIME_NOW}.
+	 *
+	 * @see #registerEventValue(Class, Class, Converter, int)
+	 */
+	public static <T, E extends Event> void registerEventValue(
+		Class<E> event, Class<T> type,
+		Converter<E, T> converter
+	) {
+		registerEventValue(event, type, converter, TIME_NOW);
+	}
+
 	/**
 	 * Registers an event value.
-	 * 
+	 *
 	 * @param event the event type class.
-	 * @param type the return type of the getter for the event value.
-	 * @param getter the getter to get the value with the provided event.
+	 * @param type the return type of the converter for the event value.
+	 * @param converter the converter to get the value with the provided event.
 	 * @param time value of TIME_PAST if this is the value before the event, TIME_FUTURE if after, and TIME_NOW if it's the default or this value doesn't have distinct states.
 	 *            <b>Always register a default state!</b> You can leave out one of the other states instead, e.g. only register a default and a past state. The future state will
 	 *            default to the default state in this case.
 	 */
-	public static <T, E extends Event> void registerEventValue(Class<E> event, Class<T> type, Getter<T, E> getter, int time) {
-		registerEventValue(event, type, getter, time, null, (Class<? extends E>[]) null);
+	public static <T, E extends Event> void registerEventValue(
+		Class<E> event, Class<T> type,
+		Converter<E, T> converter, int time
+	) {
+		registerEventValue(event, type, converter, time, null, (Class<? extends E>[]) null);
 	}
 
 	/**
 	 * Registers an event value and with excluded events.
 	 * Excluded events are events that this event value can't operate in.
-	 * 
+	 *
 	 * @param event the event type class.
-	 * @param type the return type of the getter for the event value.
-	 * @param getter the getter to get the value with the provided event.
+	 * @param type the return type of the converter for the event value.
+	 * @param converter the converter to get the value with the provided event.
 	 * @param time value of TIME_PAST if this is the value before the event, TIME_FUTURE if after, and TIME_NOW if it's the default or this value doesn't have distinct states.
 	 *            <b>Always register a default state!</b> You can leave out one of the other states instead, e.g. only register a default and a past state. The future state will
 	 *            default to the default state in this case.
@@ -165,9 +100,16 @@ public static <T, E extends Event> void registerEventValue(Class<E> event, Class
 	 * @param excludes subclasses of the event for which this event value should not be registered for
 	 */
 	@SafeVarargs
-	public static <T, E extends Event> void registerEventValue(Class<E> event, Class<T> type, Getter<T, E> getter, int time, @Nullable String excludeErrorMessage, @Nullable Class<? extends E>... excludes) {
+	public static <T, E extends Event> void registerEventValue(
+		Class<E> event, Class<T> type,
+		Converter<E, T> converter, int time,
+		@Nullable String excludeErrorMessage,
+		@Nullable Class<? extends E>... excludes
+	) {
 		Skript.checkAcceptRegistrations();
 		List<EventValueInfo<?, ?>> eventValues = getEventValuesList(time);
+		EventValueInfo<E, T> element = new EventValueInfo<>(event, type, converter, excludeErrorMessage, excludes);
+
 		for (int i = 0; i < eventValues.size(); i++) {
 			EventValueInfo<?, ?> info = eventValues.get(i);
 			// We don't care for exact duplicates. Prefer Skript's over any addon.
@@ -176,11 +118,38 @@ public static <T, E extends Event> void registerEventValue(Class<E> event, Class
 			// If the events don't match, we prefer the highest subclass event.
 			// If the events match, we prefer the highest subclass type.
 			if (!info.event.equals(event) ? info.event.isAssignableFrom(event) : info.c.isAssignableFrom(type)) {
-				eventValues.add(i, new EventValueInfo<>(event, type, getter, excludeErrorMessage, excludes));
+				eventValues.add(i, element);
 				return;
 			}
 		}
-		eventValues.add(new EventValueInfo<>(event, type, getter, excludeErrorMessage, excludes));
+		eventValues.add(element);
+	}
+
+	/**
+	 * @deprecated Use {@link #registerEventValue(Class, Class, Converter, int, String, Class[])} instead.
+	 */
+	@Deprecated(forRemoval = true)
+	@SafeVarargs
+	@SuppressWarnings({"removal"})
+	public static <T, E extends Event> void registerEventValue(
+		Class<E> event, Class<T> type,
+		Getter<T, E> getter, int time,
+		@Nullable String excludeErrorMessage,
+		@Nullable Class<? extends E>... excludes
+	) {
+		registerEventValue(event, type, (Converter<E, T>) getter, time, excludeErrorMessage, excludes);
+	}
+
+	/**
+	 * @deprecated Use {@link #registerEventValue(Class, Class, Converter, int)} instead.
+	 */
+	@Deprecated(forRemoval = true)
+	@SuppressWarnings({"removal"})
+	public static <T, E extends Event> void registerEventValue(
+		Class<E> event, Class<T> type,
+		Getter<T, E> getter, int time
+	) {
+		registerEventValue(event, type, (Converter<E, T>) getter, time);
 	}
 
 	/**
@@ -188,37 +157,47 @@ public static <T, E extends Event> void registerEventValue(Class<E> event, Class
 	 * <p>
 	 * It is recommended to use {@link EventValues#getEventValueGetter(Class, Class, int)} or {@link EventValueExpression#EventValueExpression(Class)} instead of invoking this
 	 * method repeatedly.
-	 * 
+	 *
 	 * @param e event
 	 * @param c return type of getter
 	 * @param time -1 if this is the value before the event, 1 if after, and 0 if it's the default or this value doesn't have distinct states.
 	 *            <b>Always register a default state!</b> You can leave out one of the other states instead, e.g. only register a default and a past state. The future state will
 	 *            default to the default state in this case.
 	 * @return The event's value
-	 * @see #registerEventValue(Class, Class, Getter, int)
+	 * @see #registerEventValue(Class, Class, Converter, int)
 	 */
-	@Nullable
-	public static <T, E extends Event> T getEventValue(E e, Class<T> c, int time) {
-		@SuppressWarnings("unchecked")
-		Getter<? extends T, ? super E> getter = getEventValueGetter((Class<E>) e.getClass(), c, time);
-		if (getter == null)
+	public static <T, E extends Event> @Nullable T getEventValue(E e, Class<T> c, int time) {
+		//noinspection unchecked
+		Converter<? super E, ? extends T> converter = getEventValueConverter((Class<E>) e.getClass(), c, time);
+		if (converter == null)
 			return null;
-		return getter.get(e);
+		return converter.convert(e);
 	}
 
 	/**
-	 * Checks that a getter exists for the exact type. No converting or subclass checking.
-	 * 
+	 * @deprecated Use {@link #getExactEventValueConverter(Class, Class, int)} instead.
+	 */
+	@Nullable
+	@Deprecated(forRemoval = true)
+	@SuppressWarnings({"removal"})
+	public static <T, E extends Event> Getter<? extends T, ? super E> getExactEventValueGetter(Class<E> event, Class<T> c, int time) {
+		return toGetter(getExactEventValueConverter(event, c, time));
+	}
+
+	/**
+	 * Checks that a {@link Converter} exists for the exact type. No converting or subclass checking.
+	 *
 	 * @param event the event class the getter will be getting from
-	 * @param c type of getter
+	 * @param c type of {@link Converter}
 	 * @param time the event-value's time
 	 * @return A getter to get values for a given type of events
-	 * @see #registerEventValue(Class, Class, Getter, int)
+	 * @see #registerEventValue(Class, Class, Converter, int)
 	 * @see EventValueExpression#EventValueExpression(Class)
 	 */
 	@Nullable
-	@SuppressWarnings("unchecked")
-	public static <T, E extends Event> Getter<? extends T, ? super E> getExactEventValueGetter(Class<E> event, Class<T> c, int time) {
+	public static <E extends Event, T> Converter<? super E, ? extends T> getExactEventValueConverter(
+		Class<E> event, Class<T> c, int time
+	) {
 		List<EventValueInfo<?, ?>> eventValues = getEventValuesList(time);
 		// First check for exact classes matching the parameters.
 		for (EventValueInfo<?, ?> eventValueInfo : eventValues) {
@@ -227,54 +206,78 @@ public static <T, E extends Event> T getEventValue(E e, Class<T> c, int time) {
 			if (!checkExcludes(eventValueInfo, event))
 				return null;
 			if (eventValueInfo.event.isAssignableFrom(event))
-				return (Getter<? extends T, ? super E>) eventValueInfo.getter;
+				//noinspection unchecked
+				return (Converter<? super E, ? extends T>) eventValueInfo.converter;
 		}
 		return null;
 	}
 
 	/**
-	 * Checks if an event has multiple getters, including default ones.
-	 * 
-	 * @param event the event class the getter will be getting from.
-	 * @param type type of getter.
-	 * @param time the event-value's time.
-	 * @return true or false if the event and type have multiple getters.
+	 * @deprecated Use {@link #hasMultipleConverters(Class, Class, int)} instead.
 	 */
+	@Deprecated(forRemoval = true)
 	public static <T, E extends Event> Kleenean hasMultipleGetters(Class<E> event, Class<T> type, int time) {
-		List<Getter<? extends T, ? super E>> getters = getEventValueGetters(event, type, time, true, false);
+		return hasMultipleConverters(event, type, time);
+	}
+
+	/**
+	 * Checks if an event has multiple {@link Converter}s, including default ones.
+	 *
+	 * @param event the event class the {@link Converter} will be getting from.
+	 * @param type type of {@link Converter}.
+	 * @param time the event-value's time.
+	 * @return true or false if the event and type have multiple {@link Converter}s.
+	 */
+	public static <T, E extends Event> Kleenean hasMultipleConverters(Class<E> event, Class<T> type, int time) {
+		List<Converter<? super E, ? extends T>> getters = getEventValueConverters(event, type, time, true, false);
 		if (getters == null)
 			return Kleenean.UNKNOWN;
 		return Kleenean.get(getters.size() > 1);
 	}
 
 	/**
-	 * Returns a getter to get a value from in an event.
+	 * @deprecated Use {@link #getEventValueConverter(Class, Class, int)} instead.
+	 */
+	@Nullable
+	@Deprecated(forRemoval = true)
+	@SuppressWarnings({"removal"})
+	public static <T, E extends Event> Getter<? extends T, ? super E> getEventValueGetter(Class<E> event, Class<T> type, int time) {
+		return toGetter(getEventValueConverter(event, type, time, true));
+	}
+
+	/**
+	 * Returns a {@link Converter} to get a value from in an event.
 	 * <p>
 	 * Can print an error if the event value is blocked for the given event.
-	 * 
-	 * @param event the event class the getter will be getting from.
-	 * @param type type of getter.
+	 *
+	 * @param event the event class the {@link Converter} will be getting from.
+	 * @param type type of {@link Converter}.
 	 * @param time the event-value's time.
 	 * @return A getter to get values for a given type of events.
-	 * @see #registerEventValue(Class, Class, Getter, int)
+	 * @see #registerEventValue(Class, Class, Converter, int)
 	 * @see EventValueExpression#EventValueExpression(Class)
 	 */
-	@Nullable
-	public static <T, E extends Event> Getter<? extends T, ? super E> getEventValueGetter(Class<E> event, Class<T> type, int time) {
-		return getEventValueGetter(event, type, time, true);
+	public static <T, E extends Event> @Nullable Converter<? super E, ? extends T> getEventValueConverter(
+		Class<E> event, Class<T> type, int time
+	) {
+		return getEventValueConverter(event, type, time, true);
 	}
 
 	@Nullable
-	private static <T, E extends Event> Getter<? extends T, ? super E> getEventValueGetter(Class<E> event, Class<T> type, int time, boolean allowDefault) {
-		List<Getter<? extends T, ? super E>> list = getEventValueGetters(event, type, time, allowDefault);
+	private static <T, E extends Event> Converter<? super E, ? extends T> getEventValueConverter(
+		Class<E> event, Class<T> type, int time, boolean allowDefault
+	) {
+		List<Converter<? super E, ? extends T>> list = getEventValueConverters(event, type, time, allowDefault);
 		if (list == null || list.isEmpty())
 			return null;
 		return list.get(0);
 	}
 
 	@Nullable
-	private static <T, E extends Event> List<Getter<? extends T, ? super E>> getEventValueGetters(Class<E> event, Class<T> type, int time, boolean allowDefault) {
-		return getEventValueGetters(event, type, time, allowDefault, true);
+	private static <T, E extends Event> List<Converter<? super E, ? extends T>> getEventValueConverters(
+		Class<E> event, Class<T> type, int time, boolean allowDefault
+	) {
+		return getEventValueConverters(event, type, time, allowDefault, true);
 	}
 
 	/*
@@ -283,11 +286,14 @@ public static <T, E extends Event> Kleenean hasMultipleGetters(Class<E> event, C
 	 */
 	@Nullable
 	@SuppressWarnings("unchecked")
-	private static <T, E extends Event> List<Getter<? extends T, ? super E>> getEventValueGetters(Class<E> event, Class<T> type, int time, boolean allowDefault, boolean allowConverting) {
+	private static <T, E extends Event> List<Converter<? super E, ? extends T>> getEventValueConverters(
+		Class<E> event, Class<T> type, int time,
+		boolean allowDefault, boolean allowConverting
+	) {
 		List<EventValueInfo<?, ?>> eventValues = getEventValuesList(time);
-		List<Getter<? extends T, ? super E>> list = new ArrayList<>();
+		List<Converter<? super E, ? extends T>> list = new ArrayList<>();
 		// First check for exact classes matching the parameters.
-		Getter<? extends T, ? super E> exact = (Getter<? extends T, ? super E>) getExactEventValueGetter(event, type, time);
+		Converter<? super E, ? extends T> exact = getExactEventValueConverter(event, type, time);
 		if (exact != null) {
 			list.add(exact);
 			return list;
@@ -299,21 +305,16 @@ public static <T, E extends Event> Kleenean hasMultipleGetters(Class<E> event, C
 			if (!checkExcludes(eventValueInfo, event))
 				return null;
 			if (eventValueInfo.event.isAssignableFrom(event)) {
-				list.add((Getter<? extends T, ? super E>) eventValueInfo.getter);
+				list.add((Converter<? super E, ? extends T>) eventValueInfo.converter);
 				continue;
 			}
 			if (!event.isAssignableFrom(eventValueInfo.event))
 				continue;
-			list.add(new Getter<T, E>() {
-				@Override
-				@Nullable
-				public T get(E event) {
-					if (!eventValueInfo.event.isInstance(event))
-						return null;
-					return ((Getter<? extends T, E>) eventValueInfo.getter).get(event);
-				}
+			list.add(e -> {
+				if (!eventValueInfo.event.isInstance(e))
+					return null;
+				return ((Converter<? super E, ? extends T>) eventValueInfo.converter).convert(e);
 			});
-			continue;
 		}
 		if (!list.isEmpty())
 			return list;
@@ -327,21 +328,18 @@ public T get(E event) {
 			boolean checkInstanceOf = !eventValueInfo.event.isAssignableFrom(event);
 			if (checkInstanceOf && !event.isAssignableFrom(eventValueInfo.event))
 				continue;
+
 			if (!checkExcludes(eventValueInfo, event))
 				return null;
-			list.add(new Getter<T, E>() {
-				@Override
-				@Nullable
-				public T get(E event) {
-					if (checkInstanceOf && !eventValueInfo.event.isInstance(event))
-						return null;
-					Object object = ((Getter<? super T, ? super E>) eventValueInfo.getter).get(event);
-					if (type.isInstance(object))
-						return (T) object;
+
+			list.add(e -> {
+				if (checkInstanceOf && !eventValueInfo.event.isInstance(e))
 					return null;
-				}
+				T object = ((Converter<? super E, ? extends T>) eventValueInfo.converter).convert(e);
+				if (type.isInstance(object))
+					return object;
+				return null;
 			});
-			continue;
 		}
 		if (!list.isEmpty())
 			return list;
@@ -350,14 +348,15 @@ public T get(E event) {
 		for (EventValueInfo<?, ?> eventValueInfo : eventValues) {
 			if (!event.equals(eventValueInfo.event))
 				continue;
-			
-			Getter<? extends T, ? super E> getter = (Getter<? extends T, ? super E>) getConvertedGetter(eventValueInfo, type, false);
-			if (getter == null)
+
+			Converter<? super E, ? extends T> converter = (Converter<? super E, ? extends T>)
+				getConvertedConverter(eventValueInfo, type, false);
+			if (converter == null)
 				continue;
-			
+
 			if (!checkExcludes(eventValueInfo, event))
 				return null;
-			list.add(getter);
+			list.add(converter);
 			continue;
 		}
 		if (!list.isEmpty())
@@ -368,27 +367,28 @@ public T get(E event) {
 			if (!event.isAssignableFrom(eventValueInfo.event))
 				continue;
 
-			Getter<? extends T, ? super E> getter = (Getter<? extends T, ? super E>) getConvertedGetter(eventValueInfo, type, true);
-			if (getter == null)
+			Converter<? super E, ? extends T> converter = (Converter<? super E, ? extends T>)
+				getConvertedConverter(eventValueInfo, type, true);
+			if (converter == null)
 				continue;
 
 			if (!checkExcludes(eventValueInfo, event))
 				return null;
-			list.add(getter);
+			list.add(converter);
 			continue;
 		}
 		if (!list.isEmpty())
 			return list;
 		// If the check should try again matching event values with a 0 time (most event values).
 		if (allowDefault && time != 0)
-			return getEventValueGetters(event, type, 0, false);
+			return getEventValueConverters(event, type, 0, false);
 		return null;
 	}
 
 	/**
 	 * Check if the event value states to exclude events.
 	 * False if the current EventValueInfo cannot operate in the provided event.
-	 * 
+	 *
 	 * @param info The event value info that will be used to grab the value from
 	 * @param event The event class to check the excludes against.
 	 * @return boolean if true the event value passes for the events.
@@ -407,37 +407,64 @@ private static boolean checkExcludes(EventValueInfo<?, ?> info, Class<? extends
 
 	/**
 	 * Return a converter wrapped in a getter that will grab the requested value by converting from the given event value info.
-	 * 
+	 *
 	 * @param info The event value info that will be used to grab the value from
 	 * @param to The class that the converter will look for to convert the type from the event value to
 	 * @param checkInstanceOf If the event must be an exact instance of the event value info's event or not.
 	 * @return The found Converter wrapped in a Getter object, or null if no Converter was found.
 	 */
 	@Nullable
-	private static <E extends Event, F, T> Getter<? extends T, ? super E> getConvertedGetter(EventValueInfo<E, F> info, Class<T> to, boolean checkInstanceOf) {
+	private static <E extends Event, F, T> Converter<? super E, ? extends T> getConvertedConverter(
+		EventValueInfo<E, F> info, Class<T> to, boolean checkInstanceOf
+	) {
 		Converter<? super F, ? extends T> converter = Converters.getConverter(info.c, to);
+
+		if (converter == null)
+			return null;
+
+		return event -> {
+			if (checkInstanceOf && !info.event.isInstance(event))
+				return null;
+			F f = info.converter.convert(event);
+			if (f == null)
+				return null;
+			return converter.convert(f);
+		};
+	}
+
+	@Deprecated(forRemoval = true)
+	@SuppressWarnings({"removal"})
+	private static <A, B> Getter<B, A> toGetter(Converter<A, B> converter) {
 		if (converter == null)
 			return null;
-		return new Getter<T, E>() {
+
+		return new Getter<>() {
 			@Override
-			@Nullable
-			public T get(E e) {
-				if (checkInstanceOf && !info.event.isInstance(e))
-					return null;
-				F f = info.getter.get(e);
-				if (f == null)
-					return null;
-				return converter.convert(f);
+			public @Nullable B get(A arg) {
+				return converter.convert(arg);
 			}
 		};
 	}
 
 	public static boolean doesExactEventValueHaveTimeStates(Class<? extends Event> event, Class<?> c) {
-		return getExactEventValueGetter(event, c, TIME_PAST) != null || getExactEventValueGetter(event, c, TIME_FUTURE) != null;
+		return getExactEventValueConverter(event, c, TIME_PAST) != null || getExactEventValueConverter(event, c, TIME_FUTURE) != null;
 	}
 
 	public static boolean doesEventValueHaveTimeStates(Class<? extends Event> event, Class<?> c) {
-		return getEventValueGetter(event, c, TIME_PAST, false) != null || getEventValueGetter(event, c, TIME_FUTURE, false) != null;
+		return getEventValueConverter(event, c, TIME_PAST, false) != null || getEventValueConverter(event, c, TIME_FUTURE, false) != null;
+	}
+
+	private record EventValueInfo<E extends Event, T>(
+		Class<E> event, Class<T> c, Converter<E, T> converter,
+		@Nullable String excludeErrorMessage,
+		@Nullable Class<? extends E>[] excludes
+	) {
+		private EventValueInfo {
+			assert event != null;
+			assert c != null;
+			assert converter != null;
+		}
+
 	}
-	
+
 }
diff --git a/src/main/java/ch/njol/skript/registrations/Feature.java b/src/main/java/ch/njol/skript/registrations/Feature.java
index 7b9f19b1d7f..1001e767f07 100644
--- a/src/main/java/ch/njol/skript/registrations/Feature.java
+++ b/src/main/java/ch/njol/skript/registrations/Feature.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.registrations;
 
 import ch.njol.skript.SkriptAddon;
@@ -29,6 +11,10 @@
  * Experimental feature toggles as provided by Skript itself.
  */
 public enum Feature implements Experiment {
+	EXAMPLES("examples", LifeCycle.STABLE),
+	QUEUES("queues", LifeCycle.EXPERIMENTAL),
+	FOR_EACH_LOOPS("for loop", LifeCycle.EXPERIMENTAL, "for [each] loop[s]"),
+	SCRIPT_REFLECTION("reflection", LifeCycle.EXPERIMENTAL, "[script] reflection"),
 	;
 
 	private final String codeName;
@@ -38,21 +24,11 @@ public enum Feature implements Experiment {
 	Feature(String codeName, LifeCycle phase, String... patterns) {
 		this.codeName = codeName;
 		this.phase = phase;
-		switch (patterns.length) {
-			case 0:
-				this.compiledPattern = PatternCompiler.compile(codeName);
-				break;
-			case 1:
-				this.compiledPattern = PatternCompiler.compile(patterns[0]);
-				break;
-			default:
-				this.compiledPattern = PatternCompiler.compile('(' + String.join("|", patterns) + ')');
-				break;
-		}
-	}
-
-	Feature(String codeName, LifeCycle phase) {
-		this(codeName, phase, codeName);
+		this.compiledPattern = switch (patterns.length) {
+			case 0 -> PatternCompiler.compile(codeName);
+			case 1 -> PatternCompiler.compile(patterns[0]);
+			default -> PatternCompiler.compile('(' + String.join("|", patterns) + ')');
+		};
 	}
 
 	public static void registerAll(SkriptAddon addon, ExperimentRegistry manager) {
diff --git a/src/main/java/ch/njol/skript/sections/EffSecShoot.java b/src/main/java/ch/njol/skript/sections/EffSecShoot.java
new file mode 100644
index 00000000000..b691d78bafb
--- /dev/null
+++ b/src/main/java/ch/njol/skript/sections/EffSecShoot.java
@@ -0,0 +1,318 @@
+package ch.njol.skript.sections;
+
+import ch.njol.skript.Skript;
+import ch.njol.skript.config.SectionNode;
+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.entity.EntityData;
+import ch.njol.skript.lang.EffectSection;
+import ch.njol.skript.lang.Expression;
+import ch.njol.skript.lang.SkriptParser.ParseResult;
+import ch.njol.skript.lang.Trigger;
+import ch.njol.skript.lang.TriggerItem;
+import ch.njol.skript.registrations.EventValues;
+import ch.njol.skript.util.Direction;
+import ch.njol.skript.variables.Variables;
+import ch.njol.util.Kleenean;
+import org.bukkit.Location;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.Fireball;
+import org.bukkit.entity.LivingEntity;
+import org.bukkit.entity.Projectile;
+import org.bukkit.event.Event;
+import org.bukkit.event.HandlerList;
+import org.bukkit.util.Vector;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.lang.reflect.Method;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.function.Consumer;
+
+@Name("Shoot")
+@Description("Shoots a projectile (or any other entity) from a given entity or location.")
+@Examples({
+	"shoot arrow from all players at speed 2",
+	"shoot a pig from all players:",
+		"\tadd event-entity to {_projectiles::*}"
+})
+@Since("2.10")
+public class EffSecShoot extends EffectSection {
+
+	//TODO: Remove reflect method once 1.19 is no longer supported
+
+	private enum CaseUsage {
+		NOT_PROJECTILE_NO_TRIGGER {
+			@Override
+			public @Nullable Entity shootHandler(EntityData<?> entityData, LivingEntity shooter, Location location, Class<? extends Entity> type, Vector vector, Consumer<?> consumer) {
+				return entityData.spawn(location);
+			}
+		},
+		NOT_PROJECTILE_TRIGGER {
+			@Override
+			public @Nullable Entity shootHandler(EntityData<?> entityData, LivingEntity shooter, Location location, Class<? extends Entity> type, Vector vector, Consumer<?> consumer) {
+				//noinspection unchecked,rawtypes
+				entityData.spawn(location, (Consumer) consumer);
+				return null;
+			}
+		},
+		PROJECTILE_NO_WORLD_NO_TRIGGER {
+			@Override
+			public @NotNull Entity shootHandler(EntityData<?> entityData, LivingEntity shooter, Location location, Class<? extends Entity> type, Vector vector, Consumer<?> consumer) {
+				//noinspection unchecked
+				Projectile projectile = shooter.launchProjectile((Class<? extends Projectile>) type);
+				set(projectile, entityData);
+				return projectile;
+			}
+		},
+		PROJECTILE_NO_WORLD_TRIGGER_BUKKIT {
+			@Override
+			public @Nullable Entity shootHandler(EntityData<?> entityData, LivingEntity shooter, Location location, Class<? extends Entity> type, Vector vector, Consumer<?> consumer) {
+				return null;
+			}
+		},
+		PROJECTILE_NO_WORLD_TRIGGER {
+			@Override
+			public @Nullable Entity shootHandler(EntityData<?> entityData, LivingEntity shooter, Location location, Class<? extends Entity> type, Vector vector, Consumer<?> consumer) {
+				//noinspection unchecked,rawtypes
+				shooter.launchProjectile((Class<? extends Projectile>) type, vector, (Consumer) consumer);
+				return null;
+			}
+		},
+		PROJECTILE_WORLD_NO_TRIGGER {
+			@Override
+			public @NotNull Entity shootHandler(EntityData<?> entityData, LivingEntity shooter, Location location, Class<? extends Entity> type, Vector vector, Consumer<?> consumer) {
+				Projectile projectile = (Projectile) shooter.getWorld().spawn(location, type);
+				projectile.setShooter(shooter);
+				return projectile;
+			}
+		},
+		PROJECTILE_WORLD_TRIGGER {
+			@Override
+			public @Nullable Entity shootHandler(EntityData<?> entityData, LivingEntity shooter, Location location, Class<? extends Entity> type, Vector vector, Consumer<?> consumer) {
+				//noinspection unchecked,rawtypes
+				shooter.getWorld().spawn(location, type, (Consumer) consumer);
+				return null;
+			}
+		};
+
+		/**
+		 * Handles spawning the entity/projectile based on the conditions of the effect and the server
+		 * @param entityData The {@link EntityData} to be spawned
+		 * @param shooter The {@link LivingEntity} that is being used to shoot {@code entityData} from
+		 * @param location The {@link Location} to spawn the {@code entityData} if {@code shooter} is not to be used
+		 * @param type The {@link Class<org.bukkit.entity.EntityType>} from {@code entityData} used to be spawned if {@code entityData} is not to be used
+		 * @param vector The {@link Vector} to set the vector of the spawned entity from {@code entityData} or {@code type}
+		 * @param consumer The {@link Consumer} to be used when spawning the entity from {@code entityDataa} or {@code type}
+		 * @return The spawned {@link Entity}
+		 */
+		public abstract @Nullable Entity shootHandler(EntityData<?> entityData, LivingEntity shooter, Location location, Class<? extends Entity> type, Vector vector, Consumer<?> consumer);
+	}
+
+	public static class ShootEvent extends Event {
+
+		private Entity projectile;
+		private @Nullable LivingEntity shooter;
+
+		public ShootEvent(Entity projectile, @Nullable LivingEntity shooter) {
+			this.projectile = projectile;
+			this.shooter = shooter;
+		}
+
+		public Entity getProjectile() {
+			return projectile;
+		}
+
+		public @Nullable LivingEntity getShooter() {
+			return shooter;
+		}
+
+		@Override
+		public @NotNull HandlerList getHandlers() {
+			throw new IllegalStateException();
+		}
+	}
+
+	private static final boolean RUNNING_PAPER;
+	private static Method launchWithBukkitConsumer;
+
+	static {
+		Skript.registerSection(EffSecShoot.class,
+			"shoot %entitydatas% [from %livingentities/locations%] [(at|with) (speed|velocity) %-number%] [%-direction%]",
+			"(make|let) %livingentities/locations% shoot %entitydatas% [(at|with) (speed|velocity) %-number%] [%-direction%]"
+		);
+		EventValues.registerEventValue(ShootEvent.class, Entity.class, ShootEvent::getProjectile, EventValues.TIME_NOW);
+		EventValues.registerEventValue(ShootEvent.class, Projectile.class, shootEvent -> shootEvent.getProjectile()
+			instanceof Projectile projectile ? projectile : null,
+			EventValues.TIME_NOW);
+
+		if (!Skript.isRunningMinecraft(1, 20, 3)) {
+			try {
+				launchWithBukkitConsumer = LivingEntity.class.getMethod("launchProjectile", Class.class, Vector.class, org.bukkit.util.Consumer.class);
+			} catch (NoSuchMethodException ignored) {}
+		}
+		boolean launchHasJavaConsumer = Skript.methodExists(LivingEntity.class, "launchProjectile", Class.class, Vector.class, Consumer.class);
+		RUNNING_PAPER = launchWithBukkitConsumer != null || launchHasJavaConsumer;
+	}
+
+	private final static Double DEFAULT_SPEED = 5.;
+	private Expression<EntityData<?>> types;
+	private Expression<?> shooters;
+	private @Nullable Expression<Number> velocity;
+	private @Nullable Expression<Direction> direction;
+	public static Entity lastSpawned = null;
+	private @Nullable Trigger trigger;
+
+	@Override
+	public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelayed, ParseResult parseResult, @Nullable SectionNode sectionNode, @Nullable List<TriggerItem> triggerItems) {
+		//noinspection unchecked
+		types = (Expression<EntityData<?>>) exprs[matchedPattern];
+		shooters = exprs[1 - matchedPattern];
+		//noinspection unchecked
+		velocity = (Expression<Number>) exprs[2];
+		//noinspection unchecked
+		direction = (Expression<Direction>) exprs[3];
+
+		if (sectionNode != null) {
+			AtomicBoolean delayed = new AtomicBoolean(false);
+			Runnable afterLoading = () -> delayed.set(!getParser().getHasDelayBefore().isFalse());
+			trigger = loadCode(sectionNode, "shoot", afterLoading, ShootEvent.class);
+			if (delayed.get()) {
+				Skript.error("Delays cannot be used within a 'shoot' effect section");
+				return false;
+			}
+		}
+		return true;
+	}
+
+	@Override
+	protected @Nullable TriggerItem walk(Event event) {
+		lastSpawned = null;
+		Number finalVelocity = velocity != null ? velocity.getSingle(event) : DEFAULT_SPEED;
+		Direction finalDirection = direction != null ? direction.getSingle(event) : Direction.IDENTITY;
+		if (finalVelocity == null || finalDirection == null)
+			return null;
+		EntityData<?>[] data = types.getArray(event);
+
+		for (Object shooter : shooters.getArray(event)) {
+			for (EntityData<?> entityData : data) {
+				Entity finalProjectile = null;
+				Vector vector;
+				if (shooter instanceof LivingEntity livingShooter) {
+					vector = finalDirection.getDirection(livingShooter.getLocation()).multiply(finalVelocity.doubleValue());
+					//noinspection rawtypes
+					Consumer afterSpawn = afterSpawn(event, entityData, livingShooter);
+					Class<? extends Entity> type = entityData.getType();
+					Location shooterLoc = livingShooter.getLocation();
+					shooterLoc.setY(shooterLoc.getY() + livingShooter.getEyeHeight() / 2);
+					boolean isProjectile = false, useWorldSpawn = false;
+					if (Fireball.class.isAssignableFrom(type)) {
+						shooterLoc = livingShooter.getEyeLocation().add(vector.clone().normalize().multiply(0.5));
+						isProjectile = true;
+						useWorldSpawn = true;
+					} else if (Projectile.class.isAssignableFrom(type)) {
+						isProjectile = true;
+						if (trigger != null && !RUNNING_PAPER) {
+							useWorldSpawn = true;
+						}
+					}
+
+					CaseUsage caseUsage = getCaseUsage(isProjectile, useWorldSpawn, trigger != null);
+					if (caseUsage == CaseUsage.PROJECTILE_NO_WORLD_TRIGGER_BUKKIT) {
+						try {
+							launchWithBukkitConsumer.invoke(livingShooter, type, vector, afterSpawnBukkit(event, entityData, livingShooter));
+						} catch (Exception ignored) {}
+					} else {
+						finalProjectile = caseUsage.shootHandler(entityData, livingShooter, shooterLoc, type, vector, afterSpawn);
+					}
+				} else {
+					vector = finalDirection.getDirection((Location) shooter).multiply(finalVelocity.doubleValue());
+					if (trigger != null) {
+						//noinspection unchecked,rawtypes
+						entityData.spawn((Location) shooter, (Consumer) afterSpawn(event, entityData, null));
+					} else {
+						finalProjectile = entityData.spawn((Location) shooter);
+					}
+				}
+				if (finalProjectile != null) {
+					finalProjectile.setVelocity(vector);
+					lastSpawned = finalProjectile;
+				}
+			}
+		}
+
+		return super.walk(event, false);
+	}
+
+	@Override
+	public String toString(@Nullable Event event, boolean debug) {
+		return "shoot " + types.toString(event, debug) + " from " + shooters.toString(event, debug)
+			+ (velocity != null ? " at speed " + velocity.toString(event, debug) : "")
+			+ (direction != null ? " " + direction.toString(event, debug) : "");
+	}
+
+	private static <E extends Entity> void set(Entity entity, EntityData<E> entityData) {
+		//noinspection unchecked
+		entityData.set((E) entity);
+	}
+
+	private CaseUsage getCaseUsage(Boolean isProjectile, Boolean useWorldSpawn, Boolean hasTrigger) {
+		if (!isProjectile) {
+			if (!hasTrigger)
+				return CaseUsage.NOT_PROJECTILE_NO_TRIGGER;
+			return CaseUsage.NOT_PROJECTILE_TRIGGER;
+		}
+		if (!useWorldSpawn) {
+			if (!hasTrigger)
+				return CaseUsage.PROJECTILE_NO_WORLD_NO_TRIGGER;
+			if (launchWithBukkitConsumer != null)
+				return CaseUsage.PROJECTILE_NO_WORLD_TRIGGER_BUKKIT;
+			return CaseUsage.PROJECTILE_NO_WORLD_TRIGGER;
+		}
+		if (!hasTrigger)
+			return CaseUsage.PROJECTILE_WORLD_NO_TRIGGER;
+		return CaseUsage.PROJECTILE_WORLD_TRIGGER;
+	}
+
+	private Consumer<? extends Entity> afterSpawn(Event event, EntityData<?> entityData, @Nullable LivingEntity shooter) {
+		return entity -> {
+			if (entity instanceof Fireball fireball)
+				fireball.setShooter(shooter);
+			else if (entity instanceof Projectile projectile && shooter != null) {
+				projectile.setShooter(shooter);
+				set(projectile, entityData);
+			}
+			ShootEvent shootEvent = new ShootEvent(entity, shooter);
+			lastSpawned = entity;
+			Variables.setLocalVariables(shootEvent, Variables.copyLocalVariables(event));
+			TriggerItem.walk(trigger, shootEvent);
+			Variables.setLocalVariables(event, Variables.copyLocalVariables(shootEvent));
+			Variables.removeLocals(shootEvent);
+		};
+	}
+
+	/**
+	 * MC 1.19 uses Bukkit Consumer for LivingEntity#launchProjectile instead of Java Consumer
+	 */
+	@SuppressWarnings("deprecation")
+	private org.bukkit.util.Consumer<? extends Entity> afterSpawnBukkit(Event event, EntityData<?> entityData, @Nullable LivingEntity shooter) {
+		return entity -> {
+			if (entity instanceof Fireball fireball)
+				fireball.setShooter(shooter);
+			else if (entity instanceof Projectile projectile && shooter != null) {
+				projectile.setShooter(shooter);
+				set(projectile, entityData);
+			}
+			ShootEvent shootEvent = new ShootEvent(entity, shooter);
+			lastSpawned = entity;
+			Variables.setLocalVariables(shootEvent, Variables.copyLocalVariables(event));
+			TriggerItem.walk(trigger, shootEvent);
+			Variables.setLocalVariables(event, Variables.copyLocalVariables(shootEvent));
+			Variables.removeLocals(shootEvent);
+		};
+	}
+
+}
diff --git a/src/main/java/ch/njol/skript/sections/EffSecSpawn.java b/src/main/java/ch/njol/skript/sections/EffSecSpawn.java
index 552bfb151b1..d78d46e4976 100644
--- a/src/main/java/ch/njol/skript/sections/EffSecSpawn.java
+++ b/src/main/java/ch/njol/skript/sections/EffSecSpawn.java
@@ -1,41 +1,8 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.sections;
 
-import java.util.List;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.function.Consumer;
-
-import ch.njol.skript.doc.RequiredPlugins;
-import org.bukkit.Location;
-import org.bukkit.entity.Entity;
-import org.bukkit.event.Event;
-import org.bukkit.event.HandlerList;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
 import ch.njol.skript.Skript;
 import ch.njol.skript.config.SectionNode;
-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.doc.*;
 import ch.njol.skript.entity.EntityType;
 import ch.njol.skript.lang.EffectSection;
 import ch.njol.skript.lang.Expression;
@@ -44,27 +11,48 @@
 import ch.njol.skript.lang.TriggerItem;
 import ch.njol.skript.registrations.EventValues;
 import ch.njol.skript.util.Direction;
-import ch.njol.skript.util.Getter;
 import ch.njol.skript.variables.Variables;
 import ch.njol.util.Kleenean;
+import org.bukkit.Location;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.EntitySnapshot;
+import org.bukkit.event.Event;
+import org.bukkit.event.HandlerList;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.List;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.function.Consumer;
 
 @Name("Spawn")
 @Description({
-	"Spawn a creature. This can be used as an effect and as a section.",
+	"Spawns entities. This can be used as an effect and as a section.",
+	"",
 	"If it is used as a section, the section is run before the entity is added to the world.",
 	"You can modify the entity in this section, using for example 'event-entity' or 'cow'. ",
-	"Do note that other event values, such as 'player', won't work in this section."
+	"Do note that other event values, such as 'player', won't work in this section.",
+	"",
+	"If you're spawning a display and want it to be empty on initialization, like not having a block display be stone, " + 
+	"set hidden config node 'spawn empty displays' to true.",
+	"",
+	"Note that when spawning an entity via entity snapshots, the code within the section will not run instantaneously as compared to spawning normally (via 'a zombie')."
 })
 @Examples({
 	"spawn 3 creepers at the targeted block",
 	"spawn a ghast 5 meters above the player",
 	"spawn a zombie at the player:",
-		"\tset name of the zombie to \"\""
+		"\tset name of the zombie to \"\"",
+	"",
+	"spawn a block display of a ladder[waterlogged=true] at location above player:",
+		"\tset billboard of event-display to center # allows the display to rotate around the center axis"
 })
-@Since("1.0, 2.6.1 (with section), 2.8.6 (dropped items)")
+@RequiredPlugins("Minecraft 1.20.2+ (entity snapshots)")
+@Since("1.0, 2.6.1 (with section), 2.8.6 (dropped items), 2.10 (entity snapshots)")
 public class EffSecSpawn extends EffectSection {
 
 	public static class SpawnEvent extends Event {
+
 		private final Entity entity;
 
 		public SpawnEvent(Entity entity) {
@@ -83,23 +71,19 @@ public HandlerList getHandlers() {
 	}
 
 	static {
+		String acceptedTypes = "%entitytypes%";
+		if (Skript.classExists("org.bukkit.entity.EntitySnapshot"))
+			acceptedTypes = "%entitytypes/entitysnapshots%";
 		Skript.registerSection(EffSecSpawn.class,
-			"(spawn|summon) %entitytypes% [%directions% %locations%]",
-			"(spawn|summon) %number% of %entitytypes% [%directions% %locations%]"
+				"(spawn|summon) " + acceptedTypes + " [%directions% %locations%]",
+				"(spawn|summon) %number% of " + acceptedTypes + " [%directions% %locations%]"
 		);
-		EventValues.registerEventValue(SpawnEvent.class, Entity.class, new Getter<Entity, SpawnEvent>() {
-			@Override
-			public Entity get(SpawnEvent spawnEvent) {
-				return spawnEvent.getEntity();
-			}
-		}, EventValues.TIME_NOW);
+		EventValues.registerEventValue(SpawnEvent.class, Entity.class, SpawnEvent::getEntity);
 	}
 
-	@SuppressWarnings("NotNullFieldNotInitialized")
 	private Expression<Location> locations;
 
-	@SuppressWarnings("NotNullFieldNotInitialized")
-	private Expression<EntityType> types;
+	private Expression<?> types;
 
 	@Nullable
 	private Expression<Number> amount;
@@ -112,14 +96,11 @@ public Entity get(SpawnEvent spawnEvent) {
 
 	@Override
 	@SuppressWarnings("unchecked")
-	public boolean init(Expression<?>[] exprs,
-						int matchedPattern,
-						Kleenean isDelayed,
-						ParseResult parseResult,
-						@Nullable SectionNode sectionNode,
-						@Nullable List<TriggerItem> triggerItems) {
+	public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelayed, ParseResult parseResult,
+			@Nullable SectionNode sectionNode, @Nullable List<TriggerItem> triggerItems) {
+
 		amount = matchedPattern == 0 ? null : (Expression<Number>) (exprs[0]);
-		types = (Expression<EntityType>) exprs[matchedPattern];
+		types = exprs[matchedPattern];
 		locations = Direction.combine((Expression<? extends Direction>) exprs[1 + matchedPattern], (Expression<? extends Location>) exprs[2 + matchedPattern]);
 
 		if (sectionNode != null) {
@@ -131,28 +112,19 @@ public boolean init(Expression<?>[] exprs,
 				return false;
 			}
 		}
-
 		return true;
 	}
 
 	@Override
-	@Nullable
-	@SuppressWarnings({"unchecked", "rawtypes"})
-	protected TriggerItem walk(Event event) {
+	protected @Nullable TriggerItem walk(Event event) {
 		lastSpawned = null;
 
 		Consumer<? extends Entity> consumer;
 		if (trigger != null) {
-			consumer = o -> {
-				lastSpawned = o;
-				SpawnEvent spawnEvent = new SpawnEvent(o);
-				// Copy the local variables from the calling code to this section
-				Variables.setLocalVariables(spawnEvent, Variables.copyLocalVariables(event));
-				TriggerItem.walk(trigger, spawnEvent);
-				// And copy our (possibly modified) local variables back to the calling code
-				Variables.setLocalVariables(event, Variables.copyLocalVariables(spawnEvent));
-				// Clear spawnEvent's local variables as it won't be done automatically
-				Variables.removeLocals(spawnEvent);
+			consumer = entity -> {
+				lastSpawned = entity;
+				SpawnEvent spawnEvent = new SpawnEvent(entity);
+				Variables.withLocalVariables(event, spawnEvent, () -> TriggerItem.walk(trigger, spawnEvent));
 			};
 		} else {
 			consumer = null;
@@ -161,15 +133,28 @@ protected TriggerItem walk(Event event) {
 		Number numberAmount = amount != null ? amount.getSingle(event) : 1;
 		if (numberAmount != null) {
 			double amount = numberAmount.doubleValue();
-			EntityType[] types = this.types.getArray(event);
+			Object[] types = this.types.getArray(event);
 			for (Location location : locations.getArray(event)) {
-				for (EntityType type : types) {
-					double typeAmount = amount * type.getAmount();
-					for (int i = 0; i < typeAmount; i++) {
-						if (consumer != null) {
-							type.data.spawn(location, (Consumer) consumer); // lastSpawned set within Consumer
-						} else {
-							lastSpawned = type.data.spawn(location);
+				for (Object type : types) {
+					if (type instanceof EntityType entityType) {
+						double typeAmount = amount * entityType.getAmount();
+						for (int i = 0; i < typeAmount; i++) {
+							if (consumer != null) {
+								//noinspection unchecked,rawtypes
+								entityType.data.spawn(location, (Consumer) consumer); // lastSpawned set within Consumer
+							} else {
+								lastSpawned = entityType.data.spawn(location);
+							}
+						}
+					} else if (type instanceof EntitySnapshot snapshot) {
+						for (int i = 0; i < amount; i++) {
+							Entity entity = snapshot.createEntity(location);
+							if (consumer != null) {
+								//noinspection unchecked
+								((Consumer<Entity>) consumer).accept(entity);
+							} else {
+								lastSpawned = entity;
+							}
 						}
 					}
 				}
@@ -182,7 +167,7 @@ protected TriggerItem walk(Event event) {
 	@Override
 	public String toString(@Nullable Event event, boolean debug) {
 		return "spawn " + (amount != null ? amount.toString(event, debug) + " of " : "") +
-			types.toString(event, debug) + " " + locations.toString(event, debug);
+				types.toString(event, debug) + " " + locations.toString(event, debug);
 	}
 
 }
diff --git a/src/main/java/ch/njol/skript/sections/SecConditional.java b/src/main/java/ch/njol/skript/sections/SecConditional.java
index c74730854a9..02830488cc6 100644
--- a/src/main/java/ch/njol/skript/sections/SecConditional.java
+++ b/src/main/java/ch/njol/skript/sections/SecConditional.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.sections;
 
 import ch.njol.skript.ScriptLoader;
@@ -26,11 +8,8 @@
 import ch.njol.skript.doc.Examples;
 import ch.njol.skript.doc.Name;
 import ch.njol.skript.doc.Since;
-import ch.njol.skript.lang.Condition;
-import ch.njol.skript.lang.Expression;
-import ch.njol.skript.lang.Section;
+import ch.njol.skript.lang.*;
 import ch.njol.skript.lang.SkriptParser.ParseResult;
-import ch.njol.skript.lang.TriggerItem;
 import ch.njol.skript.lang.parser.ParserInstance;
 import ch.njol.skript.lang.util.ContextlessEvent;
 import ch.njol.skript.patterns.PatternCompiler;
@@ -40,6 +19,9 @@
 import com.google.common.collect.Iterables;
 import org.bukkit.event.Event;
 import org.jetbrains.annotations.Nullable;
+import org.jetbrains.annotations.UnknownNullability;
+import org.skriptlang.skript.lang.condition.Conditional;
+import org.skriptlang.skript.lang.condition.Conditional.Operator;
 
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -71,7 +53,6 @@
 	""
 })
 @Since("1.0")
-@SuppressWarnings("NotNullFieldNotInitialized")
 public class SecConditional extends Section {
 
 	private static final SkriptPattern THEN_PATTERN = PatternCompiler.compile("then [run]");
@@ -96,13 +77,14 @@ private enum ConditionalType {
 	}
 
 	private ConditionalType type;
-	private List<Condition> conditions = new ArrayList<>();
+	private @UnknownNullability Conditional<Event> conditional;
 	private boolean ifAny;
 	private boolean parseIf;
 	private boolean parseIfPassed;
 	private boolean multiline;
 
 	private Kleenean hasDelayAfter;
+	private @Nullable ExecutionIntent executionIntent;
 
 	@Override
 	public boolean init(Expression<?>[] exprs,
@@ -114,7 +96,8 @@ public boolean init(Expression<?>[] exprs,
 		type = CONDITIONAL_PATTERNS.getInfo(matchedPattern);
 		ifAny = parseResult.hasTag("any");
 		parseIf = parseResult.hasTag("parse");
-		multiline = parseResult.regexes.size() == 0 && type != ConditionalType.ELSE;
+		multiline = parseResult.regexes.isEmpty() && type != ConditionalType.ELSE;
+		ParserInstance parser = getParser();
 
 		// ensure this conditional is chained correctly (e.g. an else must have an if)
 		if (type != ConditionalType.IF) {
@@ -149,7 +132,7 @@ public boolean init(Expression<?>[] exprs,
 		} else {
 			// if this is a multiline if, we need to check if there is a "then" section after this
 			if (multiline) {
-				Node nextNode = getNextNode(sectionNode, getParser());
+				Node nextNode = getNextNode(sectionNode, parser);
 				String error = (ifAny ? "'if any'" : "'if all'") + " has to be placed just before a 'then' section";
 				if (nextNode instanceof SectionNode && nextNode.getKey() != null) {
 					String nextNodeKey = ScriptLoader.replaceOptions(nextNode.getKey());
@@ -166,10 +149,11 @@ public boolean init(Expression<?>[] exprs,
 
 		// if this an "if" or "else if", let's try to parse the conditions right away
 		if (type == ConditionalType.IF || type == ConditionalType.ELSE_IF) {
-			ParserInstance parser = getParser();
 			Class<? extends Event>[] currentEvents = parser.getCurrentEvents();
 			String currentEventName = parser.getCurrentEventName();
 
+			List<Conditional<Event>> conditionals = new ArrayList<>();
+
 			// Change event if using 'parse if'
 			if (parseIf) {
 				//noinspection unchecked
@@ -198,7 +182,7 @@ public boolean init(Expression<?>[] exprs,
 						// if this condition was invalid, don't bother parsing the rest
 						if (condition == null)
 							return false;
-						conditions.add(condition);
+						conditionals.add(condition);
 					}
 				}
 				parser.setNode(sectionNode);
@@ -208,7 +192,7 @@ public boolean init(Expression<?>[] exprs,
 				// Don't print a default error if 'if' keyword wasn't provided
 				Condition condition = Condition.parse(expr, parseResult.hasTag("implicit") ? null : "Can't understand this condition: '" + expr + "'");
 				if (condition != null)
-					conditions.add(condition);
+					conditionals.add(condition);
 			}
 
 			if (parseIf) {
@@ -216,8 +200,10 @@ public boolean init(Expression<?>[] exprs,
 				parser.setCurrentEventName(currentEventName);
 			}
 
-			if (conditions.isEmpty())
+			if (conditionals.isEmpty())
 				return false;
+
+			conditional = Conditional.compound(ifAny ? Operator.OR : Operator.AND, conditionals);
 		}
 
 		// ([else] parse if) If condition is valid and false, do not parse the section
@@ -228,10 +214,37 @@ public boolean init(Expression<?>[] exprs,
 			parseIfPassed = true;
 		}
 
-		Kleenean hadDelayBefore = getParser().getHasDelayBefore();
+		Kleenean hadDelayBefore = parser.getHasDelayBefore();
 		if (!multiline || type == ConditionalType.THEN)
 			loadCode(sectionNode);
-		hasDelayAfter = getParser().getHasDelayBefore();
+
+		// Get the execution intent of the entire conditional chain.
+		if (type == ConditionalType.ELSE) {
+			List<SecConditional> conditionals = getPrecedingConditionals(triggerItems);
+			conditionals.add(0, this);
+			for (SecConditional conditional : conditionals) {
+				// Continue if the current conditional doesn't have executable code (the 'if' section of a multiline).
+				if (conditional.multiline && conditional.type != ConditionalType.THEN)
+					continue;
+
+				// If the current conditional doesn't have an execution intent,
+				//  then there is a possibility of the chain not stopping the execution.
+				// Therefore, we can't assume anything about the intention of the chain,
+				//  so we just set it to null and break out of the loop.
+				ExecutionIntent triggerIntent = conditional.triggerExecutionIntent();
+				if (triggerIntent == null) {
+					executionIntent = null;
+					break;
+				}
+
+				// If the current trigger's execution intent has a lower value than the chain's execution intent,
+				//  then set the chain's intent to the trigger's
+				if (executionIntent == null || triggerIntent.compareTo(executionIntent) < 0)
+					executionIntent = triggerIntent;
+			}
+		}
+
+		hasDelayAfter = parser.getHasDelayBefore();
 
 		// If the code definitely has a delay before this section, or if the section did not alter the delayed Kleenean,
 		//  there's no need to change the Kleenean.
@@ -247,16 +260,16 @@ public boolean init(Expression<?>[] exprs,
 					&& getElseIfs(triggerItems).stream().map(SecConditional::getHasDelayAfter).allMatch(Kleenean::isTrue)) {
 				// ... if the if section, all else-if sections and the else section have definite delays,
 				//  mark delayed as TRUE.
-				getParser().setHasDelayBefore(Kleenean.TRUE);
+				parser.setHasDelayBefore(Kleenean.TRUE);
 			} else {
 				// ... otherwise mark delayed as UNKNOWN.
-				getParser().setHasDelayBefore(Kleenean.UNKNOWN);
+				parser.setHasDelayBefore(Kleenean.UNKNOWN);
 			}
 		} else {
 			if (!hasDelayAfter.isFalse()) {
 				// If an if section or else-if section has some delay (definite or possible) in it,
 				//  set the delayed Kleenean to UNKNOWN.
-				getParser().setHasDelayBefore(Kleenean.UNKNOWN);
+				parser.setHasDelayBefore(Kleenean.UNKNOWN);
 			}
 		}
 
@@ -264,60 +277,64 @@ && getElseIfs(triggerItems).stream().map(SecConditional::getHasDelayAfter).allMa
 	}
 
 	@Override
-	@Nullable
-	public TriggerItem getNext() {
+	public @Nullable TriggerItem getNext() {
 		return getSkippedNext();
 	}
 
-	@Nullable
-	public TriggerItem getNormalNext() {
-		return super.getNext();
-	}
-
-	@Nullable
 	@Override
-	protected TriggerItem walk(Event event) {
+	protected @Nullable TriggerItem walk(Event event) {
 		if (type == ConditionalType.THEN || (parseIf && !parseIfPassed)) {
-			return getNormalNext();
+			return getActualNext();
 		} else if (parseIf || checkConditions(event)) {
 			// if this is a multiline if, we need to run the "then" section instead
-			SecConditional sectionToRun = multiline ? (SecConditional) getNormalNext() : this;
+			SecConditional sectionToRun = multiline ? (SecConditional) getActualNext() : this;
 			TriggerItem skippedNext = getSkippedNext();
 			if (sectionToRun.last != null)
 				sectionToRun.last.setNext(skippedNext);
 			return sectionToRun.first != null ? sectionToRun.first : skippedNext;
 		} else {
-			return getNormalNext();
+			return getActualNext();
 		}
 	}
 
+	@Override
+	public @Nullable ExecutionIntent executionIntent() {
+		return executionIntent;
+	}
+
+	@Override
+	public ExecutionIntent triggerExecutionIntent() {
+		if (multiline && type != ConditionalType.THEN)
+			// Handled in the 'then' section
+			return null;
+		return super.triggerExecutionIntent();
+	}
+
 	@Nullable
 	private TriggerItem getSkippedNext() {
-		TriggerItem next = getNormalNext();
-		while (next instanceof SecConditional && ((SecConditional) next).type != ConditionalType.IF)
-			next = ((SecConditional) next).getNormalNext();
+		TriggerItem next = getActualNext();
+		while (next instanceof SecConditional nextSecCond && nextSecCond.type != ConditionalType.IF)
+			next = next.getActualNext();
 		return next;
 	}
 
 	@Override
 	public String toString(@Nullable Event event, boolean debug) {
 		String parseIf = this.parseIf ? "parse " : "";
-		switch (type) {
-			case IF:
+		return switch (type) {
+			case IF -> {
 				if (multiline)
-					return parseIf + "if " + (ifAny ? "any" : "all");
-				return parseIf + "if " + conditions.get(0).toString(event, debug);
-			case ELSE_IF:
+					yield parseIf + "if " + (ifAny ? "any" : "all");
+				yield parseIf + "if " + conditional.toString(event, debug);
+			}
+			case ELSE_IF -> {
 				if (multiline)
-					return "else " + parseIf + "if " + (ifAny ? "any" : "all");
-				return "else " + parseIf + "if " + conditions.get(0).toString(event, debug);
-			case ELSE:
-				return "else";
-			case THEN:
-				return "then";
-			default:
-				throw new IllegalStateException();
-		}
+					yield "else " + parseIf + "if " + (ifAny ? "any" : "all");
+				yield "else " + parseIf + "if " + conditional.toString(event, debug);
+			}
+			case ELSE -> "else";
+			case THEN -> "then";
+		};
 	}
 
 	private Kleenean getHasDelayAfter() {
@@ -330,21 +347,18 @@ private Kleenean getHasDelayAfter() {
 	 * @param type the type of conditional section to find. if null is provided, any type is allowed.
 	 * @return the closest conditional section
 	 */
-	@Nullable
-	private static SecConditional getPrecedingConditional(List<TriggerItem> triggerItems, @Nullable ConditionalType type) {
+	private static @Nullable SecConditional getPrecedingConditional(List<TriggerItem> triggerItems, @Nullable ConditionalType type) {
 		// loop through the triggerItems in reverse order so that we find the most recent items first
 		for (int i = triggerItems.size() - 1; i >= 0; i--) {
 			TriggerItem triggerItem = triggerItems.get(i);
-			if (triggerItem instanceof SecConditional) {
-				SecConditional conditionalSection = (SecConditional) triggerItem;
-
-				if (conditionalSection.type == ConditionalType.ELSE) {
+			if (triggerItem instanceof SecConditional precedingSecConditional) {
+				if (precedingSecConditional.type == ConditionalType.ELSE) {
 					// if the conditional is an else, return null because it belongs to a different condition and ends
 					// this one
 					return null;
-				} else if (type == null || conditionalSection.type == type) {
+				} else if (type == null || precedingSecConditional.type == type) {
 					// if the conditional matches the type argument, we found our most recent preceding conditional section
-					return conditionalSection;
+					return precedingSecConditional;
 				}
 			} else {
 				return null;
@@ -353,17 +367,28 @@ private static SecConditional getPrecedingConditional(List<TriggerItem> triggerI
 		return null;
 	}
 
+	private static List<SecConditional> getPrecedingConditionals(List<TriggerItem> triggerItems) {
+		List<SecConditional> conditionals = new ArrayList<>();
+		// loop through the triggerItems in reverse order so that we find the most recent items first
+		for (int i = triggerItems.size() - 1; i >= 0; i--) {
+			TriggerItem triggerItem = triggerItems.get(i);
+			if (!(triggerItem instanceof SecConditional conditional))
+				break;
+			if (conditional.type == ConditionalType.ELSE)
+				// if the conditional is an else, break because it belongs to a different condition and ends
+				// this one
+				break;
+			conditionals.add(conditional);
+		}
+		return conditionals;
+	}
+
 	private static List<SecConditional> getElseIfs(List<TriggerItem> triggerItems) {
 		List<SecConditional> list = new ArrayList<>();
 		for (int i = triggerItems.size() - 1; i >= 0; i--) {
 			TriggerItem triggerItem = triggerItems.get(i);
-			if (triggerItem instanceof SecConditional) {
-				SecConditional secConditional = (SecConditional) triggerItem;
-
-				if (secConditional.type == ConditionalType.ELSE_IF)
-					list.add(secConditional);
-				else
-					break;
+			if (triggerItem instanceof SecConditional precedingSecConditional && precedingSecConditional.type == ConditionalType.ELSE_IF) {
+				list.add(precedingSecConditional);
 			} else {
 				break;
 			}
@@ -372,17 +397,10 @@ private static List<SecConditional> getElseIfs(List<TriggerItem> triggerItems) {
 	}
 
 	private boolean checkConditions(Event event) {
-		if (conditions.isEmpty()) { // else and then
-			return true;
-		} else if (ifAny) {
-			return conditions.stream().anyMatch(c -> c.check(event));
-		} else {
-			return conditions.stream().allMatch(c -> c.check(event));
-		}
+		return conditional == null || conditional.evaluate(event).isTrue();
 	}
 
-	@Nullable
-	private Node getNextNode(Node precedingNode, ParserInstance parser) {
+	private @Nullable Node getNextNode(Node precedingNode, ParserInstance parser) {
 		// iterating over the parent node causes the current node to change, so we need to store it to reset it later
 		Node originalCurrentNode = parser.getNode();
 		SectionNode parentNode = precedingNode.getParent();
diff --git a/src/main/java/ch/njol/skript/sections/SecFilter.java b/src/main/java/ch/njol/skript/sections/SecFilter.java
new file mode 100644
index 00000000000..be6c3fdd9db
--- /dev/null
+++ b/src/main/java/ch/njol/skript/sections/SecFilter.java
@@ -0,0 +1,191 @@
+package ch.njol.skript.sections;
+
+import ch.njol.skript.ScriptLoader;
+import ch.njol.skript.Skript;
+import ch.njol.skript.config.Node;
+import ch.njol.skript.config.SectionNode;
+import ch.njol.skript.config.SimpleNode;
+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.expressions.ExprInput;
+import ch.njol.skript.lang.Condition;
+import ch.njol.skript.lang.Expression;
+import ch.njol.skript.lang.InputSource;
+import ch.njol.skript.lang.Section;
+import ch.njol.skript.lang.SkriptParser.ParseResult;
+import ch.njol.skript.lang.TriggerItem;
+import ch.njol.skript.lang.Variable;
+import ch.njol.skript.lang.parser.ParserInstance;
+import ch.njol.skript.variables.Variables;
+import ch.njol.util.Kleenean;
+import ch.njol.util.Pair;
+import ch.njol.util.StringUtils;
+import org.bukkit.event.Event;
+import org.jetbrains.annotations.Nullable;
+import org.jetbrains.annotations.UnknownNullability;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.Spliterator;
+import java.util.Spliterators;
+import java.util.stream.StreamSupport;
+
+@Name("Filter")
+@Description({
+	"Filters a variable list based on the supplied conditions. Unlike the filter expression, this effect " +
+	"maintains the indices of the filtered list.",
+	"It also supports filtering based on meeting any of the given criteria, rather than all, like multi-line if statements."
+})
+@Examples({
+	"set {_a::*} to integers between -10 and 10",
+	"",
+	"filter {_a::*} to match:",
+		"\tinput is a number",
+		"\tmod(input, 2) = 0",
+		"\tinput > 0",
+	"",
+	"send {_a::*} # sends 2, 4, 6, 8, and 10",
+})
+@Since("2.10")
+public class SecFilter extends Section implements InputSource {
+
+	static {
+		Skript.registerSection(SecFilter.class,
+				"filter %~objects% to match [:any|all]");
+		if (!ParserInstance.isRegistered(InputSource.InputData.class))
+			ParserInstance.registerData(InputSource.InputData.class, InputSource.InputData::new);
+	}
+
+
+	private @UnknownNullability Variable<?> unfilteredObjects;
+	private final List<Condition> conditions = new ArrayList<>();
+	private boolean isAny;
+
+	private @Nullable Object currentValue;
+	private @UnknownNullability String currentIndex;
+	private final Set<ExprInput<?>> dependentInputs = new HashSet<>();
+
+	@Override
+	public boolean init(Expression<?>[] expressions, int matchedPattern, Kleenean isDelayed, ParseResult parseResult, SectionNode sectionNode, List<TriggerItem> triggerItems) {
+		if (expressions[0].isSingle() || !(expressions[0] instanceof Variable)) {
+			Skript.error("You can only filter list variables!");
+			return false;
+		}
+		unfilteredObjects = (Variable<?>) expressions[0];
+		isAny = parseResult.hasTag("any");
+
+		// Code pulled from SecConditional
+		ParserInstance parser = getParser();
+		if (sectionNode.isEmpty()) {
+			Skript.error("filter sections must contain at least one condition");
+			return false;
+		}
+		InputSource.InputData inputData = getParser().getData(InputSource.InputData.class);
+		InputSource originalSource = inputData.getSource();
+		inputData.setSource(this);
+		try {
+			for (Node childNode : sectionNode) {
+				if (!(childNode instanceof SimpleNode)) {
+					Skript.error("Filter sections may not contain other sections");
+					return false;
+				}
+				String childKey = childNode.getKey();
+				if (childKey != null) {
+					childKey = ScriptLoader.replaceOptions(childKey);
+					parser.setNode(childNode);
+					Condition condition = Condition.parse(childKey, "Can't understand this condition: '" + childKey + "'");
+					parser.setNode(sectionNode);
+					// if this condition was invalid, don't bother parsing the rest
+					if (condition == null)
+						return false;
+					conditions.add(condition);
+				}
+			}
+		} finally {
+			inputData.setSource(originalSource);
+		}
+
+		return true;
+	}
+
+	@Override
+	protected @Nullable TriggerItem walk(Event event) {
+		// get the name only once to avoid issues where the name may change between evaluations.
+		String varName = unfilteredObjects.getName().toString(event);
+		String varSubName = StringUtils.substring(varName, 0, -1);
+		boolean local = unfilteredObjects.isLocal();
+
+		// not ideal to get this AND the iterator, but using this value could be unreliable due to name change issue from above.
+		// since we just use it for a length optimization at the end, it's ok to be a little unreliable.
+		var rawVariable = ((Map<String, Object>) unfilteredObjects.getRaw(event));
+		if (rawVariable == null)
+			return getNext();
+		int initialSize = rawVariable.size();
+
+		// we save both because we don't yet know which will be cheaper to use.
+		List<Pair<String, Object>> toKeep = new ArrayList<>();
+		List<String> toRemove = new ArrayList<>();
+
+		var variableIterator = Variables.getVariableIterator(varName, local, event);
+		var stream = StreamSupport.stream(Spliterators.spliteratorUnknownSize(variableIterator, Spliterator.ORDERED), false);
+		if (isAny) {
+			stream.forEach(pair -> {
+				currentValue = pair.getValue();
+				currentIndex = pair.getKey();
+				if (conditions.stream().anyMatch(c -> c.check(event))) {
+					toKeep.add(pair);
+				} else {
+					toRemove.add(pair.getKey());
+				}
+			});
+		} else {
+			stream.forEach(pair -> {
+				currentValue = pair.getValue();
+				currentIndex = pair.getKey();
+				if (conditions.stream().allMatch(c -> c.check(event))) {
+					toKeep.add(pair);
+				} else {
+					toRemove.add(pair.getKey());
+				}
+			});
+		}
+
+		// optimize by either removing or clearing + adding depending on which is fewer operations
+		// for instances where only a handful of values are removed from a large list, this can be a 400% speedup
+		if (toKeep.size() < initialSize / 2) {
+			Variables.deleteVariable(varName, event, local);
+			for (Pair<String, Object> pair : toKeep)
+				Variables.setVariable(varSubName + pair.getKey(), pair.getValue(), event, local);
+		} else {
+			for (String index : toRemove)
+				Variables.setVariable(varSubName + index, null, event, local);
+		}
+		return getNext();
+	}
+
+	@Override
+	public Set<ExprInput<?>> getDependentInputs() {
+		return dependentInputs;
+	}
+
+	@Override
+	public @Nullable Object getCurrentValue() {
+		return currentValue;
+	}
+
+	@Override
+	public @UnknownNullability String getCurrentIndex() {
+		return currentIndex;
+	}
+
+	@Override
+	public String toString(@Nullable Event event, boolean debug) {
+		return "filter " + unfilteredObjects.toString(event, debug) + " to match " + (isAny ? "any" : "all");
+	}
+
+}
diff --git a/src/main/java/ch/njol/skript/sections/SecFor.java b/src/main/java/ch/njol/skript/sections/SecFor.java
new file mode 100644
index 00000000000..0b8a9deaac5
--- /dev/null
+++ b/src/main/java/ch/njol/skript/sections/SecFor.java
@@ -0,0 +1,160 @@
+package ch.njol.skript.sections;
+
+import ch.njol.skript.Skript;
+import ch.njol.skript.SkriptAPIException;
+import ch.njol.skript.classes.Changer;
+import ch.njol.skript.config.SectionNode;
+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.SkriptParser.ParseResult;
+import ch.njol.skript.lang.TriggerItem;
+import ch.njol.skript.lang.Variable;
+import ch.njol.skript.lang.util.ContainerExpression;
+import ch.njol.skript.registrations.Feature;
+import ch.njol.skript.util.Container;
+import ch.njol.skript.util.Container.ContainerType;
+import ch.njol.skript.util.LiteralUtils;
+import ch.njol.util.Kleenean;
+import org.bukkit.event.Event;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.List;
+import java.util.Map;
+
+@Name("For Each Loop (Experimental)")
+@Description("""
+	A specialised loop section run for each element in a list.
+	Unlike the basic loop, this is designed for extracting the key & value from pairs.
+	The loop element's key/index and value can be stored in a variable for convenience.
+	
+	When looping a simple (non-indexed) set of values, e.g. all players, the index will be the loop counter number."""
+)
+@Examples({
+	"for each {_player} in players:",
+	"\tsend \"Hello %{_player}%!\" to {_player}",
+	"",
+	"loop {_item} in {list of items::*}:",
+	"\tbroadcast {_item}'s name",
+	"",
+	"for each key {_index} in {list of items::*}:",
+	"\tbroadcast {_index}",
+	"",
+	"loop key {_index} and value {_value} in {list of items::*}:",
+	"\tbroadcast \"%{_index}% = %{_value}%\"",
+	"",
+	"for each {_index}, {_value} in {my list::*}:",
+	"\tbroadcast \"%{_index}% = %{_value}%\"",
+})
+@Since("2.10")
+public class SecFor extends SecLoop {
+
+	static {
+		Skript.registerSection(SecFor.class,
+			"(for [each]|loop) [value] %~object% in %objects%",
+			"(for [each]|loop) (key|index) %~object% in %objects%",
+			"(for [each]|loop) [key|index] %~object%(,| and) [value] %~object% in %objects%"
+		);
+	}
+
+	private @Nullable Expression<?> keyStore, valueStore;
+
+	@Override
+	@SuppressWarnings("unchecked")
+	public boolean init(Expression<?>[] exprs,
+						int matchedPattern,
+						Kleenean isDelayed,
+						ParseResult parseResult,
+						SectionNode sectionNode,
+						List<TriggerItem> triggerItems) {
+		if (!this.getParser().hasExperiment(Feature.FOR_EACH_LOOPS))
+			return false;
+		//<editor-fold desc="Set the key/value expressions based on the pattern" defaultstate="collapsed">
+		switch (matchedPattern) {
+			case 0:
+				this.valueStore = exprs[0];
+				this.expression = LiteralUtils.defendExpression(exprs[1]);
+				break;
+			case 1:
+				this.keyStore = exprs[0];
+				this.expression = LiteralUtils.defendExpression(exprs[1]);
+				break;
+			default:
+				this.keyStore = exprs[0];
+				this.valueStore = exprs[1];
+				this.expression = LiteralUtils.defendExpression(exprs[2]);
+		}
+		//</editor-fold>
+		//<editor-fold desc="Check our input expressions are safe/correct" defaultstate="collapsed">
+		if (keyStore != null && !(keyStore instanceof Variable)) {
+			Skript.error("The 'key' input for a for-loop must be a variable to store the value.");
+			return false;
+		}
+		if (!(valueStore instanceof Variable || valueStore == null)) {
+			Skript.error("The 'value' input for a for-loop must be a variable to store the value.");
+			return false;
+		}
+		if (!LiteralUtils.canInitSafely(expression)) {
+			Skript.error("Can't understand this loop: '" + parseResult.expr + "'");
+			return false;
+		}
+		if (Container.class.isAssignableFrom(expression.getReturnType())) {
+			ContainerType type = expression.getReturnType().getAnnotation(ContainerType.class);
+			if (type == null)
+				throw new SkriptAPIException(expression.getReturnType()
+					.getName() + " implements Container but is missing the required @ContainerType annotation");
+			this.expression = new ContainerExpression((Expression<? extends Container<?>>) expression, type.value());
+		}
+		if (this.getParser().hasExperiment(Feature.QUEUES) // Todo: change this if other iterable things are added
+			&& expression.isSingle()
+			&& (expression instanceof Variable<?> || Iterable.class.isAssignableFrom(expression.getReturnType()))) {
+			// Some expressions return one thing but are potentially iterable anyway, e.g. queues
+			super.iterableSingle = true;
+		} else if (expression.isSingle()) {
+			Skript.error("Can't loop '" + expression + "' because it's only a single value");
+			return false;
+		}
+		//</editor-fold>
+		this.loadOptionalCode(sectionNode);
+		super.setNext(this);
+		return true;
+	}
+
+	@Override
+	protected void store(Event event, Object next) {
+		super.store(event, next);
+		//<editor-fold desc="Store the loop index/value in the variables" defaultstate="collapsed">
+		if (next instanceof Map.Entry) {
+			//noinspection unchecked
+			Map.Entry<String, Object> entry = (Map.Entry<String, Object>) next;
+			if (keyStore != null)
+				this.keyStore.change(event, new Object[] {entry.getKey()}, Changer.ChangeMode.SET);
+			if (valueStore != null)
+				this.valueStore.change(event, new Object[] {entry.getValue()}, Changer.ChangeMode.SET);
+		} else {
+			if (keyStore != null)
+				this.keyStore.change(event, new Object[] {this.getLoopCounter(event)}, Changer.ChangeMode.SET);
+			if (valueStore != null)
+				this.valueStore.change(event, new Object[] {next}, Changer.ChangeMode.SET);
+		}
+		//</editor-fold>
+	}
+
+	@Override
+	public String toString(@Nullable Event event, boolean debug) {
+		if (keyStore != null && valueStore != null) {
+			return "for each key " + keyStore.toString(event, debug)
+				+ " and value " + valueStore.toString(event, debug) + " in "
+				+ super.expression.toString(event, debug);
+		} else if (keyStore != null) {
+			return "for each key " + keyStore.toString(event, debug)
+				+ " in " + super.expression.toString(event, debug);
+		}
+		assert valueStore != null : "How did we get here?";
+		return "for each value " + valueStore.toString(event, debug)
+			+ " in " + super.expression.toString(event, debug);
+	}
+
+}
diff --git a/src/main/java/ch/njol/skript/sections/SecLoop.java b/src/main/java/ch/njol/skript/sections/SecLoop.java
index ef3728ddc9e..38bd0366bea 100644
--- a/src/main/java/ch/njol/skript/sections/SecLoop.java
+++ b/src/main/java/ch/njol/skript/sections/SecLoop.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.sections;
 
 import ch.njol.skript.Skript;
@@ -25,23 +7,20 @@
 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.LoopSection;
+import ch.njol.skript.lang.*;
 import ch.njol.skript.lang.SkriptParser.ParseResult;
-import ch.njol.skript.lang.TriggerItem;
-import ch.njol.skript.lang.Variable;
 import ch.njol.skript.lang.util.ContainerExpression;
+import ch.njol.skript.registrations.Feature;
 import ch.njol.skript.util.Container;
 import ch.njol.skript.util.Container.ContainerType;
 import ch.njol.skript.util.LiteralUtils;
 import ch.njol.util.Kleenean;
+import com.google.common.collect.PeekingIterator;
 import org.bukkit.event.Event;
 import org.jetbrains.annotations.Nullable;
+import org.jetbrains.annotations.UnknownNullability;
 
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.WeakHashMap;
+import java.util.*;
 
 @Name("Loop")
 @Description({
@@ -65,19 +44,27 @@
 })
 @Examples({
 	"loop all players:",
-	"\tsend \"Hello %loop-player%!\" to loop-player",
+		"\tsend \"Hello %loop-player%!\" to loop-player",
 	"",
 	"loop items in player's inventory:",
-	"\tif loop-item is dirt:",
-	"\t\tset loop-item to air",
+		"\tif loop-item is dirt:",
+			"\t\tset loop-item to air",
 	"",
 	"loop 10 times:",
-	"\tsend title \"%11 - loop-value%\" and subtitle \"seconds left until the game begins\" to player for 1 second # 10, 9, 8 etc.",
-	"\twait 1 second",
+		"\tsend title \"%11 - loop-value%\" and subtitle \"seconds left until the game begins\" to player for 1 second # 10, 9, 8 etc.",
+		"\twait 1 second",
 	"",
 	"loop {Coins::*}:",
-	"\tset {Coins::%loop-index%} to loop-value + 5 # Same as \"add 5 to {Coins::%loop-index%}\" where loop-index is the uuid of " +
-		"the player and loop-value is the actually coins value such as 200"
+		"\tset {Coins::%loop-index%} to loop-value + 5 # Same as \"add 5 to {Coins::%loop-index%}\" where loop-index is the uuid of " +
+		"the player and loop-value is the number of coins for the player",
+	"",
+	"loop shuffled (integers between 0 and 8):",
+		"\tif all:",
+			"\t\tprevious loop-value = 1",
+			"\t\tloop-value = 4",
+			"\t\tnext loop-value = 8",
+		"\tthen:",
+			"\t\t kill all players"
 })
 @Since("1.0")
 public class SecLoop extends LoopSection {
@@ -86,14 +73,17 @@ public class SecLoop extends LoopSection {
 		Skript.registerSection(SecLoop.class, "loop %objects%");
 	}
 
-	@SuppressWarnings("NotNullFieldNotInitialized")
-	private Expression<?> expr;
+	protected @UnknownNullability Expression<?> expression;
 
 	private final transient Map<Event, Object> current = new WeakHashMap<>();
-	private final transient Map<Event, Iterator<?>> currentIter = new WeakHashMap<>();
+	private final transient Map<Event, Iterator<?>> iteratorMap = new WeakHashMap<>();
+	private final transient Map<Event, Object> previous = new WeakHashMap<>();
 
-	@Nullable
-	private TriggerItem actualNext;
+	protected @Nullable TriggerItem actualNext;
+	private boolean guaranteedToLoop;
+	private Object nextValue = null;
+	private boolean loopPeeking;
+	protected boolean iterableSingle;
 
 	@Override
 	@SuppressWarnings("unchecked")
@@ -103,24 +93,31 @@ public boolean init(Expression<?>[] exprs,
 						ParseResult parseResult,
 						SectionNode sectionNode,
 						List<TriggerItem> triggerItems) {
-		expr = LiteralUtils.defendExpression(exprs[0]);
-		if (!LiteralUtils.canInitSafely(expr)) {
+		this.expression = LiteralUtils.defendExpression(exprs[0]);
+		if (!LiteralUtils.canInitSafely(expression)) {
 			Skript.error("Can't understand this loop: '" + parseResult.expr.substring(5) + "'");
 			return false;
 		}
 
-		if (Container.class.isAssignableFrom(expr.getReturnType())) {
-			ContainerType type = expr.getReturnType().getAnnotation(ContainerType.class);
+		if (Container.class.isAssignableFrom(expression.getReturnType())) {
+			ContainerType type = expression.getReturnType().getAnnotation(ContainerType.class);
 			if (type == null)
-				throw new SkriptAPIException(expr.getReturnType().getName() + " implements Container but is missing the required @ContainerType annotation");
-			expr = new ContainerExpression((Expression<? extends Container<?>>) expr, type.value());
+				throw new SkriptAPIException(expression.getReturnType().getName() + " implements Container but is missing the required @ContainerType annotation");
+			this.expression = new ContainerExpression((Expression<? extends Container<?>>) expression, type.value());
 		}
 
-		if (expr.isSingle()) {
-			Skript.error("Can't loop '" + expr + "' because it's only a single value");
+		if (this.getParser().hasExperiment(Feature.QUEUES) // Todo: change this if other iterable things are added
+			&& expression.isSingle()
+			&& (expression instanceof Variable<?> || Iterable.class.isAssignableFrom(expression.getReturnType()))) {
+			// Some expressions return one thing but are potentially iterable anyway, e.g. queues
+			this.iterableSingle = true;
+		} else if (expression.isSingle()) {
+			Skript.error("Can't loop '" + expression + "' because it's only a single value");
 			return false;
 		}
+		loopPeeking = exprs[0].supportsLoopPeeking();
 
+		guaranteedToLoop = guaranteedToLoop(expression);
 		loadOptionalCode(sectionNode);
 		super.setNext(this);
 
@@ -128,41 +125,83 @@ public boolean init(Expression<?>[] exprs,
 	}
 
 	@Override
-	@Nullable
-	protected TriggerItem walk(Event event) {
-		Iterator<?> iter = currentIter.get(event);
+	protected @Nullable TriggerItem walk(Event event) {
+		Iterator<?> iter = iteratorMap.get(event);
 		if (iter == null) {
-			iter = expr instanceof Variable ? ((Variable<?>) expr).variablesIterator(event) : expr.iterator(event);
-			if (iter != null) {
-				if (iter.hasNext())
-					currentIter.put(event, iter);
-				else
+			if (iterableSingle) {
+				Object value = expression.getSingle(event);
+				if (value instanceof Iterable<?> iterable) {
+					iter = iterable.iterator();
+					// Guaranteed to be ordered so we try it first
+				} else if (value instanceof Container<?> container) {
+					iter = container.containerIterator();
+				} else {
+					iter = Collections.singleton(value).iterator();
+				}
+			} else {
+				iter = expression instanceof Variable<?> variable ? variable.variablesIterator(event) :
+					expression.iterator(event);
+				if (iter != null && iter.hasNext()) {
+					iteratorMap.put(event, iter);
+				} else {
 					iter = null;
+				}
 			}
 		}
-		if (iter == null || !iter.hasNext()) {
+
+		if (iter == null || (!iter.hasNext() && nextValue == null)) {
 			exit(event);
 			debug(event, false);
 			return actualNext;
 		} else {
-			current.put(event, iter.next());
-			currentLoopCounter.put(event, (currentLoopCounter.getOrDefault(event, 0L)) + 1);
+			previous.put(event, current.get(event));
+			if (nextValue != null) {
+				this.store(event, nextValue);
+				nextValue = null;
+			} else if (iter.hasNext()) {
+				this.store(event, iter.next());
+			}
 			return walk(event, true);
 		}
 	}
 
+	protected void store(Event event, Object next) {
+		this.current.put(event, next);
+		this.currentLoopCounter.put(event, (currentLoopCounter.getOrDefault(event, 0L)) + 1);
+	}
+
+	@Override
+	public @Nullable ExecutionIntent executionIntent() {
+		return guaranteedToLoop ? triggerExecutionIntent() : null;
+	}
+
 	@Override
 	public String toString(@Nullable Event event, boolean debug) {
-		return "loop " + expr.toString(event, debug);
+		return "loop " + expression.toString(event, debug);
 	}
 
-	@Nullable
-	public Object getCurrent(Event event) {
+	public @Nullable Object getCurrent(Event event) {
 		return current.get(event);
 	}
 
+	public @Nullable Object getNext(Event event) {
+		if (!loopPeeking)
+			return null;
+		Iterator<?> iter = iteratorMap.get(event);
+		if (iter == null || !iter.hasNext())
+			return null;
+		if (iter instanceof PeekingIterator<?> peekingIterator)
+			return peekingIterator.peek();
+		nextValue = iter.next();
+		return nextValue;
+	}
+
+	public @Nullable Object getPrevious(Event event) {
+		return previous.get(event);
+	}
+
 	public Expression<?> getLoopedExpression() {
-		return expr;
+		return expression;
 	}
 
 	@Override
@@ -180,8 +219,45 @@ public TriggerItem getActualNext() {
 	@Override
 	public void exit(Event event) {
 		current.remove(event);
-		currentIter.remove(event);
+		iteratorMap.remove(event);
+		previous.remove(event);
 		super.exit(event);
 	}
 
+	private static boolean guaranteedToLoop(Expression<?> expression) {
+		// If the expression is a literal, it's guaranteed to loop if it has at least one value
+		if (expression instanceof Literal<?> literal)
+			return literal.getAll().length > 0;
+
+		// If the expression isn't a list, then we can't guarantee that it will loop
+		if (!(expression instanceof ExpressionList<?> list))
+			return false;
+
+		// If the list is an OR list (a, b or c), then it's guaranteed to loop iff all its values are guaranteed to loop
+		if (!list.getAnd()) {
+			for (Expression<?> expr : list.getExpressions()) {
+				if (!guaranteedToLoop(expr))
+					return false;
+			}
+			return true;
+		}
+
+		// If the list is an AND list (a, b and c), then it's guaranteed to loop if any of its values are guaranteed to loop
+		for (Expression<?> expr : list.getExpressions()) {
+			if (guaranteedToLoop(expr))
+				return true;
+		}
+
+		// Otherwise, we can't guarantee that it will loop
+		return false;
+	}
+
+	public boolean supportsPeeking() {
+		return loopPeeking;
+	}
+
+	public Expression<?> getExpression() {
+		return expression;
+	}
+
 }
diff --git a/src/main/java/ch/njol/skript/sections/SecWhile.java b/src/main/java/ch/njol/skript/sections/SecWhile.java
index 7a04f6d0ca5..18626490ee3 100644
--- a/src/main/java/ch/njol/skript/sections/SecWhile.java
+++ b/src/main/java/ch/njol/skript/sections/SecWhile.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.sections;
 
 import ch.njol.skript.Skript;
@@ -24,18 +6,13 @@
 import ch.njol.skript.doc.Examples;
 import ch.njol.skript.doc.Name;
 import ch.njol.skript.doc.Since;
-import ch.njol.skript.lang.Condition;
-import ch.njol.skript.lang.Expression;
-import ch.njol.skript.lang.LoopSection;
+import ch.njol.skript.lang.*;
 import ch.njol.skript.lang.SkriptParser.ParseResult;
-import ch.njol.skript.lang.TriggerItem;
 import ch.njol.util.Kleenean;
 import org.bukkit.event.Event;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.List;
-import java.util.Map;
-import java.util.WeakHashMap;
 
 @Name("While Loop")
 @Description("While Loop sections are loops that will just keep repeating as long as a condition is met.")
@@ -59,7 +36,7 @@
 public class SecWhile extends LoopSection {
 
 	static {
-		Skript.registerSection(SecWhile.class, "[(:do)] while <.+>");
+		Skript.registerSection(SecWhile.class, "[:do] while <.+>");
 	}
 
 	@SuppressWarnings("NotNullFieldNotInitialized")
@@ -104,6 +81,11 @@ protected TriggerItem walk(Event event) {
 		}
 	}
 
+	@Override
+	public @Nullable ExecutionIntent executionIntent() {
+		return doWhile ? triggerExecutionIntent() : null;
+	}
+
 	@Override
 	public SecWhile setNext(@Nullable TriggerItem next) {
 		actualNext = next;
diff --git a/src/main/java/ch/njol/skript/structures/StructAliases.java b/src/main/java/ch/njol/skript/structures/StructAliases.java
index 37d26581734..003734678e5 100644
--- a/src/main/java/ch/njol/skript/structures/StructAliases.java
+++ b/src/main/java/ch/njol/skript/structures/StructAliases.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.structures;
 
 import ch.njol.skript.Skript;
@@ -39,7 +21,7 @@
 @Examples({
 	"aliases:",
 	"\tblacklisted items = TNT, bedrock, obsidian, mob spawner, lava, lava bucket",
-	"\tshiny swords = gold sword, iron sword, diamond sword"
+	"\tshiny swords = golden sword, iron sword, diamond sword"
 })
 @Since("1.0")
 public class StructAliases extends Structure {
diff --git a/src/main/java/ch/njol/skript/structures/StructCommand.java b/src/main/java/ch/njol/skript/structures/StructCommand.java
index 1b148bd624a..5c2ccbb89eb 100644
--- a/src/main/java/ch/njol/skript/structures/StructCommand.java
+++ b/src/main/java/ch/njol/skript/structures/StructCommand.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.structures;
 
 import ch.njol.skript.ScriptLoader;
diff --git a/src/main/java/ch/njol/skript/structures/StructEvent.java b/src/main/java/ch/njol/skript/structures/StructEvent.java
index 83c24d791c8..5033a0be5fa 100644
--- a/src/main/java/ch/njol/skript/structures/StructEvent.java
+++ b/src/main/java/ch/njol/skript/structures/StructEvent.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.structures;
 
 import ch.njol.skript.Skript;
diff --git a/src/main/java/ch/njol/skript/structures/StructExample.java b/src/main/java/ch/njol/skript/structures/StructExample.java
new file mode 100644
index 00000000000..c0a263f66d5
--- /dev/null
+++ b/src/main/java/ch/njol/skript/structures/StructExample.java
@@ -0,0 +1,74 @@
+package ch.njol.skript.structures;
+
+import ch.njol.skript.ScriptLoader;
+import ch.njol.skript.Skript;
+import ch.njol.skript.config.SectionNode;
+import ch.njol.skript.doc.*;
+import ch.njol.skript.lang.Literal;
+import ch.njol.skript.lang.SkriptParser.ParseResult;
+import ch.njol.skript.lang.function.FunctionEvent;
+import ch.njol.skript.lang.parser.ParserInstance;
+import ch.njol.skript.registrations.Feature;
+import org.bukkit.event.Event;
+import org.jetbrains.annotations.Nullable;
+import org.skriptlang.skript.lang.entry.EntryContainer;
+import org.skriptlang.skript.lang.structure.Structure;
+
+@NoDoc
+@Name("Example")
+@Description({
+	"Examples are structures that are parsed, but will never be run.",
+	"They are used as miniature tutorials for demonstrating code snippets in the example files.",
+	"Scripts containing an example are seen as 'examples' by the parser and may have special safety restrictions."
+})
+@Examples({"""
+	example:
+		broadcast "hello world"
+		# this is never run"""
+})
+@Since("2.10")
+public class StructExample extends Structure {
+
+	public static final Priority PRIORITY = new Priority(550);
+
+	static {
+		Skript.registerStructure(StructExample.class,
+			"example"
+		);
+	}
+
+	private SectionNode source;
+
+	@Override
+	public boolean init(Literal<?>[] literals, int matchedPattern, ParseResult parseResult,
+						@Nullable EntryContainer entryContainer) {
+		if (!this.getParser().hasExperiment(Feature.EXAMPLES))
+			return false;
+		assert entryContainer != null; // cannot be null for non-simple structures
+		this.source = entryContainer.getSource();
+		return true;
+	}
+
+	@Override
+	public boolean load() {
+		ParserInstance parser = this.getParser();
+		// This acts like a 'function' except without some of the features (e.g. returns)
+		// The code is parsed and loaded, but then discarded since it will never be run
+		// This allows things like parse problems and errors to be detected.
+		parser.setCurrentEvent("example", FunctionEvent.class);
+		ScriptLoader.loadItems(source);
+		parser.deleteCurrentEvent();
+		return true;
+	}
+
+	@Override
+	public Priority getPriority() {
+		return PRIORITY;
+	}
+
+	@Override
+	public String toString(@Nullable Event event, boolean debug) {
+		return "example";
+	}
+
+}
diff --git a/src/main/java/ch/njol/skript/structures/StructFunction.java b/src/main/java/ch/njol/skript/structures/StructFunction.java
index ec9feba732a..1a8ea11c478 100644
--- a/src/main/java/ch/njol/skript/structures/StructFunction.java
+++ b/src/main/java/ch/njol/skript/structures/StructFunction.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.structures;
 
 import ch.njol.skript.ScriptLoader;
diff --git a/src/main/java/ch/njol/skript/structures/StructOptions.java b/src/main/java/ch/njol/skript/structures/StructOptions.java
index df20ff0b4ee..2224a7b1641 100644
--- a/src/main/java/ch/njol/skript/structures/StructOptions.java
+++ b/src/main/java/ch/njol/skript/structures/StructOptions.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.structures;
 
 import ch.njol.skript.Skript;
diff --git a/src/main/java/ch/njol/skript/structures/StructUsing.java b/src/main/java/ch/njol/skript/structures/StructUsing.java
index 2ab5ace28fa..d1dae4f2e76 100644
--- a/src/main/java/ch/njol/skript/structures/StructUsing.java
+++ b/src/main/java/ch/njol/skript/structures/StructUsing.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.structures;
 
 import ch.njol.skript.Skript;
diff --git a/src/main/java/ch/njol/skript/structures/StructVariables.java b/src/main/java/ch/njol/skript/structures/StructVariables.java
index 8579dc2386f..1d8f818c514 100644
--- a/src/main/java/ch/njol/skript/structures/StructVariables.java
+++ b/src/main/java/ch/njol/skript/structures/StructVariables.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.structures;
 
 import java.util.ArrayDeque;
diff --git a/src/main/java/ch/njol/skript/test/platform/Environment.java b/src/main/java/ch/njol/skript/test/platform/Environment.java
index bbe2dc52ceb..907265db2e1 100644
--- a/src/main/java/ch/njol/skript/test/platform/Environment.java
+++ b/src/main/java/ch/njol/skript/test/platform/Environment.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.test.platform;
 
 import com.google.gson.Gson;
diff --git a/src/main/java/ch/njol/skript/test/platform/PlatformMain.java b/src/main/java/ch/njol/skript/test/platform/PlatformMain.java
index ab72df70985..744caa675b3 100644
--- a/src/main/java/ch/njol/skript/test/platform/PlatformMain.java
+++ b/src/main/java/ch/njol/skript/test/platform/PlatformMain.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.test.platform;
 
 import ch.njol.skript.test.utils.TestResults;
diff --git a/src/main/java/ch/njol/skript/test/runner/CondMethodExists.java b/src/main/java/ch/njol/skript/test/runner/CondMethodExists.java
index 3af79ec490d..b91d320a7c1 100644
--- a/src/main/java/ch/njol/skript/test/runner/CondMethodExists.java
+++ b/src/main/java/ch/njol/skript/test/runner/CondMethodExists.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.test.runner;
 
 import ch.njol.skript.conditions.base.PropertyCondition;
diff --git a/src/main/java/ch/njol/skript/test/runner/CondRunningJUnit.java b/src/main/java/ch/njol/skript/test/runner/CondRunningJUnit.java
index 399e144b09d..7df24949ab5 100644
--- a/src/main/java/ch/njol/skript/test/runner/CondRunningJUnit.java
+++ b/src/main/java/ch/njol/skript/test/runner/CondRunningJUnit.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.test.runner;
 
 import org.bukkit.event.Event;
diff --git a/src/main/java/ch/njol/skript/test/runner/EffAssert.java b/src/main/java/ch/njol/skript/test/runner/EffAssert.java
index d414980e282..03cce0f5369 100644
--- a/src/main/java/ch/njol/skript/test/runner/EffAssert.java
+++ b/src/main/java/ch/njol/skript/test/runner/EffAssert.java
@@ -1,68 +1,42 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.test.runner;
 
-import ch.njol.skript.conditions.CondCompare;
-import ch.njol.skript.config.Node;
-import ch.njol.skript.lang.VerboseAssert;
-import ch.njol.skript.registrations.Classes;
-import ch.njol.skript.util.LiteralUtils;
-import org.bukkit.event.Event;
-import org.jetbrains.annotations.Nullable;
-import org.skriptlang.skript.lang.comparator.Relation;
-import org.skriptlang.skript.lang.script.Script;
-
 import ch.njol.skript.Skript;
+import ch.njol.skript.config.Node;
 import ch.njol.skript.doc.Description;
 import ch.njol.skript.doc.Name;
 import ch.njol.skript.doc.NoDoc;
-import ch.njol.skript.lang.Condition;
-import ch.njol.skript.lang.Effect;
-import ch.njol.skript.lang.Expression;
+import ch.njol.skript.lang.*;
 import ch.njol.skript.lang.SkriptParser.ParseResult;
-import ch.njol.skript.lang.TriggerItem;
 import ch.njol.skript.log.ParseLogHandler;
 import ch.njol.skript.log.SkriptLogger;
+import ch.njol.skript.util.LiteralUtils;
 import ch.njol.util.Kleenean;
+import org.bukkit.event.Event;
+import org.jetbrains.annotations.Nullable;
+import org.skriptlang.skript.lang.script.Script;
 
 @Name("Assert")
 @Description("Assert that condition is true. Test fails when it is not.")
 @NoDoc
-public class EffAssert extends Effect  {
+public class EffAssert extends Effect {
+
+	private static final String DEFAULT_ERROR = "Assertion failed.";
 
 	static {
 		if (TestMode.ENABLED)
 			Skript.registerEffect(EffAssert.class,
-					"assert <.+> [(1:to fail)] with [error] %string%",
-					"assert <.+> [(1:to fail)] with [error] %string%, expected [value] %object%, [and] (received|got) [value] %object%");
+				"assert <.+> [(1:to fail)] with [error] %string%",
+				"assert <.+> [(1:to fail)] with [error] %string%, expected [value] %object%, [and] (received|got) [value] %object%",
+				"assert <.+> [(1:to fail)]");
 	}
 
-	@Nullable
-	private Condition condition;
+	private @Nullable Condition condition;
 	private Script script;
 	private int line;
 
-	private Expression<String> errorMsg;
-	@Nullable
-	private Expression<?> expected;
-	@Nullable
-	private Expression<?> got;
+	private @Nullable Expression<String> errorMsg;
+	private @Nullable Expression<?> expected;
+	private @Nullable Expression<?> got;
 	private boolean shouldFail;
 
 	@Override
@@ -74,49 +48,47 @@ public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelaye
 		}
 
 		String conditionString = parseResult.regexes.get(0).group();
-		errorMsg = (Expression<String>) exprs[0];
+		if (matchedPattern < 2)
+			this.errorMsg = (Expression<String>) exprs[0];
 		boolean canInit = true;
 		if (exprs.length > 1) {
-			expected = LiteralUtils.defendExpression(exprs[1]);
-			got = LiteralUtils.defendExpression(exprs[2]);
+			this.expected = LiteralUtils.defendExpression(exprs[1]);
+			this.got = LiteralUtils.defendExpression(exprs[2]);
 			canInit = LiteralUtils.canInitSafely(expected, got);
 		}
-		shouldFail = parseResult.mark != 0;
-		script = getParser().getCurrentScript();
+		this.shouldFail = parseResult.mark != 0;
+		this.script = getParser().getCurrentScript();
 		Node node = getParser().getNode();
-		line = node != null ? node.getLine() : -1;
-		
-		ParseLogHandler logHandler = SkriptLogger.startParseLogHandler();
-		try {
-			condition = Condition.parse(conditionString, "Can't understand this condition: " + conditionString);
+		this.line = node != null ? node.getLine() : -1;
+
+		try (ParseLogHandler logHandler = SkriptLogger.startParseLogHandler()) {
+			this.condition = Condition.parse(conditionString, "Can't understand this condition: " + conditionString);
 
 			if (shouldFail)
 				return true;
-			
+
 			if (condition == null) {
 				logHandler.printError();
 			} else {
 				logHandler.printLog();
 			}
-		} finally {
-			logHandler.stop();
 		}
 
 		return (condition != null) && canInit;
 	}
 
 	@Override
-	protected void execute(Event event) {}
+	protected void execute(Event event) {
+	}
 
 	@Nullable
 	@Override
 	public TriggerItem walk(Event event) {
 		if (shouldFail && condition == null)
-			return getNext();
+			return this.getNext();
 
 		if (condition.check(event) == shouldFail) {
-			String message = errorMsg.getSingle(event);
-			assert message != null; // Should not happen, developer needs to fix test.
+			String message = errorMsg != null ? errorMsg.getOptionalSingle(event).orElse(DEFAULT_ERROR) : DEFAULT_ERROR;
 
 			// generate expected/got message if possible
 			String expectedMessage = "";
@@ -147,7 +119,7 @@ public TriggerItem walk(Event event) {
 			}
 			return null;
 		}
-		return getNext();
+		return this.getNext();
 	}
 
 	@Override
diff --git a/src/main/java/ch/njol/skript/test/runner/EffDebug.java b/src/main/java/ch/njol/skript/test/runner/EffDebug.java
index 41a533a2fca..0ac98a60be9 100644
--- a/src/main/java/ch/njol/skript/test/runner/EffDebug.java
+++ b/src/main/java/ch/njol/skript/test/runner/EffDebug.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.test.runner;
 
 import java.util.Arrays;
diff --git a/src/main/java/ch/njol/skript/test/runner/EffObjectives.java b/src/main/java/ch/njol/skript/test/runner/EffObjectives.java
index 7134b2e3639..79d0a5e675b 100644
--- a/src/main/java/ch/njol/skript/test/runner/EffObjectives.java
+++ b/src/main/java/ch/njol/skript/test/runner/EffObjectives.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.test.runner;
 
 import java.util.Arrays;
diff --git a/src/main/java/ch/njol/skript/test/runner/EffRunRunnable.java b/src/main/java/ch/njol/skript/test/runner/EffRunRunnable.java
new file mode 100644
index 00000000000..551271f5943
--- /dev/null
+++ b/src/main/java/ch/njol/skript/test/runner/EffRunRunnable.java
@@ -0,0 +1,44 @@
+package ch.njol.skript.test.runner;
+
+import ch.njol.skript.Skript;
+import ch.njol.skript.doc.NoDoc;
+import ch.njol.skript.lang.Effect;
+import ch.njol.skript.lang.Expression;
+import ch.njol.skript.lang.SkriptParser.ParseResult;
+import ch.njol.skript.util.LiteralUtils;
+import ch.njol.util.Kleenean;
+import org.bukkit.Bukkit;
+import org.bukkit.event.Event;
+
+@NoDoc
+public class EffRunRunnable extends Effect {
+
+	static {
+		if (TestMode.ENABLED)
+			Skript.registerEffect(EffRunRunnable.class, "run %object%");
+	}
+
+	private Expression<?> task;
+
+	@Override
+	public boolean init(Expression<?>[] expressions, int pattern, Kleenean delayed, ParseResult result) {
+		this.task = LiteralUtils.defendExpression(expressions[0]);
+		return LiteralUtils.canInitSafely(task);
+	}
+
+	@Override
+	protected void execute(Event event) {
+		Object single = this.task.getSingle(event);
+		if (single instanceof Runnable runnable) {
+			runnable.run();
+		} else {
+			Bukkit.getLogger().severe("Tried to run a non-runnable " + single);
+		}
+	}
+
+	@Override
+	public String toString(Event event, boolean debug) {
+		return "run " + task.toString(event, debug);
+	}
+
+}
diff --git a/src/main/java/ch/njol/skript/test/runner/EffTestPluralClassInfos.java b/src/main/java/ch/njol/skript/test/runner/EffTestPluralClassInfos.java
new file mode 100644
index 00000000000..c379b7fea75
--- /dev/null
+++ b/src/main/java/ch/njol/skript/test/runner/EffTestPluralClassInfos.java
@@ -0,0 +1,70 @@
+package ch.njol.skript.test.runner;
+
+import ch.njol.skript.Skript;
+import ch.njol.skript.classes.ClassInfo;
+import ch.njol.skript.doc.Description;
+import ch.njol.skript.doc.Name;
+import ch.njol.skript.doc.NoDoc;
+import ch.njol.skript.lang.Effect;
+import ch.njol.skript.lang.Expression;
+import ch.njol.skript.lang.SkriptParser.ParseResult;
+import ch.njol.skript.registrations.Classes;
+import ch.njol.util.Kleenean;
+import org.bukkit.event.Event;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * This class is used to test whether class-info plurals are detected successfully.
+ * The syntax in it should never be parsed or used (even in test mode)
+ * and does nothing.
+ */
+@Name("Test Plural Class Infos")
+@Description("Tests that plural class infos are identified correctly.")
+@NoDoc
+public class EffTestPluralClassInfos extends Effect {
+
+	static {
+		class Example1 {}
+		class Example2 {}
+		class Example3 {}
+		class Example4 {}
+		if (TestMode.ENABLED) {
+			Classes.registerClass(new ClassInfo<>(Example1.class, "testgui")
+				.user("example1")
+				.name(ClassInfo.NO_DOC));
+			Classes.registerClass(new ClassInfo<>(Example2.class, "exemplus")
+				.user("example2")
+				.name(ClassInfo.NO_DOC));
+			Classes.registerClass(new ClassInfo<>(Example3.class, "aardwolf")
+				.user("example3")
+				.name(ClassInfo.NO_DOC));
+			Classes.registerClass(new ClassInfo<>(Example4.class, "hoof")
+				.user("example3")
+				.name(ClassInfo.NO_DOC));
+			Skript.registerEffect(EffTestPluralClassInfos.class,
+				"classinfo test for %testgui%",
+				"classinfo test for %testguis%",
+				"classinfo test for %exemplus%",
+				"classinfo test for %exempli%",
+				"classinfo test for %aardwolf%",
+				"classinfo test for %aardwolves%",
+				"classinfo test for %hoof%",
+				"classinfo test for %hooves%");
+		}
+	}
+
+	@Override
+	public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelayed, ParseResult parseResult) {
+		return false;
+	}
+
+	@Override
+	protected void execute(Event event) {
+	}
+
+	@Override
+	public String toString(@Nullable Event event, boolean debug) {
+		return "";
+	}
+
+}
diff --git a/src/main/java/ch/njol/skript/test/runner/EvtTestCase.java b/src/main/java/ch/njol/skript/test/runner/EvtTestCase.java
index 15e2bd9464b..2b055fb7257 100644
--- a/src/main/java/ch/njol/skript/test/runner/EvtTestCase.java
+++ b/src/main/java/ch/njol/skript/test/runner/EvtTestCase.java
@@ -1,38 +1,15 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.test.runner;
 
+import ch.njol.skript.Skript;
 import ch.njol.skript.doc.NoDoc;
+import ch.njol.skript.lang.*;
+import ch.njol.skript.registrations.EventValues;
 import org.bukkit.Location;
+import org.bukkit.World;
 import org.bukkit.block.Block;
 import org.bukkit.event.Event;
 import org.jetbrains.annotations.Nullable;
 
-import ch.njol.skript.Skript;
-import ch.njol.skript.lang.Condition;
-import ch.njol.skript.lang.Expression;
-import ch.njol.skript.lang.Literal;
-import ch.njol.skript.lang.SkriptEvent;
-import ch.njol.skript.lang.SkriptParser;
-import ch.njol.skript.registrations.EventValues;
-import ch.njol.skript.util.Getter;
-
 @NoDoc
 public class EvtTestCase extends SkriptEvent {
 
@@ -42,24 +19,14 @@ public class EvtTestCase extends SkriptEvent {
 					.description("Contents represent one test case.")
 					.examples("")
 					.since("2.5");
-			EventValues.registerEventValue(SkriptTestEvent.class, Block.class, new Getter<Block, SkriptTestEvent>() {
-				@Override
-				@Nullable
-				public Block get(SkriptTestEvent ignored) {
-					return SkriptJUnitTest.getBlock();
-				}
-			}, EventValues.TIME_NOW);
-			EventValues.registerEventValue(SkriptTestEvent.class, Location.class, new Getter<Location, SkriptTestEvent>() {
-				@Override
-				@Nullable
-				public Location get(SkriptTestEvent ignored) {
-					return SkriptJUnitTest.getTestLocation();
-				}
-			}, EventValues.TIME_NOW);
+
+			EventValues.registerEventValue(SkriptTestEvent.class, Block.class, ignored -> SkriptJUnitTest.getBlock());
+			EventValues.registerEventValue(SkriptTestEvent.class, Location.class, ignored -> SkriptJUnitTest.getTestLocation());
+			EventValues.registerEventValue(SkriptTestEvent.class, World.class, ignored -> SkriptJUnitTest.getTestWorld());
 		}
 	}
 
-	private Expression<String> name;
+	private Literal<String> name;
 
 	@Nullable
 	private Condition condition;
@@ -67,7 +34,7 @@ public Location get(SkriptTestEvent ignored) {
 	@Override
 	@SuppressWarnings("unchecked")
 	public boolean init(Literal<?>[] args, int matchedPattern, SkriptParser.ParseResult parseResult) {
-		name = (Expression<String>) args[0];
+		name = (Literal<String>) args[0];
 		if (!parseResult.regexes.isEmpty()) { // Do not parse or run unless condition is met
 			String cond = parseResult.regexes.get(0).group();
 			condition = Condition.parse(cond, "Can't understand this condition: " + cond);
@@ -77,7 +44,7 @@ public boolean init(Literal<?>[] args, int matchedPattern, SkriptParser.ParseRes
 
 	@Override
 	public boolean check(Event event) {
-		String n = name.getSingle(event);
+		String n = name.getSingle();
 		if (n == null)
 			return false;
 		Skript.info("Running test case " + n);
@@ -90,11 +57,13 @@ public boolean shouldLoadEvent() {
 		return condition != null ? condition.check(new SkriptTestEvent()) : true;
 	}
 
+	public String getTestName() {
+		return name.getSingle();
+	}
+
 	@Override
 	public String toString(@Nullable Event event, boolean debug) {
-		if (event != null)
-			return "test " + name.getSingle(event);
-		return "test case";
+		return "test " + name.getSingle();
 	}
 
 }
diff --git a/src/main/java/ch/njol/skript/test/runner/ExprExperimentalOnly.java b/src/main/java/ch/njol/skript/test/runner/ExprExperimentalOnly.java
index 40d7e48af03..b9dd57b69af 100644
--- a/src/main/java/ch/njol/skript/test/runner/ExprExperimentalOnly.java
+++ b/src/main/java/ch/njol/skript/test/runner/ExprExperimentalOnly.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.test.runner;
 
 import ch.njol.skript.Skript;
diff --git a/src/main/java/ch/njol/skript/test/runner/ExprKeyValueSet.java b/src/main/java/ch/njol/skript/test/runner/ExprKeyValueSet.java
new file mode 100644
index 00000000000..31e77dbef62
--- /dev/null
+++ b/src/main/java/ch/njol/skript/test/runner/ExprKeyValueSet.java
@@ -0,0 +1,68 @@
+package ch.njol.skript.test.runner;
+
+import ch.njol.skript.Skript;
+import ch.njol.skript.doc.NoDoc;
+import ch.njol.skript.lang.*;
+import ch.njol.skript.lang.util.SimpleExpression;
+import ch.njol.util.Kleenean;
+import org.bukkit.event.Event;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.Arrays;
+import java.util.Map;
+
+@NoDoc
+public class ExprKeyValueSet extends SimpleExpression<Object> implements KeyProviderExpression<Object> {
+
+	static {
+		if (TestMode.ENABLED)
+			Skript.registerExpression(ExprKeyValueSet.class, Object.class, ExpressionType.SIMPLE,
+				"test key values of %~objects%",
+				"test key values"
+			);
+	}
+
+	private static final Map<String, String> testSet = Map.of("hello", "there", "foo", "bar", "a", "b");
+
+	private Variable<?> variable;
+	@Override
+	public boolean init(Expression<?>[] expressions, int matchedPattern, Kleenean isDelayed, SkriptParser.ParseResult parseResult) {
+		if (matchedPattern == 0) {
+			Expression<?>  expression = expressions[0];
+			if (!(expression instanceof Variable<?> variable) || !variable.isList()) {
+				Skript.error("The expression '" + expression + "' is not a list variable.");
+				return false;
+			}
+			this.variable = variable;
+		}
+		return true;
+	}
+
+	@Override
+	public @NotNull String @NotNull [] getArrayKeys(Event event) throws IllegalStateException {
+		if (variable == null)
+			return testSet.keySet().toArray(new String[0]);
+		return variable.getArrayKeys(event);
+	}
+
+	@Override
+	protected Object @Nullable [] get(Event event) {
+		if (variable == null)
+			return testSet.values().toArray();
+		return variable.getArray(event);
+	}
+
+	@Override
+	public Class<?> getReturnType() {
+		return Object.class;
+	}
+
+	@Override
+	public String toString(@Nullable Event event, boolean debug) {
+		if (variable != null)
+			return "test key values of " + variable.toString(event, debug);
+		return "test key values";
+	}
+
+}
diff --git a/src/main/java/ch/njol/skript/test/runner/ExprParseLogs.java b/src/main/java/ch/njol/skript/test/runner/ExprParseLogs.java
index 7f5e8c7151b..fbacc5a2000 100644
--- a/src/main/java/ch/njol/skript/test/runner/ExprParseLogs.java
+++ b/src/main/java/ch/njol/skript/test/runner/ExprParseLogs.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.test.runner;
 
 import ch.njol.skript.Skript;
diff --git a/src/main/java/ch/njol/skript/test/runner/ExprSecRunnable.java b/src/main/java/ch/njol/skript/test/runner/ExprSecRunnable.java
new file mode 100644
index 00000000000..017d40d39af
--- /dev/null
+++ b/src/main/java/ch/njol/skript/test/runner/ExprSecRunnable.java
@@ -0,0 +1,79 @@
+package ch.njol.skript.test.runner;
+
+import ch.njol.skript.Skript;
+import ch.njol.skript.config.SectionNode;
+import ch.njol.skript.doc.NoDoc;
+import ch.njol.skript.expressions.base.SectionExpression;
+import ch.njol.skript.lang.Expression;
+import ch.njol.skript.lang.ExpressionType;
+import ch.njol.skript.lang.SkriptParser.ParseResult;
+import ch.njol.skript.lang.Trigger;
+import ch.njol.skript.lang.TriggerItem;
+import ch.njol.skript.variables.Variables;
+import ch.njol.util.Kleenean;
+import org.bukkit.event.Event;
+import org.bukkit.event.HandlerList;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.List;
+
+@NoDoc
+public class ExprSecRunnable extends SectionExpression<Object> {
+
+	public static class RunnableEvent extends Event {
+
+		@Override
+		@NotNull
+		public HandlerList getHandlers() {
+			throw new IllegalStateException();
+		}
+
+	}
+
+	static {
+		if (TestMode.ENABLED)
+			Skript.registerExpression(ExprSecRunnable.class, Object.class, ExpressionType.SIMPLE, "[a] new runnable");
+	}
+
+	private Trigger trigger;
+
+	@Override
+	@SuppressWarnings("unchecked")
+	public boolean init(Expression<?>[] expressions,
+						int pattern,
+						Kleenean delayed,
+						ParseResult result,
+						@Nullable SectionNode node,
+						@Nullable List<TriggerItem> triggerItems) {
+		if (node == null) {
+			Skript.error("Runnable expression needs a section!");
+			return false;
+		}
+		loadCode(node);
+		return true;
+	}
+
+	@Override
+	protected Object @Nullable [] get(Event event) {
+		return new Runnable[] {
+			() -> runSection(event)
+		};
+	}
+
+	@Override
+	public boolean isSingle() {
+		return true;
+	}
+
+	@Override
+	public Class<?> getReturnType() {
+		return Runnable.class;
+	}
+
+	@Override
+	public String toString(@Nullable Event event, boolean debug) {
+		return "a new runnable";
+	}
+
+}
diff --git a/src/main/java/ch/njol/skript/test/runner/ExprTestBlock.java b/src/main/java/ch/njol/skript/test/runner/ExprTestBlock.java
new file mode 100644
index 00000000000..fc7c079b7e3
--- /dev/null
+++ b/src/main/java/ch/njol/skript/test/runner/ExprTestBlock.java
@@ -0,0 +1,58 @@
+package ch.njol.skript.test.runner;
+
+import ch.njol.skript.Skript;
+import ch.njol.skript.doc.Description;
+import ch.njol.skript.doc.Examples;
+import ch.njol.skript.doc.Name;
+import ch.njol.skript.doc.NoDoc;
+import ch.njol.skript.lang.Expression;
+import ch.njol.skript.lang.ExpressionType;
+import ch.njol.skript.lang.SkriptParser.ParseResult;
+import ch.njol.skript.lang.util.SimpleExpression;
+import ch.njol.util.Kleenean;
+import org.bukkit.block.Block;
+import org.bukkit.event.Event;
+import org.jetbrains.annotations.Nullable;
+
+@Name("Test Block")
+@Description("The block the testing is taking place at.")
+@Examples({
+	"test \"example\":",
+		"\tset test block to air"
+})
+@NoDoc
+public class ExprTestBlock extends SimpleExpression<Block> {
+
+	static {
+		if (TestMode.ENABLED)
+			Skript.registerExpression(ExprTestBlock.class, Block.class, ExpressionType.SIMPLE,
+					"[the] test(-| )block");
+	}
+
+	@Override
+	public boolean init(Expression<?>[] expressions, int matchedPattern,
+						Kleenean isDelayed, ParseResult parseResult) {
+		return true;
+	}
+
+	@Override
+	protected Block @Nullable [] get(Event event) {
+		return new Block[]{SkriptJUnitTest.getBlock()};
+	}
+
+	@Override
+	public boolean isSingle() {
+		return true;
+	}
+
+	@Override
+	public Class<? extends Block> getReturnType() {
+		return Block.class;
+	}
+
+	@Override
+	public String toString(@Nullable Event event, boolean debug) {
+		return "the test block";
+	}
+
+}
diff --git a/src/main/java/ch/njol/skript/test/runner/ExprTestLocation.java b/src/main/java/ch/njol/skript/test/runner/ExprTestLocation.java
new file mode 100644
index 00000000000..1117fd6dad0
--- /dev/null
+++ b/src/main/java/ch/njol/skript/test/runner/ExprTestLocation.java
@@ -0,0 +1,59 @@
+package ch.njol.skript.test.runner;
+
+import ch.njol.skript.Skript;
+import ch.njol.skript.doc.Description;
+import ch.njol.skript.doc.Examples;
+import ch.njol.skript.doc.Name;
+import ch.njol.skript.doc.NoDoc;
+import ch.njol.skript.lang.Expression;
+import ch.njol.skript.lang.ExpressionType;
+import ch.njol.skript.lang.SkriptParser.ParseResult;
+import ch.njol.skript.lang.util.SimpleExpression;
+import ch.njol.util.Kleenean;
+import org.bukkit.Location;
+import org.bukkit.event.Event;
+import org.jetbrains.annotations.Nullable;
+
+@Name("Test Location")
+@Description("The location the testing is taking place at.")
+@Examples({
+	"test \"example\":",
+		"\tspawn zombie at test location",
+		"\tassert last spawned zombie's world is test world with \"zombie did not spawn in test world\""
+})
+@NoDoc
+public class ExprTestLocation extends SimpleExpression<Location> {
+
+	static {
+		if (TestMode.ENABLED)
+			Skript.registerExpression(ExprTestLocation.class, Location.class, ExpressionType.SIMPLE,
+					"[the] test(-| )location");
+	}
+
+	@Override
+	public boolean init(Expression<?>[] expressions, int matchedPattern,
+						Kleenean isDelayed, ParseResult parseResult) {
+		return true;
+	}
+
+	@Override
+	protected Location @Nullable [] get(Event event) {
+		return new Location[]{SkriptJUnitTest.getTestLocation()};
+	}
+
+	@Override
+	public boolean isSingle() {
+		return true;
+	}
+
+	@Override
+	public Class<? extends Location> getReturnType() {
+		return Location.class;
+	}
+
+	@Override
+	public String toString(@Nullable Event event, boolean debug) {
+		return "the test location";
+	}
+
+}
diff --git a/src/main/java/ch/njol/skript/test/runner/ExprTestLoopPeeking.java b/src/main/java/ch/njol/skript/test/runner/ExprTestLoopPeeking.java
new file mode 100644
index 00000000000..6719940fea4
--- /dev/null
+++ b/src/main/java/ch/njol/skript/test/runner/ExprTestLoopPeeking.java
@@ -0,0 +1,53 @@
+package ch.njol.skript.test.runner;
+
+import ch.njol.skript.Skript;
+import ch.njol.skript.lang.Expression;
+import ch.njol.skript.lang.ExpressionType;
+import ch.njol.skript.lang.SkriptParser.ParseResult;
+import ch.njol.skript.lang.util.SimpleExpression;
+import ch.njol.util.Kleenean;
+import org.bukkit.event.Event;
+import org.jetbrains.annotations.Nullable;
+
+public class ExprTestLoopPeeking extends SimpleExpression<Object> {
+
+	static {
+		Skript.registerExpression(ExprTestLoopPeeking.class, Object.class, ExpressionType.SIMPLE,
+			"test loop peeking disabled",
+			"test loop peeking enabled");
+	}
+
+	private boolean toPeek;
+
+	@Override
+	public boolean init(Expression<?>[] expressions, int matchedPattern, Kleenean isDelayed, ParseResult parseResult) {
+		toPeek = matchedPattern == 1;
+		return true;
+	}
+
+	@Override
+	protected Object @Nullable [] get(Event event) {
+		return new Object[]{1, 2, 3, 4, 5};
+	}
+
+	@Override
+	public boolean isSingle() {
+		return false;
+	}
+
+	@Override
+	public Class<Object> getReturnType() {
+		return Object.class;
+	}
+
+	@Override
+	public boolean supportsLoopPeeking() {
+		return toPeek;
+	}
+
+	@Override
+	public String toString(@Nullable Event event, boolean debug) {
+		return "test loop peeking";
+	}
+
+}
diff --git a/src/main/java/ch/njol/skript/test/runner/ExprTestStringLiteral.java b/src/main/java/ch/njol/skript/test/runner/ExprTestStringLiteral.java
index aedd7ef5a7f..48dd44588f7 100644
--- a/src/main/java/ch/njol/skript/test/runner/ExprTestStringLiteral.java
+++ b/src/main/java/ch/njol/skript/test/runner/ExprTestStringLiteral.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.test.runner;
 
 import ch.njol.skript.Skript;
diff --git a/src/main/java/ch/njol/skript/test/runner/ExprTestWorld.java b/src/main/java/ch/njol/skript/test/runner/ExprTestWorld.java
new file mode 100644
index 00000000000..abb9fdfac98
--- /dev/null
+++ b/src/main/java/ch/njol/skript/test/runner/ExprTestWorld.java
@@ -0,0 +1,59 @@
+package ch.njol.skript.test.runner;
+
+import ch.njol.skript.Skript;
+import ch.njol.skript.doc.Description;
+import ch.njol.skript.doc.Examples;
+import ch.njol.skript.doc.Name;
+import ch.njol.skript.doc.NoDoc;
+import ch.njol.skript.lang.Expression;
+import ch.njol.skript.lang.ExpressionType;
+import ch.njol.skript.lang.SkriptParser.ParseResult;
+import ch.njol.skript.lang.util.SimpleExpression;
+import ch.njol.util.Kleenean;
+import org.bukkit.World;
+import org.bukkit.event.Event;
+import org.jetbrains.annotations.Nullable;
+
+@Name("Test World")
+@Description("The world the testing is taking place in.")
+@Examples({
+	"test \"example\":",
+		"\tspawn zombie at test location",
+		"\tassert last spawned zombie's world is test world with \"zombie did not spawn in test world\""
+})
+@NoDoc
+public class ExprTestWorld extends SimpleExpression<World> {
+
+	static {
+		if (TestMode.ENABLED)
+			Skript.registerExpression(ExprTestWorld.class, World.class, ExpressionType.SIMPLE,
+					"[the] test(-| )world");
+	}
+
+	@Override
+	public boolean init(Expression<?>[] expressions, int matchedPattern,
+						Kleenean isDelayed, ParseResult parseResult) {
+		return true;
+	}
+
+	@Override
+	protected World @Nullable [] get(Event event) {
+		return new World[]{SkriptJUnitTest.getTestWorld()};
+	}
+
+	@Override
+	public boolean isSingle() {
+		return true;
+	}
+
+	@Override
+	public Class<? extends World> getReturnType() {
+		return World.class;
+	}
+
+	@Override
+	public String toString(@Nullable Event event, boolean debug) {
+		return "the test world";
+	}
+
+}
diff --git a/src/main/java/ch/njol/skript/test/runner/SecParse.java b/src/main/java/ch/njol/skript/test/runner/SecParse.java
index 8a890dbcfa7..f01d5029103 100644
--- a/src/main/java/ch/njol/skript/test/runner/SecParse.java
+++ b/src/main/java/ch/njol/skript/test/runner/SecParse.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.test.runner;
 
 import ch.njol.skript.Skript;
diff --git a/src/main/java/ch/njol/skript/test/runner/SecReturnable.java b/src/main/java/ch/njol/skript/test/runner/SecReturnable.java
index 03833d7132d..b06c82a56ae 100644
--- a/src/main/java/ch/njol/skript/test/runner/SecReturnable.java
+++ b/src/main/java/ch/njol/skript/test/runner/SecReturnable.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.test.runner;
 
 import ch.njol.skript.Skript;
diff --git a/src/main/java/ch/njol/skript/test/runner/SkriptAsyncJUnitTest.java b/src/main/java/ch/njol/skript/test/runner/SkriptAsyncJUnitTest.java
new file mode 100644
index 00000000000..6980a1ab127
--- /dev/null
+++ b/src/main/java/ch/njol/skript/test/runner/SkriptAsyncJUnitTest.java
@@ -0,0 +1,9 @@
+package ch.njol.skript.test.runner;
+
+/**
+ * All methods in this class marked with @Test will be run on a different thread from the main one.
+ * All tests are still done sequentially.
+ */
+public abstract class SkriptAsyncJUnitTest extends SkriptJUnitTest {
+
+}
diff --git a/src/main/java/ch/njol/skript/test/runner/SkriptJUnitTest.java b/src/main/java/ch/njol/skript/test/runner/SkriptJUnitTest.java
index 6988d537cff..69f2c656218 100644
--- a/src/main/java/ch/njol/skript/test/runner/SkriptJUnitTest.java
+++ b/src/main/java/ch/njol/skript/test/runner/SkriptJUnitTest.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.test.runner;
 
 import org.bukkit.Bukkit;
diff --git a/src/main/java/ch/njol/skript/test/runner/SkriptTestEvent.java b/src/main/java/ch/njol/skript/test/runner/SkriptTestEvent.java
index 558a7ae458e..daedf8e2286 100644
--- a/src/main/java/ch/njol/skript/test/runner/SkriptTestEvent.java
+++ b/src/main/java/ch/njol/skript/test/runner/SkriptTestEvent.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.test.runner;
 
 import org.bukkit.event.Event;
diff --git a/src/main/java/ch/njol/skript/test/runner/StructTestEntryContainer.java b/src/main/java/ch/njol/skript/test/runner/StructTestEntryContainer.java
new file mode 100644
index 00000000000..86d679e971b
--- /dev/null
+++ b/src/main/java/ch/njol/skript/test/runner/StructTestEntryContainer.java
@@ -0,0 +1,67 @@
+package ch.njol.skript.test.runner;
+
+import ch.njol.skript.ScriptLoader;
+import ch.njol.skript.Skript;
+import ch.njol.skript.config.SectionNode;
+import ch.njol.skript.lang.Literal;
+import ch.njol.skript.lang.SkriptParser.ParseResult;
+import ch.njol.skript.lang.Trigger;
+import ch.njol.skript.lang.TriggerItem;
+import org.bukkit.event.Event;
+import org.bukkit.event.HandlerList;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+import org.skriptlang.skript.lang.entry.EntryContainer;
+import org.skriptlang.skript.lang.entry.EntryValidator;
+import org.skriptlang.skript.lang.script.Script;
+import org.skriptlang.skript.lang.structure.Structure;
+
+import java.util.List;
+
+public class StructTestEntryContainer extends Structure {
+
+	public static class TestEvent extends Event {
+		@Override
+		public @NotNull HandlerList getHandlers() {
+			throw new IllegalStateException();
+		}
+	}
+
+	static {
+		if (TestMode.ENABLED)
+			Skript.registerStructure(StructTestEntryContainer.class,
+				EntryValidator.builder()
+					.addSection("has entry", true)
+					.build(),
+				"test entry container");
+	}
+
+	private EntryContainer entryContainer;
+
+	@Override
+	public boolean init(Literal<?>[] args, int matchedPattern, ParseResult parseResult, @Nullable EntryContainer entryContainer) {
+		assert entryContainer != null;
+		this.entryContainer = entryContainer;
+		if (entryContainer.hasEntry("has entry")) {
+			return true;
+		}
+		assert false;
+		return false;
+	}
+
+	@Override
+	public boolean load() {
+		SectionNode section = entryContainer.get("has entry", SectionNode.class, false);
+		List<TriggerItem> triggerItems = ScriptLoader.loadItems(section);
+		Script script = getParser().getCurrentScript();
+		Trigger trigger = new Trigger(script, "entry container test", null, triggerItems);
+		trigger.execute(new TestEvent());
+		return true;
+	}
+
+	@Override
+	public String toString(@Nullable Event event, boolean debug) {
+		return "test entry container";
+	}
+
+}
diff --git a/src/main/java/ch/njol/skript/test/runner/TestFeatures.java b/src/main/java/ch/njol/skript/test/runner/TestFeatures.java
index b975ff219f9..e42fcdb5d81 100644
--- a/src/main/java/ch/njol/skript/test/runner/TestFeatures.java
+++ b/src/main/java/ch/njol/skript/test/runner/TestFeatures.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.test.runner;
 
 import ch.njol.skript.Skript;
diff --git a/src/main/java/ch/njol/skript/test/runner/TestFunctions.java b/src/main/java/ch/njol/skript/test/runner/TestFunctions.java
index fe9a434cebe..faed1e0d409 100644
--- a/src/main/java/ch/njol/skript/test/runner/TestFunctions.java
+++ b/src/main/java/ch/njol/skript/test/runner/TestFunctions.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.test.runner;
 
 import ch.njol.skript.classes.ClassInfo;
@@ -24,30 +6,61 @@
 import ch.njol.skript.lang.function.SimpleJavaFunction;
 import ch.njol.skript.registrations.DefaultClasses;
 
+import java.io.File;
+
 /**
  * Functions available only to testing scripts.
  */
-@SuppressWarnings("null") // DefaultFunctions has this too... not ideal
 public class TestFunctions {
-	
+
 	static {
+		if (TestMode.ENABLED) // Prevent accidental registration if something visits this class
+			registerTestFunctions();
+	}
+
+	private static void registerTestFunctions() {
+
 		ClassInfo<String> stringClass = DefaultClasses.STRING;
 		Parameter<?>[] stringsParam = new Parameter[] {new Parameter<>("strs", stringClass, false, null)};
-		
-		Functions.registerFunction(new SimpleJavaFunction<Boolean>("caseEquals", stringsParam, DefaultClasses.BOOLEAN, true) {
+
+		Functions.registerFunction(new SimpleJavaFunction<>("case_equals", stringsParam, DefaultClasses.BOOLEAN,
+			true) {
 			@Override
 			public Boolean[] executeSimple(final Object[][] params) {
 				Object[] strs = params[0];
 				for (int i = 0; i < strs.length - 1; i++)
-					if (!strs[i].equals(strs[i+1]))
+					if (!strs[i].equals(strs[i + 1]))
 						return new Boolean[] {false};
 				return new Boolean[] {true};
 			}
 		}.description("Checks if the contents of a list of strings are strictly equal with case sensitivity.")
 			.examples("caseEquals(\"hi\", \"Hi\") = false",
-						"caseEquals(\"text\", \"text\", \"text\") = true", 
-						"caseEquals({some list variable::*})")
+				"caseEquals(\"text\", \"text\", \"text\") = true",
+				"caseEquals({some list variable::*})")
 			.since("2.5"));
+
+		Functions.registerFunction(new SimpleJavaFunction<>("line_separator", new Parameter[0],
+			DefaultClasses.STRING, true) {
+			@Override
+			public String[] executeSimple(Object[][] params) {
+				return new String[] {System.lineSeparator()};
+			}
+		}.description("""
+				Returns the real (platform-dependent) line separator:
+				typically line feed for UN*X or carriage return line feed for Windows.""")
+			.examples("broadcast \"hello\" + line_separator() + \"world\"")
+			.since("2.10"));
+
+		Functions.registerFunction(new SimpleJavaFunction<>("file_separator", new Parameter[0],
+			DefaultClasses.STRING, true) {
+			@Override
+			public String[] executeSimple(Object[][] params) {
+				return new String[] {File.separator};
+			}
+		}.description("Returns the real (platform-dependent) file separator: typically / for UN*X or \\ for Windows.")
+			.examples("file_separator() = \"/\"")
+			.since("2.10"));
+
 	}
-	
+
 }
diff --git a/src/main/java/ch/njol/skript/test/runner/TestMode.java b/src/main/java/ch/njol/skript/test/runner/TestMode.java
index fdebc5c57e1..7d01b75764c 100644
--- a/src/main/java/ch/njol/skript/test/runner/TestMode.java
+++ b/src/main/java/ch/njol/skript/test/runner/TestMode.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.test.runner;
 
 import java.io.File;
diff --git a/src/main/java/ch/njol/skript/test/runner/TestTracker.java b/src/main/java/ch/njol/skript/test/runner/TestTracker.java
index 152b7841eb9..f4932359383 100644
--- a/src/main/java/ch/njol/skript/test/runner/TestTracker.java
+++ b/src/main/java/ch/njol/skript/test/runner/TestTracker.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.test.runner;
 
 import java.io.File;
@@ -52,6 +34,10 @@ public static void testStarted(String name) {
 		currentTest = name;
 	}
 
+	public static void parsingStarted(String name) {
+		currentTest = name + " (parsing)";
+	}
+
 	public static void JUnitTestFailed(String currentTest, String msg) {
 		failedTests.put(currentTest, msg);
 	}
diff --git a/src/main/java/ch/njol/skript/test/utils/TestResults.java b/src/main/java/ch/njol/skript/test/utils/TestResults.java
index d8e9c036538..20c87ecf905 100644
--- a/src/main/java/ch/njol/skript/test/utils/TestResults.java
+++ b/src/main/java/ch/njol/skript/test/utils/TestResults.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.test.utils;
 
 import java.util.Map;
@@ -62,11 +44,15 @@ public boolean docsFailed() {
 
 	public String createReport() {
 		StringBuilder sb = new StringBuilder("Succeeded:\n");
+		if (succeeded.isEmpty())
+			sb.append("<reset> - none\n");
 		for (String test : succeeded)
-			sb.append(test).append('\n');
-		sb.append("Failed:\n");
+			sb.append("<reset> - <light green>").append(test).append('\n');
+		sb.append("<reset>Failed:\n");
+		if (failed.isEmpty())
+			sb.append("<reset> - none");
 		for (Map.Entry<String, String> entry : failed.entrySet())
-			sb.append(entry.getKey()).append(": ").append(entry.getValue()).append('\n');
+			sb.append("<reset> - <light red>").append(entry.getKey()).append("<reset>: <gray>").append(entry.getValue()).append('\n');
 		return sb.toString();
 	}
 
diff --git a/src/main/java/ch/njol/skript/timings/SkriptTimings.java b/src/main/java/ch/njol/skript/timings/SkriptTimings.java
index b6605df80d4..98ec82e58cd 100644
--- a/src/main/java/ch/njol/skript/timings/SkriptTimings.java
+++ b/src/main/java/ch/njol/skript/timings/SkriptTimings.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.timings;
 
 import org.jetbrains.annotations.Nullable;
@@ -27,12 +9,13 @@
 /**
  * Static utils for Skript timings.
  */
+@SuppressWarnings("removal")
 public class SkriptTimings {
-	
+
 	private static volatile boolean enabled;
 	@SuppressWarnings("null")
 	private static Skript skript; // Initialized on Skript load, before any timings would be used anyway
-	
+
 	@Nullable
 	public static Object start(String name) {
 		if (!enabled()) // Timings disabled :(
@@ -42,25 +25,25 @@ public static Object start(String name) {
 		assert timing != null;
 		return timing;
 	}
-	
+
 	public static void stop(@Nullable Object timing) {
 		if (timing == null) // Timings disabled...
 			return;
 		((Timing) timing).stopTimingIfSync();
 	}
-	
+
 	public static boolean enabled() {
 		// First check if we can run timings (enabled in settings + running Paper)
 		// After that (we know that class exists), check if server has timings running
 		return enabled && Timings.isTimingsEnabled();
 	}
-	
+
 	public static void setEnabled(boolean flag) {
 		enabled = flag;
 	}
-	
+
 	public static void setSkript(Skript plugin) {
 		skript = plugin;
 	}
-	
+
 }
diff --git a/src/main/java/ch/njol/skript/update/GithubChecker.java b/src/main/java/ch/njol/skript/update/GithubChecker.java
index ec53db32726..49bbc96fbb1 100644
--- a/src/main/java/ch/njol/skript/update/GithubChecker.java
+++ b/src/main/java/ch/njol/skript/update/GithubChecker.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.update;
 
 import java.io.IOException;
@@ -33,63 +15,67 @@
  * Uses Github API to check for updates.
  */
 public class GithubChecker implements UpdateChecker {
-	
+
 	/**
 	 * Github API response for GSON deserialization.
 	 */
 	public static class ResponseEntry {
+
 		public String url;
-	    public String assets_url;
-	    public String upload_url;
-	    public String html_url;
-	    public int id;
-	    public String tag_name;
-	    public String target_commitish;
-	    public String name;
-	    public boolean draft;
-	    
-	    public boolean prerelease;
-	    public String created_at;
-	    public String published_at;
-	    
-	    public static class AssetsEntry {
-	    	public int size;
-	    	public int download_count;
-	    	public String browser_download_url;
-	    }
-	    
-	    public List<AssetsEntry> assets;
-	    public String body; // Description of release
-	    
-	    @Override
-	    public String toString() {
-	    	return tag_name;
-	    }
-	    
-	    public static class Author {
-	    	public String login;
-	    	public int id;
-	    }
-	    
-	    public Author author;
+		public String assets_url;
+		public String upload_url;
+		public String html_url;
+		public int id;
+		public String tag_name;
+		public String target_commitish;
+		public String name;
+		public boolean draft;
+
+		public boolean prerelease;
+		public String created_at;
+		public String published_at;
+
+		public static class AssetsEntry {
+
+			public int size;
+			public int download_count;
+			public String browser_download_url;
+
+		}
+
+		public List<AssetsEntry> assets;
+		public String body; // Description of release
+
+		@Override
+		public String toString() {
+			return tag_name;
+		}
+
+		public static class Author {
+
+			public String login;
+			public int id;
+
+		}
+
+		public Author author;
 	}
-	
+
 	/**
 	 * Used for deserializing Github API output.
 	 */
 	private final Gson gson;
-	
+
 	public GithubChecker() {
 		this.gson = new Gson();
 	}
-	
+
 	private List<ResponseEntry> deserialize(String str) {
 		assert str != null : "Cannot deserialize null string";
-		@SuppressWarnings("serial")
 		Type listType = new TypeToken<List<ResponseEntry>>() {}.getType();
 		List<ResponseEntry> responses = gson.fromJson(str, listType);
 		assert responses != null;
-		
+
 		return responses;
 	}
 
@@ -115,7 +101,7 @@ public CompletableFuture<UpdateManifest> check(ReleaseManifest manifest, Release
 			 * Latest release in the channel we're using.
 			 */
 			ResponseEntry latest = null;
-			
+
 			/**
 			 * Current release, if found.
 			 */
@@ -125,32 +111,32 @@ public CompletableFuture<UpdateManifest> check(ReleaseManifest manifest, Release
 			for (ResponseEntry release : releases) {
 				String name = release.tag_name;
 				assert name != null;
-				
+
 				// Check if this is a suitable latest release
 				if (latest == null && channel.check(name)) {
 					latest = release;
 				}
-				
+
 				// Check whether this is a current release
 				if (manifest.id.equals(name)) {
 					current = release;
 					break; // Update can't be older than current release
 				}
 			}
-			
+
 			if (latest == null) {
 				return null; // No updates for this channel available
 			}
-			
+
 			if (current != null && latest.id == current.id) {
 				return null; // Already running latest in this channel
 			}
-			
+
 			// Validate the latest release
 			if (latest.assets.isEmpty()) {
 				return null; // Update not (yet?) downloadable
 			}
-			
+
 			try {
 				String name = latest.tag_name;
 				assert name != null;
@@ -164,7 +150,7 @@ public CompletableFuture<UpdateManifest> check(ReleaseManifest manifest, Release
 				} else {
 					download = new URL(latest.assets.get(0).browser_download_url);
 				}
-				
+
 				return new UpdateManifest(name, createdAt, patchNotes, download);
 			} catch (MalformedURLException e) {
 				throw new RuntimeException(e);
@@ -173,5 +159,5 @@ public CompletableFuture<UpdateManifest> check(ReleaseManifest manifest, Release
 		assert future != null;
 		return future;
 	}
-	
+
 }
diff --git a/src/main/java/ch/njol/skript/update/NoUpdateChecker.java b/src/main/java/ch/njol/skript/update/NoUpdateChecker.java
index d65f5ab09bb..acaae92f9f4 100644
--- a/src/main/java/ch/njol/skript/update/NoUpdateChecker.java
+++ b/src/main/java/ch/njol/skript/update/NoUpdateChecker.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.update;
 
 import java.util.concurrent.CompletableFuture;
diff --git a/src/main/java/ch/njol/skript/update/ReleaseChannel.java b/src/main/java/ch/njol/skript/update/ReleaseChannel.java
index e0c8ef5af12..caf7ca04651 100644
--- a/src/main/java/ch/njol/skript/update/ReleaseChannel.java
+++ b/src/main/java/ch/njol/skript/update/ReleaseChannel.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.update;
 
 import java.util.function.Function;
diff --git a/src/main/java/ch/njol/skript/update/ReleaseManifest.java b/src/main/java/ch/njol/skript/update/ReleaseManifest.java
index e1fe7737476..160a743e6ae 100644
--- a/src/main/java/ch/njol/skript/update/ReleaseManifest.java
+++ b/src/main/java/ch/njol/skript/update/ReleaseManifest.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.update;
 
 import java.lang.reflect.InvocationTargetException;
diff --git a/src/main/java/ch/njol/skript/update/ReleaseStatus.java b/src/main/java/ch/njol/skript/update/ReleaseStatus.java
index 72838333a35..aad575b3491 100644
--- a/src/main/java/ch/njol/skript/update/ReleaseStatus.java
+++ b/src/main/java/ch/njol/skript/update/ReleaseStatus.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.update;
 
 
@@ -23,30 +5,42 @@
  * Status of currently installed release.
  */
 public enum ReleaseStatus {
-	
+
 	/**
 	 * Latest release in channel. This is a good thing.
 	 */
-	LATEST,
+	LATEST("latest"),
 	
 	/**
 	 * Old, probably unsupported release.
 	 */
-	OUTDATED,
+	OUTDATED("outdated"),
 	
 	/**
-	 * Updates have not been checked, so it not known if any exist.
+	 * Updates have not been checked, so it is not known if any exist.
 	 */
-	UNKNOWN,
+	UNKNOWN("unknown"),
 	
 	/**
 	 * Updates have been checked, but this release was not found at all.
 	 * It might be not yet published.
 	 */
-	CUSTOM,
+	CUSTOM("custom"),
 
 	/**
 	 * Running a developer/nightly build, updates will not be checked.
 	 */
-	DEVELOPMENT
+	DEVELOPMENT("development");
+
+	private final String name;
+
+	ReleaseStatus(String name) {
+		this.name = name;
+	}
+
+	@Override
+	public String toString() {
+		return name;
+	}
+
 }
diff --git a/src/main/java/ch/njol/skript/update/UpdateChecker.java b/src/main/java/ch/njol/skript/update/UpdateChecker.java
index 5ae8df62708..e737db2861c 100644
--- a/src/main/java/ch/njol/skript/update/UpdateChecker.java
+++ b/src/main/java/ch/njol/skript/update/UpdateChecker.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.update;
 
 import java.util.concurrent.CompletableFuture;
diff --git a/src/main/java/ch/njol/skript/update/UpdateManifest.java b/src/main/java/ch/njol/skript/update/UpdateManifest.java
index 1c105ae246a..e44e056c87f 100644
--- a/src/main/java/ch/njol/skript/update/UpdateManifest.java
+++ b/src/main/java/ch/njol/skript/update/UpdateManifest.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.update;
 
 import java.net.URL;
diff --git a/src/main/java/ch/njol/skript/update/Updater.java b/src/main/java/ch/njol/skript/update/Updater.java
index 4f96cff424b..2922dacc98d 100644
--- a/src/main/java/ch/njol/skript/update/Updater.java
+++ b/src/main/java/ch/njol/skript/update/Updater.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.update;
 
 import java.util.concurrent.CompletableFuture;
diff --git a/src/main/java/ch/njol/skript/update/UpdaterState.java b/src/main/java/ch/njol/skript/update/UpdaterState.java
index 22682d8401c..982df2e57c3 100644
--- a/src/main/java/ch/njol/skript/update/UpdaterState.java
+++ b/src/main/java/ch/njol/skript/update/UpdaterState.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.update;
 
 
diff --git a/src/main/java/ch/njol/skript/util/AABB.java b/src/main/java/ch/njol/skript/util/AABB.java
index 6e5dec1ce20..87a6e09fa2b 100644
--- a/src/main/java/ch/njol/skript/util/AABB.java
+++ b/src/main/java/ch/njol/skript/util/AABB.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.util;
 
 import java.util.Iterator;
diff --git a/src/main/java/ch/njol/skript/util/AsyncEffect.java b/src/main/java/ch/njol/skript/util/AsyncEffect.java
index ae124fa0401..7786185f1ea 100644
--- a/src/main/java/ch/njol/skript/util/AsyncEffect.java
+++ b/src/main/java/ch/njol/skript/util/AsyncEffect.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.util;
 
 import org.bukkit.Bukkit;
diff --git a/src/main/java/ch/njol/skript/util/BlockInventoryHolder.java b/src/main/java/ch/njol/skript/util/BlockInventoryHolder.java
index a9d79945b02..9fc9ce71b04 100644
--- a/src/main/java/ch/njol/skript/util/BlockInventoryHolder.java
+++ b/src/main/java/ch/njol/skript/util/BlockInventoryHolder.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.util;
 
 import org.bukkit.block.BlockState;
diff --git a/src/main/java/ch/njol/skript/util/BlockSphereIterator.java b/src/main/java/ch/njol/skript/util/BlockSphereIterator.java
index 9a4bf5ab5b7..f65ad6159c2 100644
--- a/src/main/java/ch/njol/skript/util/BlockSphereIterator.java
+++ b/src/main/java/ch/njol/skript/util/BlockSphereIterator.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.util;
 
 import org.bukkit.Location;
diff --git a/src/main/java/ch/njol/skript/util/BlockStateBlock.java b/src/main/java/ch/njol/skript/util/BlockStateBlock.java
index 364ae09229c..6496c447304 100644
--- a/src/main/java/ch/njol/skript/util/BlockStateBlock.java
+++ b/src/main/java/ch/njol/skript/util/BlockStateBlock.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.util;
 
 import ch.njol.skript.Skript;
@@ -475,6 +457,7 @@ public BoundingBox getBoundingBox() {
 	}
 
 	@Override
+	@SuppressWarnings("removal")
 	public BlockSoundGroup getSoundGroup() {
 		return state.getBlock().getSoundGroup();
 	}
@@ -485,6 +468,7 @@ public BlockSoundGroup getSoundGroup() {
 	}
 
 	@Override
+	@SuppressWarnings("removal")
 	public String getTranslationKey() {
 		return state.getBlock().getTranslationKey();
 	}
@@ -500,6 +484,7 @@ public boolean isPreferredTool(@NotNull ItemStack tool) {
 	}
 
 	@Override
+	@SuppressWarnings("removal")
 	public boolean isValidTool(@NotNull ItemStack itemStack) {
 		return state.getBlock().isValidTool(itemStack);
 	}
@@ -525,6 +510,7 @@ public float getBreakSpeed(@NotNull Player player) {
 	}
 
 	@Override
+	@SuppressWarnings("removal")
 	public @NotNull String translationKey() {
 		return state.getBlock().getTranslationKey();
 	}
diff --git a/src/main/java/ch/njol/skript/util/BlockUtils.java b/src/main/java/ch/njol/skript/util/BlockUtils.java
index 1768fd5b4f6..213789e9251 100644
--- a/src/main/java/ch/njol/skript/util/BlockUtils.java
+++ b/src/main/java/ch/njol/skript/util/BlockUtils.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.util;
 
 import ch.njol.skript.Skript;
diff --git a/src/main/java/ch/njol/skript/util/ClassInfoReference.java b/src/main/java/ch/njol/skript/util/ClassInfoReference.java
index a5bf0720859..a0bec2dd74e 100644
--- a/src/main/java/ch/njol/skript/util/ClassInfoReference.java
+++ b/src/main/java/ch/njol/skript/util/ClassInfoReference.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.util;
 
 import ch.njol.skript.classes.ClassInfo;
diff --git a/src/main/java/ch/njol/skript/util/Color.java b/src/main/java/ch/njol/skript/util/Color.java
index 1c5671aea0a..3b3a7c02471 100644
--- a/src/main/java/ch/njol/skript/util/Color.java
+++ b/src/main/java/ch/njol/skript/util/Color.java
@@ -1,47 +1,47 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.util;
 
+import ch.njol.yggdrasil.YggdrasilSerializable.YggdrasilExtendedSerializable;
 import org.bukkit.DyeColor;
 import org.jetbrains.annotations.Nullable;
 
-import ch.njol.yggdrasil.YggdrasilSerializable.YggdrasilExtendedSerializable;
-
 public interface Color extends YggdrasilExtendedSerializable {
-	
+
 	/**
 	 * Gets Bukkit color representing this color.
 	 * @return Bukkit color.
 	 */
 	org.bukkit.Color asBukkitColor();
-	
-	
+
+	/**
+	 * @return The alpha component of this color.
+	 */
+	int getAlpha();
+
+	/**
+	 * @return The red component of this color.
+	 */
+	int getRed();
+
+	/**
+	 * @return The green component of this color.
+	 */
+	int getGreen();
+
+	/**
+	 * @return The blue component of this color.
+	 */
+	int getBlue();
+
 	/**
 	 * Gets Bukkit dye color representing this color, if one exists.
 	 * @return Dye color or null.
 	 */
 	@Nullable
 	DyeColor asDyeColor();
-	
+
 	/**
 	 * @return Name of the color.
 	 */
 	String getName();
-	
+
 }
diff --git a/src/main/java/ch/njol/skript/util/ColorRGB.java b/src/main/java/ch/njol/skript/util/ColorRGB.java
index ea23bfe464a..180b26e7c81 100644
--- a/src/main/java/ch/njol/skript/util/ColorRGB.java
+++ b/src/main/java/ch/njol/skript/util/ColorRGB.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.util;
 
 import ch.njol.skript.variables.Variables;
@@ -23,6 +5,9 @@
 import ch.njol.yggdrasil.Fields;
 import org.apache.commons.lang.math.NumberUtils;
 import org.bukkit.DyeColor;
+import org.jetbrains.annotations.ApiStatus;
+import org.jetbrains.annotations.Contract;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.io.NotSerializableException;
@@ -35,35 +20,110 @@ public class ColorRGB implements Color {
 	private static final Pattern RGB_PATTERN = Pattern.compile("(?>rgb|RGB) (\\d+), (\\d+), (\\d+)");
 
 	private org.bukkit.Color bukkit;
-	@Nullable
-	private DyeColor dye;
-	
+
+	private @Nullable DyeColor dye;
+
+	/**
+	 * Subject to being private in the future. Use {@link #fromRGB(int, int, int)}
+	 * This is to keep inline with other color classes.
+	 */
+	@Deprecated
+	@ApiStatus.Internal
 	public ColorRGB(int red, int green, int blue) {
-		this.bukkit = org.bukkit.Color.fromRGB(
+		this(org.bukkit.Color.fromRGB(
 			Math2.fit(0, red, 255),
 			Math2.fit(0, green, 255),
-			Math2.fit(0, blue, 255));
+			Math2.fit(0, blue, 255)));
+	}
+
+	/**
+	 * Subject to being private in the future. Use {@link #fromBukkitColor(org.bukkit.Color)}
+	 * This is to keep inline with other color classes.
+	 */
+	@Deprecated
+	@ApiStatus.Internal
+	public ColorRGB(org.bukkit.Color bukkit) {
 		this.dye = DyeColor.getByColor(bukkit);
+		this.bukkit = bukkit;
+	}
+
+	/**
+	 * Returns a ColorRGB object from the provided arguments. Versions lower than 1.19 will not support alpha values.
+	 * 
+	 * @param red red value (0 to 255)
+	 * @param green green value (0 to 255)
+	 * @param blue blue value (0 to 255)
+	 * @param alpha alpha value (0 to 255)
+	 * @return ColorRGB
+	 */
+	@Contract("_,_,_,_ -> new")
+	public static @NotNull ColorRGB fromRGBA(int red, int green, int blue, int alpha) {
+		return new ColorRGB(org.bukkit.Color.fromARGB(alpha, red, green, blue));
+	}
+
+	/**
+	 * Returns a ColorRGB object from the provided arguments.
+	 *
+	 * @param red red value (0 to 255)
+	 * @param green green value (0 to 255)
+	 * @param blue blue value (0 to 255)
+	 * @return ColorRGB
+	 */
+	@Contract("_,_,_ -> new")
+	public static @NotNull ColorRGB fromRGB(int red, int green, int blue) {
+		return new ColorRGB(red, green, blue);
+	}
+
+	/**
+	 * Returns a ColorRGB object from a bukkit color.
+	 *
+	 * @param bukkit the bukkit color to replicate
+	 * @return ColorRGB
+	 */
+	@Contract("_ -> new")
+	public static @NotNull ColorRGB fromBukkitColor(org.bukkit.Color bukkit) {
+		return new ColorRGB(bukkit);
 	}
-	
+
+	@Override
+	public int getAlpha() {
+		return bukkit.getAlpha();
+	}
+
+	@Override
+	public int getRed() {
+		return bukkit.getRed();
+	}
+
+	@Override
+	public int getGreen() {
+		return bukkit.getGreen();
+	}
+
+	@Override
+	public int getBlue() {
+		return bukkit.getBlue();
+	}
+
 	@Override
 	public org.bukkit.Color asBukkitColor() {
 		return bukkit;
 	}
-	
+
 	@Override
-	@Nullable
-	public DyeColor asDyeColor() {
+	public @Nullable DyeColor asDyeColor() {
 		return dye;
 	}
-	
+
 	@Override
 	public String getName() {
-		return "rgb " + bukkit.getRed() + ", " + bukkit.getGreen() + ", " + bukkit.getBlue();
+		String rgb = bukkit.getRed() + ", " + bukkit.getGreen() + ", " + bukkit.getBlue();
+		if (bukkit.getAlpha() != 255)
+			return "argb " + bukkit.getAlpha() + ", " + rgb;
+		return "rgb " + rgb;
 	}
 
-	@Nullable
-	public static ColorRGB fromString(String string) {
+	public static @Nullable ColorRGB fromString(String string) {
 		Matcher matcher = RGB_PATTERN.matcher(string);
 		if (!matcher.matches())
 			return null;
@@ -78,7 +138,7 @@ public static ColorRGB fromString(String string) {
 	public Fields serialize() throws NotSerializableException {
 		return new Fields(this, Variables.yggdrasil);
 	}
-	
+
 	@Override
 	public void deserialize(Fields fields) throws StreamCorruptedException, NotSerializableException {
 		org.bukkit.Color b = fields.getObject("bukkit", org.bukkit.Color.class);
@@ -91,4 +151,5 @@ public void deserialize(Fields fields) throws StreamCorruptedException, NotSeria
 			dye = d;
 		bukkit = b;
 	}
+
 }
diff --git a/src/main/java/ch/njol/skript/util/Container.java b/src/main/java/ch/njol/skript/util/Container.java
index f2efa3025dd..ae62726bf3b 100644
--- a/src/main/java/ch/njol/skript/util/Container.java
+++ b/src/main/java/ch/njol/skript/util/Container.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.util;
 
 import java.lang.annotation.Documented;
diff --git a/src/main/java/ch/njol/skript/util/Contract.java b/src/main/java/ch/njol/skript/util/Contract.java
index 6995ddf9f65..c4984bad339 100644
--- a/src/main/java/ch/njol/skript/util/Contract.java
+++ b/src/main/java/ch/njol/skript/util/Contract.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.util;
 
 import ch.njol.skript.lang.Expression;
diff --git a/src/main/java/ch/njol/skript/util/Date.java b/src/main/java/ch/njol/skript/util/Date.java
index 50e2fd88fe9..1f95e3e071f 100644
--- a/src/main/java/ch/njol/skript/util/Date.java
+++ b/src/main/java/ch/njol/skript/util/Date.java
@@ -1,142 +1,135 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.util;
 
-import java.util.TimeZone;
-
-import org.jetbrains.annotations.Nullable;
-
 import ch.njol.skript.SkriptConfig;
 import ch.njol.yggdrasil.YggdrasilSerializable;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.TimeZone;
+
+public class Date extends java.util.Date implements YggdrasilSerializable {
 
-/**
- * @author Peter Güttinger
- */
-public class Date implements Comparable<Date>, YggdrasilSerializable {
-	
-	/**
-	 * Timestamp. Should always be in computer time/UTC/GMT+0.
-	 */
-	private long timestamp;
-	
-	public Date() {
-		this(System.currentTimeMillis());
-	}
-	
-	public Date(final long timestamp) {
-		this.timestamp = timestamp;
-	}
-	
-	public Date(final long timestamp, final TimeZone zone) {
-		final long offset = zone.getOffset(timestamp);
-		this.timestamp = timestamp - offset;
-	}
-	
 	/**
 	 * Get a new Date with the current time
 	 *
 	 * @return New date with the current time
 	 */
 	public static Date now() {
-		return new Date(System.currentTimeMillis());
+		return new Date();
 	}
-	
-	public Timespan difference(final Date other) {
-		return new Timespan(Math.abs(timestamp - other.timestamp));
+
+	/**
+	 * Converts a {@link java.util.Date} to a {@link Date}.
+	 *
+	 * @param date The {@link java.util.Date} to convert.
+	 * @return The converted date.
+	 */
+	public static Date fromJavaDate(java.util.Date date) {
+		if (date instanceof Date ours)
+			return ours;
+		return new Date(date.getTime());
 	}
-	
-	@Override
-	public int compareTo(final @Nullable Date other) {
-		final long d = other == null ? timestamp : timestamp - other.timestamp;
-		return d < 0 ? -1 : d > 0 ? 1 : 0;
+
+	/**
+	 * Creates a new Date with the current time.
+	 */
+	public Date() {
+		super();
 	}
-	
-	@Override
-	public String toString() {
-		return SkriptConfig.formatDate(timestamp);
+
+	/**
+	 * Creates a new Date with the provided timestamp.
+	 *
+	 * @param timestamp The timestamp in milliseconds.
+	 */
+	public Date(long timestamp) {
+		super(timestamp);
 	}
-	
+
 	/**
-	 * Get the timestamp of this date
+	 * Creates a new Date with the provided timestamp and timezone.
 	 *
-	 * @return The timestamp in milliseconds
+	 * @param timestamp The timestamp in milliseconds.
+	 * @param zone The timezone to use.
 	 */
-	public long getTimestamp() {
-		return timestamp;
+	public Date(long timestamp, TimeZone zone) {
+		super(timestamp - zone.getOffset(timestamp));
 	}
-	
+
 	/**
 	 * Add a {@link Timespan} to this date
 	 *
-	 * @param span Timespan to add
+	 * @param other Timespan to add
 	 */
-	public void add(final Timespan span) {
-		timestamp += span.getMilliSeconds();
+	public void add(Timespan other) {
+		setTime(getTime() + other.getAs(Timespan.TimePeriod.MILLISECOND));
 	}
-	
+
 	/**
 	 * Subtract a {@link Timespan} from this date
 	 *
-	 * @param span Timespan to subtract
+	 * @param other Timespan to subtract
+	 */
+	public void subtract(Timespan other) {
+		setTime(getTime() - other.getAs(Timespan.TimePeriod.MILLISECOND));
+	}
+
+	/**
+	 * Returns the difference between this date and another date as a {@link Timespan}.
+	 *
+	 * @param other The other date.
+	 * @return The difference between the provided dates as a {@link Timespan}.
 	 */
-	public void subtract(final Timespan span) {
-		timestamp -= span.getMilliSeconds();
+	public Timespan difference(Date other) {
+		return new Timespan(Math.abs(getTime() - other.getTime()));
 	}
-	
+
 	/**
 	 * Get a new instance of this Date with the added timespan
 	 *
-	 * @param span Timespan to add to this Date
+	 * @param other Timespan to add to this Date
 	 * @return New Date with the added timespan
 	 */
-	public Date plus(Timespan span) {
-		return new Date(timestamp + span.getMilliSeconds());
+	public Date plus(Timespan other) {
+		return new Date(getTime() + other.getAs(Timespan.TimePeriod.MILLISECOND));
 	}
-	
+
 	/**
 	 * Get a new instance of this Date with the subtracted timespan
 	 *
-	 * @param span Timespan to subtract from this Date
+	 * @param other Timespan to subtract from this Date
 	 * @return New Date with the subtracted timespan
 	 */
-	public Date minus(Timespan span) {
-		return new Date(timestamp - span.getMilliSeconds());
+	public Date minus(Timespan other) {
+		return new Date(getTime() - other.getAs(Timespan.TimePeriod.MILLISECOND));
+	}
+
+	/**
+	 * @deprecated Use {@link #getTime()} instead.
+	 */
+	@Deprecated(forRemoval = true)
+	public long getTimestamp() {
+		return getTime();
 	}
-	
+
 	@Override
 	public int hashCode() {
-		final int prime = 31;
-		int result = 1;
-		result = prime * result + (int) (timestamp ^ (timestamp >>> 32));
-		return result;
+		return 31 + Long.hashCode(getTime());
 	}
-	
+
 	@Override
-	public boolean equals(final @Nullable Object obj) {
-		if (this == obj)
-			return true;
+	public boolean equals(@Nullable Object obj) {
 		if (obj == null)
 			return false;
-		if (!(obj instanceof Date))
+		if (!(obj instanceof java.util.Date other))
 			return false;
-		final Date other = (Date) obj;
-		return timestamp == other.timestamp;
+		if (this == obj)
+			return true;
+		return getTime() == other.getTime();
 	}
-	
+
+	@Override
+	public String toString() {
+		return SkriptConfig.formatDate(getTime());
+	}
+
 }
diff --git a/src/main/java/ch/njol/skript/util/DelayedChangeBlock.java b/src/main/java/ch/njol/skript/util/DelayedChangeBlock.java
index 6951a787c93..986f46f74f9 100644
--- a/src/main/java/ch/njol/skript/util/DelayedChangeBlock.java
+++ b/src/main/java/ch/njol/skript/util/DelayedChangeBlock.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.util;
 
 import ch.njol.skript.Skript;
@@ -456,6 +438,7 @@ public BoundingBox getBoundingBox() {
 	}
 
 	@Override
+	@SuppressWarnings("removal")
 	public BlockSoundGroup getSoundGroup() {
 		return block.getSoundGroup();
 	}
@@ -466,6 +449,7 @@ public BlockSoundGroup getSoundGroup() {
 	}
 
 	@Override
+	@SuppressWarnings("removal")
 	public String getTranslationKey() {
 		return block.getTranslationKey();
 	}
@@ -481,6 +465,7 @@ public boolean isPreferredTool(@NotNull ItemStack tool) {
 	}
 
 	@Override
+	@SuppressWarnings("removal")
 	public boolean isValidTool(@NotNull ItemStack itemStack) {
 		return block.isValidTool(itemStack);
 	}
@@ -507,6 +492,7 @@ public float getBreakSpeed(@NotNull Player player) {
 	}
 
 	@Override
+	@SuppressWarnings("removal")
 	public @NotNull String translationKey() {
 		return block.getTranslationKey();
 	}
diff --git a/src/main/java/ch/njol/skript/util/Direction.java b/src/main/java/ch/njol/skript/util/Direction.java
index 50b9aca87c0..d2f8e8fdf8c 100644
--- a/src/main/java/ch/njol/skript/util/Direction.java
+++ b/src/main/java/ch/njol/skript/util/Direction.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.util;
 
 import ch.njol.skript.lang.Expression;
diff --git a/src/main/java/ch/njol/skript/util/EmptyStacktraceException.java b/src/main/java/ch/njol/skript/util/EmptyStacktraceException.java
index b25f19a6206..69d4b82ae59 100644
--- a/src/main/java/ch/njol/skript/util/EmptyStacktraceException.java
+++ b/src/main/java/ch/njol/skript/util/EmptyStacktraceException.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.util;
 
 /**
diff --git a/src/main/java/ch/njol/skript/util/EnchantmentType.java b/src/main/java/ch/njol/skript/util/EnchantmentType.java
index dd8ab383128..6301da13d9e 100644
--- a/src/main/java/ch/njol/skript/util/EnchantmentType.java
+++ b/src/main/java/ch/njol/skript/util/EnchantmentType.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.util;
 
 import ch.njol.skript.aliases.ItemType;
diff --git a/src/main/java/ch/njol/skript/util/EnumUtils.java b/src/main/java/ch/njol/skript/util/EnumUtils.java
index 942d7ad0a20..ef537c7612b 100644
--- a/src/main/java/ch/njol/skript/util/EnumUtils.java
+++ b/src/main/java/ch/njol/skript/util/EnumUtils.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.util;
 
 import ch.njol.skript.Skript;
@@ -34,7 +16,7 @@
  * @see ch.njol.skript.classes.EnumClassInfo
  */
 public final class EnumUtils<E extends Enum<E>> {
-	
+
 	private final Class<E> enumClass;
 	private final String languageNode;
 
@@ -53,7 +35,7 @@ public EnumUtils(Class<E> enumClass, String languageNode) {
 		
 		Language.addListener(this::refresh);
 	}
-	
+
 	/**
 	 * Refreshes the representation of this Enum based on the currently stored language entries.
 	 */
@@ -69,7 +51,10 @@ void refresh() {
 			for (String option : options) {
 				option = option.toLowerCase(Locale.ENGLISH);
 				if (options.length == 1 && option.equals(key.toLowerCase(Locale.ENGLISH))) {
-					Skript.debug("Missing lang enum constant for '" + key + "'");
+					String[] splitKey = key.split("\\.");
+					String newKey = splitKey[1].replace('_', ' ').toLowerCase(Locale.ENGLISH) + " " + splitKey[0];
+					parseMap.put(newKey, constant);
+					Skript.debug("Missing lang enum constant for '" + key + "'. Using '" + newKey + "' for now.");
 					continue;
 				}
 
@@ -111,6 +96,16 @@ public String toString(E enumerator, int flags) {
 		return s != null ? s : enumerator.name();
 	}
 
+	/**
+	 * This method returns the string representation of an enumerator
+	 * @param enumerator The enumerator to represent as a string
+	 * @param flag not currently used
+	 * @return A string representation of the enumerator
+	 */
+	public String toString(E enumerator, StringMode flag) {
+		return toString(enumerator, flag.ordinal());
+	}
+
 	/**
 	 * @return A comma-separated string containing a list of all names representing the enumerators.
 	 * Note that some entries may represent the same enumerator.
@@ -118,5 +113,5 @@ public String toString(E enumerator, int flags) {
 	public String getAllNames() {
 		return StringUtils.join(parseMap.keySet(), ", ");
 	}
-	
+
 }
diff --git a/src/main/java/ch/njol/skript/util/ExceptionUtils.java b/src/main/java/ch/njol/skript/util/ExceptionUtils.java
index 366a2363583..45693febda2 100644
--- a/src/main/java/ch/njol/skript/util/ExceptionUtils.java
+++ b/src/main/java/ch/njol/skript/util/ExceptionUtils.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.util;
 
 import java.io.IOException;
diff --git a/src/main/java/ch/njol/skript/util/Experience.java b/src/main/java/ch/njol/skript/util/Experience.java
index 3953f31a973..6ee666cfefd 100644
--- a/src/main/java/ch/njol/skript/util/Experience.java
+++ b/src/main/java/ch/njol/skript/util/Experience.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.util;
 
 import org.jetbrains.annotations.Nullable;
diff --git a/src/main/java/ch/njol/skript/util/FileUtils.java b/src/main/java/ch/njol/skript/util/FileUtils.java
index c966ab8ddba..a5ff0d1cbcd 100644
--- a/src/main/java/ch/njol/skript/util/FileUtils.java
+++ b/src/main/java/ch/njol/skript/util/FileUtils.java
@@ -1,25 +1,8 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.util;
 
+import org.skriptlang.skript.lang.converter.Converter;
+
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -27,31 +10,19 @@
 import java.nio.file.StandardCopyOption;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
-
-import org.skriptlang.skript.lang.converter.Converter;
+import java.util.Comparator;
 
 /**
  * @author Peter Güttinger
  */
 public abstract class FileUtils {
-	
-	private static boolean RUNNINGJAVA6 = true;// = System.getProperty("java.version").startsWith("1.6"); // doesn't work reliably?
-	static {
-		try {
-			new File(".").toPath();
-			RUNNINGJAVA6 = false;
-		} catch (final NoSuchMethodError e) {
-			RUNNINGJAVA6 = true;
-		} catch (final Exception e) {
-			RUNNINGJAVA6 = false;
-		}
-	}
-	
+
 	private FileUtils() {}
-	
+
 	private final static SimpleDateFormat backupFormat = new SimpleDateFormat("yyyy-MM-dd_HH-mm-ss");
-	
+
 	/**
 	 * @return The current date and time
 	 */
@@ -60,7 +31,32 @@ public static String getBackupSuffix() {
 			return "" + backupFormat.format(System.currentTimeMillis());
 		}
 	}
-	
+
+	/**
+	 * Deletes files in backup directory to meet desired target, starting from oldest to newest
+	 *
+	 * @param varFile Variable file in order to get 'backups' directory
+	 * @param toKeep  Integer of how many files are to be left remaining
+	 * @throws IOException              If 'backups' directory is not found
+	 * @throws IllegalArgumentException If 'toKeep' parameter is less than 0
+	 */
+	public static void backupPurge(File varFile, int toKeep) throws IOException, IllegalArgumentException {
+		if (toKeep < 0)
+			throw new IllegalArgumentException("Called with invalid input, 'toKeep' can not be less than 0");
+		File backupDir = new File(varFile.getParentFile(), "backups" + File.separator);
+		if (!backupDir.exists() || !backupDir.isDirectory())
+			throw new IOException("Backup directory not found");
+		ArrayList<File> files = new ArrayList<File>(Arrays.asList(backupDir.listFiles()));
+		if (files == null || files.size() <= toKeep)
+			return;
+		if (toKeep > 0)
+			files.sort(Comparator.comparingLong(File::lastModified));
+		int numberToRemove = files.size() - toKeep;
+		for (int i = 0; i < numberToRemove; i++) {
+			files.get(i).delete();
+		}
+	}
+
 	public static File backup(final File f) throws IOException {
 		String name = f.getName();
 		final int c = name.lastIndexOf('.');
@@ -76,69 +72,26 @@ public static File backup(final File f) throws IOException {
 		copy(f, backup);
 		return backup;
 	}
-	
+
 	public static File move(final File from, final File to, final boolean replace) throws IOException {
 		if (!replace && to.exists())
 			throw new IOException("Can't rename " + from.getName() + " to " + to.getName() + ": The target file already exists");
-		if (!RUNNINGJAVA6) {
-			if (replace)
-				Files.move(from.toPath(), to.toPath(), StandardCopyOption.REPLACE_EXISTING, StandardCopyOption.ATOMIC_MOVE);
-			else
-				Files.move(from.toPath(), to.toPath(), StandardCopyOption.ATOMIC_MOVE);
+
+		if (replace) {
+			Files.move(from.toPath(), to.toPath(), StandardCopyOption.REPLACE_EXISTING, StandardCopyOption.ATOMIC_MOVE);
 		} else {
-			File moveTo = null;
-			if (replace && to.exists()) {
-				moveTo = new File(to.getAbsolutePath() + ".old0");
-				int i = 0;
-				while (moveTo.exists() && i < 1000)
-					moveTo = new File(to.getAbsolutePath() + ".old" + (++i));
-				if (i == 999 || !to.renameTo(moveTo))
-					throw new IOException("Can't rename " + from.getName() + " to " + to.getName() + ": Cannot temporarily rename the target file");
-			}
-			if (!from.renameTo(to)) {
-				if (moveTo != null)
-					moveTo.renameTo(to);
-				throw new IOException("Can't rename " + from.getName() + " to " + to.getName());
-			}
-			if (moveTo != null)
-				moveTo.delete();
+			Files.move(from.toPath(), to.toPath(), StandardCopyOption.ATOMIC_MOVE);
 		}
 		return to;
 	}
-	
+
 	public static void copy(final File from, final File to) throws IOException {
-		if (!RUNNINGJAVA6) {
-			Files.copy(from.toPath(), to.toPath(), StandardCopyOption.COPY_ATTRIBUTES);
-		} else {
-			FileInputStream in = null;
-			FileOutputStream out = null;
-			try {
-				in = new FileInputStream(from);
-				out = new FileOutputStream(to);
-				final byte[] buffer = new byte[4096];
-				int bytesRead;
-				while ((bytesRead = in.read(buffer)) != -1)
-					out.write(buffer, 0, bytesRead);
-			} catch (final Exception e) {
-				throw new IOException("Can't copy " + from.getName() + " to " + to.getName() + ": " + e.getLocalizedMessage(), e);
-			} finally {
-				if (in != null) {
-					try {
-						in.close();
-					} catch (final IOException e) {}
-				}
-				if (out != null) {
-					try {
-						out.close();
-					} catch (final IOException e) {}
-				}
-			}
-		}
+		Files.copy(from.toPath(), to.toPath(), StandardCopyOption.COPY_ATTRIBUTES);
 	}
-	
+
 	/**
 	 * @param directory
-	 * @param renamer Renames files. Return null to leave a file as-is.
+	 * @param renamer   Renames files. Return null to leave a file as-is.
 	 * @return A collection of all changed files (with their new names)
 	 * @throws IOException If renaming one of the files caused an IOException. Some files might have been renamed already.
 	 */
@@ -161,28 +114,23 @@ public static Collection<File> renameAll(final File directory, final Converter<S
 		}
 		return changed;
 	}
-	
+
 	/**
 	 * Saves the contents of an InputStream in a file.
-	 * 
-	 * @param in The InputStream to read from. This stream will not be closed when this method returns.
+	 *
+	 * @param in   The InputStream to read from. This stream will not be closed when this method returns.
 	 * @param file The file to save to. Will be replaced if it exists, or created if it doesn't.
 	 * @throws IOException
 	 */
 	public static void save(final InputStream in, final File file) throws IOException {
 		file.getParentFile().mkdirs();
-		FileOutputStream out = null;
-		try {
-			out = new FileOutputStream(file);
+		try (FileOutputStream out = new FileOutputStream(file)) {
 			final byte[] buffer = new byte[16 * 1024];
 			int read;
 			while ((read = in.read(buffer)) > 0) {
 				out.write(buffer, 0, read);
 			}
-		} finally {
-			if (out != null)
-				out.close();
 		}
 	}
-	
+
 }
diff --git a/src/main/java/ch/njol/skript/util/GameruleValue.java b/src/main/java/ch/njol/skript/util/GameruleValue.java
index 1544a24e152..091b0e63e43 100644
--- a/src/main/java/ch/njol/skript/util/GameruleValue.java
+++ b/src/main/java/ch/njol/skript/util/GameruleValue.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.util;
 
 import org.jetbrains.annotations.Nullable;
diff --git a/src/main/java/ch/njol/skript/util/Getter.java b/src/main/java/ch/njol/skript/util/Getter.java
index 8e7ad536f79..d10db7badc8 100644
--- a/src/main/java/ch/njol/skript/util/Getter.java
+++ b/src/main/java/ch/njol/skript/util/Getter.java
@@ -1,36 +1,18 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.util;
 
-import ch.njol.skript.classes.Converter;
 import org.jetbrains.annotations.Nullable;
+import org.skriptlang.skript.lang.converter.Converter;
 
 /**
  * Used to get a specific value from instances of some type.
- * 
+ *
+ * @deprecated use {@link Converter} instead
  * @param <R> the returned value type
  * @param <A> the type which holds the value
- * @author Peter Güttinger
  */
-@SuppressWarnings("deprecation") // for backwards compatibility
+@Deprecated(forRemoval = true)
 public abstract class Getter<R, A> implements Converter<A, R> {
-	
+
 	/**
 	 * Gets a value from the given object.
 	 * 
diff --git a/src/main/java/ch/njol/skript/util/LiteralUtils.java b/src/main/java/ch/njol/skript/util/LiteralUtils.java
index e980b7bcb07..a94d719b897 100644
--- a/src/main/java/ch/njol/skript/util/LiteralUtils.java
+++ b/src/main/java/ch/njol/skript/util/LiteralUtils.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.util;
 
 import java.util.stream.Stream;
diff --git a/src/main/java/ch/njol/skript/util/Patterns.java b/src/main/java/ch/njol/skript/util/Patterns.java
index e7b19194e9f..2239a921723 100644
--- a/src/main/java/ch/njol/skript/util/Patterns.java
+++ b/src/main/java/ch/njol/skript/util/Patterns.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.util;
 
 import ch.njol.skript.lang.Expression;
@@ -24,7 +6,7 @@
 import ch.njol.util.Kleenean;
 
 /**
- * A helper class useful when a expression/condition/effect/etc. needs to associate additional data with each pattern.
+ * A helper class useful when an expression/condition/effect/etc. needs to associate additional data with each pattern.
  * 
  * @author Peter Güttinger
  */
diff --git a/src/main/java/ch/njol/skript/util/PotionDataUtils.java b/src/main/java/ch/njol/skript/util/PotionDataUtils.java
index 4bc7adbc153..7fb246db6e4 100644
--- a/src/main/java/ch/njol/skript/util/PotionDataUtils.java
+++ b/src/main/java/ch/njol/skript/util/PotionDataUtils.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.util;
 
 import java.util.ArrayList;
@@ -31,7 +13,7 @@
 // Bukkit does not provide a way to get a PotionEffect from PotionData
 // This class allows us to convert base PotionData of an item into a PotionEffect
 public enum PotionDataUtils {
-	
+
 	FIRE_RESISTANCE(PotionType.FIRE_RESISTANCE, false, false, 3600, 0),
 	FIRE_RESISTANCE_LONG(PotionType.FIRE_RESISTANCE, true, false, 9600, 0),
 	HARMING(PotionEffectUtils.HAS_OLD_POTION_FIELDS ? "INSTANT_DAMAGE" : "HARMING", false, false, 1, 0),
@@ -70,7 +52,7 @@ 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;
 	@Nullable
@@ -79,7 +61,7 @@ public enum PotionDataUtils {
 	private final boolean upgraded;
 	private final int duration;
 	private final int amplifier;
-	
+
 	PotionDataUtils(PotionType potionType, boolean extended, boolean upgraded, int duration, int amplifier) {
 		this.potionType = potionType;
 		this.extended = extended;
@@ -87,7 +69,7 @@ public enum PotionDataUtils {
 		this.duration = duration;
 		this.amplifier = amplifier;
 	}
-	
+
 	PotionDataUtils(String potionType, boolean extended, boolean upgraded, int duration, int amplifier) {
 		try {
 			this.potionType = PotionType.valueOf(potionType.toUpperCase(Locale.ENGLISH));
@@ -100,14 +82,14 @@ public enum PotionDataUtils {
 		this.duration = duration;
 		this.amplifier = amplifier;
 	}
-	
+
 	/**
 	 * Convert {@link PotionData} to a {@link PotionEffect}
 	 *
 	 * @param potionData PotionData to convert
 	 * @return List of PotionEffects from the data
 	 */
-	@SuppressWarnings("null")
+	@SuppressWarnings({"removal", "null"})
 	public static List<PotionEffect> getPotionEffects(PotionData potionData) {
 		List<PotionEffect> potionEffects = new ArrayList<>();
 		for (PotionDataUtils value : PotionDataUtils.values()) {
@@ -127,7 +109,7 @@ public static List<PotionEffect> getPotionEffects(PotionData potionData) {
 
 	private static final PotionEffectType SLOW = PotionEffectUtils.HAS_OLD_POTION_FIELDS ? PotionEffectType.getByName("SLOW") : PotionEffectType.SLOWNESS;
 	private static final PotionEffectType DAMAGE_RESISTANCE = PotionEffectUtils.HAS_OLD_POTION_FIELDS ? PotionEffectType.getByName("DAMAGE_RESISTANCE") : PotionEffectType.RESISTANCE;
-	
+
 	// Bukkit does not account for the fact that Turtle Master has 2 potion effects
 	@SuppressWarnings("null")
 	private static List<PotionEffect> getSpecialTurtle(PotionDataUtils data) {
@@ -135,7 +117,7 @@ private static List<PotionEffect> getSpecialTurtle(PotionDataUtils data) {
 		int duration = data.extended ? 800 : 400;
 		int slowAmp = data.upgraded ? 5 : 3;
 		int resistanceAmp = data.upgraded ? 3 : 2;
-		
+
 		// This is a stupid bandaid because for some reason Skript wont compare these with potion effects from Skript
 		PotionEffectType slow = PotionEffectUtils.parseByEffectType(SLOW);
 		PotionEffectType damage = PotionEffectUtils.parseByEffectType(DAMAGE_RESISTANCE);
@@ -145,5 +127,5 @@ private static List<PotionEffect> getSpecialTurtle(PotionDataUtils data) {
 		}
 		return potionEffects;
 	}
-	
+
 }
diff --git a/src/main/java/ch/njol/skript/util/PotionEffectUtils.java b/src/main/java/ch/njol/skript/util/PotionEffectUtils.java
index 6616190b133..320da8ec856 100644
--- a/src/main/java/ch/njol/skript/util/PotionEffectUtils.java
+++ b/src/main/java/ch/njol/skript/util/PotionEffectUtils.java
@@ -1,47 +1,34 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.util;
 
+import java.io.StreamCorruptedException;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 
+import ch.njol.skript.classes.ClassInfo;
+import ch.njol.skript.classes.Parser;
+import ch.njol.skript.classes.Serializer;
+import ch.njol.skript.lang.ParseContext;
+import ch.njol.util.StringUtils;
+import ch.njol.yggdrasil.Fields;
 import org.bukkit.entity.LivingEntity;
-import org.bukkit.entity.ThrownPotion;
 import org.bukkit.inventory.meta.ItemMeta;
 import org.bukkit.inventory.meta.PotionMeta;
 import org.bukkit.inventory.meta.SuspiciousStewMeta;
-import org.bukkit.potion.Potion;
 import org.bukkit.potion.PotionData;
 import org.bukkit.potion.PotionEffect;
 import org.bukkit.potion.PotionEffectType;
 import org.bukkit.potion.PotionType;
+import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.Nullable;
 
 import ch.njol.skript.Skript;
 import ch.njol.skript.aliases.ItemType;
 import ch.njol.skript.localization.Language;
-import ch.njol.skript.localization.LanguageChangeListener;
 
-@SuppressWarnings("deprecation")
+@SuppressWarnings({"deprecation", "removal"})
 public abstract class PotionEffectUtils {
 
 	private static final boolean HAS_SUSPICIOUS_META = Skript.classExists("org.bukkit.inventory.meta.SuspiciousStewMeta");
@@ -50,45 +37,28 @@ public abstract class PotionEffectUtils {
 	private PotionEffectUtils() {}
 
 	final static Map<String, PotionEffectType> types = new HashMap<>();
+	private final static Map<String, String> names = new HashMap<>();
 
-	final static String[] names = new String[getMaxPotionId() + 1];
-
-	// MCPC+ workaround
-	private static int getMaxPotionId() {
-		int i = 0;
-		for (final PotionEffectType t : PotionEffectType.values()) {
-			if (t != null && t.getId() > i)
-				i = t.getId();
-		}
-		return i;
-	}
-	
 	static {
-		Language.addListener(new LanguageChangeListener() {
-			@Override
-			public void onLanguageChange() {
-				types.clear();
-				for (final PotionEffectType t : PotionEffectType.values()) {
-					if (t == null)
-						continue;
-					String name = t.getName();
-					if (name.startsWith("minecraft:")) // seems to be the case for experimental entries...
-						name = name.substring(10); // trim off namespace
-					final String[] ls = Language.getList("potions." + name);
-					names[t.getId()] = ls[0];
-					for (final String l : ls) {
-						types.put(l.toLowerCase(Locale.ENGLISH), t);
-					}
+		Language.addListener(() -> {
+			types.clear();
+			names.clear();
+			for (final PotionEffectType potionEffectType : PotionEffectType.values()) {
+				String key = potionEffectType.getKey().getKey();
+				final String[] entries = Language.getList("potion effect types." + key);
+				names.put(key, entries[0]);
+				for (final String entry : entries) {
+					types.put(entry.toLowerCase(Locale.ENGLISH), potionEffectType);
 				}
 			}
 		});
 	}
-	
+
 	@Nullable
 	public static PotionEffectType parseType(final String s) {
 		return types.get(s.toLowerCase(Locale.ENGLISH));
 	}
-	
+
 	// This is a stupid bandaid to fix comparison issues when converting potion datas
 	@Nullable
 	public static PotionEffectType parseByEffectType(PotionEffectType t) {
@@ -99,14 +69,14 @@ public static PotionEffectType parseByEffectType(PotionEffectType t) {
 		}
 		return null;
 	}
-	
+
 	public static String toString(PotionEffectType t) {
-		return names[t.getId()];
+		return names.get(t.getKey().getKey());
 	}
-	
+
 	// REMIND flags?
 	public static String toString(PotionEffectType t, int flags) {
-		return names[t.getId()];
+		return toString(t);
 	}
 
 	public static String toString(PotionEffect potionEffect) {
@@ -118,27 +88,16 @@ public static String toString(PotionEffect potionEffect) {
 		builder.append(" of tier ").append(potionEffect.getAmplifier() + 1);
 		if (!potionEffect.hasParticles())
 			builder.append(" without particles");
-		builder.append(" for ").append(potionEffect.getDuration() == -1 ? "infinity" : Timespan.fromTicks(Math.abs(potionEffect.getDuration())));
+		builder.append(" for ").append(potionEffect.getDuration() == -1 ? "infinity" : new Timespan(Timespan.TimePeriod.TICK, Math.abs(potionEffect.getDuration())));
 		if (!potionEffect.hasIcon())
 			builder.append(" without icon");
 		return builder.toString();
 	}
 
 	public static String[] getNames() {
-		return names;
-	}
-	
-	public static short guessData(final ThrownPotion p) {
-		if (p.getEffects().size() == 1) {
-			final PotionEffect e = p.getEffects().iterator().next();
-			PotionType type = PotionType.getByEffect(e.getType());
-			assert type != null;
-			final Potion d = new Potion(type).splash();
-			return d.toDamageValue();
-		}
-		return 0;
+		return names.values().toArray(new String[0]);
 	}
-	
+
 	/**
 	 * Checks if given string represents a known potion type and returns that type.
 	 * Unused currently, will be used soon (TM).
@@ -195,10 +154,10 @@ public static PotionType checkPotionType(String name) {
 			case "luck":
 				return PotionType.LUCK;
 		}
-		
+
 		return null;
 	}
-	
+
 	/**
 	 * Wrapper around deprecated API function, in case it gets removed.
 	 * Changing one method is easier that changing loads of them from different expressions.
@@ -209,7 +168,7 @@ public static PotionType checkPotionType(String name) {
 	public static PotionType effectToType(PotionEffectType effect) {
 		return PotionType.getByEffect(effect);
 	}
-	
+
 	/**
 	 * Get potion string representation.
 	 * @param effect
@@ -218,17 +177,17 @@ public static PotionType effectToType(PotionEffectType effect) {
 	 * @return
 	 */
 	public static String getPotionName(@Nullable PotionEffectType effect, boolean extended, boolean strong) {
-		if (effect == null) return "bottle of water"; 
-		
+		if (effect == null) return "bottle of water";
+
 		String s = "";
 		if (extended) s += "extended";
 		else if (strong) s += "strong";
 		s += " potion of ";
 		s += toString(effect);
-		
+
 		return s;
 	}
-	
+
 	/**
 	 * Clear all the active {@link PotionEffect PotionEffects} from an Entity
 	 *
@@ -237,7 +196,7 @@ public static String getPotionName(@Nullable PotionEffectType effect, boolean ex
 	public static void clearAllEffects(LivingEntity entity) {
 		entity.getActivePotionEffects().forEach(potionEffect -> entity.removePotionEffect(potionEffect.getType()));
 	}
-	
+
 	/**
 	 * Add PotionEffects to an entity
 	 *
@@ -253,11 +212,11 @@ else if (object instanceof PotionEffectType)
 				effect = new PotionEffect((PotionEffectType) object, 15 * 20, 0, false);
 			else
 				continue;
-			
+
 			entity.addPotionEffect(effect);
 		}
 	}
-	
+
 	/**
 	 * Remove a PotionEffect from an entity
 	 *
@@ -273,11 +232,11 @@ else if (object instanceof PotionEffectType)
 				effectType = (PotionEffectType) object;
 			else
 				continue;
-			
+
 			entity.removePotionEffect(effectType);
 		}
 	}
-	
+
 	/**
 	 * Clear all {@link PotionEffect PotionEffects} from an ItemType
 	 *
@@ -291,7 +250,7 @@ else if (HAS_SUSPICIOUS_META && meta instanceof SuspiciousStewMeta)
 			((SuspiciousStewMeta) meta).clearCustomEffects();
 		itemType.setItemMeta(meta);
 	}
-	
+
 	/**
 	 * Add PotionEffects to an ItemTye
 	 *
@@ -308,7 +267,7 @@ else if (object instanceof PotionEffectType)
 				effect = new PotionEffect((PotionEffectType) object, 15 * 20, 0, false);
 			else
 				continue;
-			
+
 			if (meta instanceof PotionMeta)
 				((PotionMeta) meta).addCustomEffect(effect, false);
 			else if (HAS_SUSPICIOUS_META && meta instanceof SuspiciousStewMeta)
@@ -316,7 +275,7 @@ else if (HAS_SUSPICIOUS_META && meta instanceof SuspiciousStewMeta)
 		}
 		itemType.setItemMeta(meta);
 	}
-	
+
 	/**
 	 * Remove a PotionEffect from an ItemType
 	 *
@@ -325,7 +284,7 @@ else if (HAS_SUSPICIOUS_META && meta instanceof SuspiciousStewMeta)
 	 */
 	public static void removeEffects(ItemType itemType, Object[] effects) {
 		ItemMeta meta = itemType.getItemMeta();
-		
+
 		for (Object object : effects) {
 			PotionEffectType effectType;
 			if (object instanceof PotionEffect)
@@ -334,7 +293,7 @@ else if (object instanceof PotionEffectType)
 				effectType = (PotionEffectType) object;
 			else
 				continue;
-			
+
 			if (meta instanceof PotionMeta)
 				((PotionMeta) meta).removeCustomEffect(effectType);
 			else if (HAS_SUSPICIOUS_META && meta instanceof SuspiciousStewMeta)
@@ -376,4 +335,80 @@ public static List<PotionEffect> getEffects(ItemType itemType) {
 		return effects;
 	}
 
+	/**
+	 * Legacy class info for PotionEffectType (pre-registry)
+	 *
+	 * @return ClassInfo for PotionEffeectType
+	 */
+	@ApiStatus.Internal
+	public static ClassInfo<PotionEffectType> getLegacyClassInfo() {
+		return new ClassInfo<>(PotionEffectType.class, "potioneffecttype")
+			.user("potion( ?effect)? ?types?") // "type" had to be made non-optional to prevent clashing with potion effects
+			.name("Potion Effect Type")
+			.description("A potion effect type, e.g. 'strength' or 'swiftness'.")
+			.usage(StringUtils.join(getNames(), ", "))
+			.examples("apply swiftness 5 to the player",
+				"apply potion of speed 2 to the player for 60 seconds",
+				"remove invisibility from the victim")
+			.since("")
+			.supplier(PotionEffectType.values())
+			.parser(new Parser<>() {
+				@Override
+				@Nullable
+				public PotionEffectType parse(final String string, final ParseContext context) {
+					return parseType(string);
+				}
+
+				@Override
+				public String toString(final PotionEffectType potionEffectType, final int flags) {
+					return PotionEffectUtils.toString(potionEffectType, flags);
+				}
+
+				@Override
+				public String toVariableNameString(final PotionEffectType potionEffectType) {
+					return toString(potionEffectType, 0);
+				}
+			})
+			.serializer(new Serializer<>() {
+				@Override
+				public Fields serialize(final PotionEffectType potionEffectType) {
+					final Fields f = new Fields();
+					f.putObject("name", potionEffectType.getKey().getKey());
+					return f;
+				}
+
+				@Override
+				public boolean canBeInstantiated() {
+					return false;
+				}
+
+				@Override
+				public void deserialize(final PotionEffectType o, final Fields f) {
+					assert false;
+				}
+
+				@Override
+				protected PotionEffectType deserialize(final Fields fields) throws StreamCorruptedException {
+					final String name = fields.getObject("name", String.class);
+					assert name != null;
+					final PotionEffectType t = PotionEffectType.getByName(name);
+					if (t == null)
+						throw new StreamCorruptedException("Invalid PotionEffectType " + name);
+					return t;
+				}
+
+				// return o.getName();
+				@Override
+				@Nullable
+				public PotionEffectType deserialize(final String s) {
+					return PotionEffectType.getByName(s);
+				}
+
+				@Override
+				public boolean mustSyncDeserialization() {
+					return false;
+				}
+			});
+	}
+
 }
diff --git a/src/main/java/ch/njol/skript/util/SkriptColor.java b/src/main/java/ch/njol/skript/util/SkriptColor.java
index 7d03b13ed81..ce9977d4c37 100644
--- a/src/main/java/ch/njol/skript/util/SkriptColor.java
+++ b/src/main/java/ch/njol/skript/util/SkriptColor.java
@@ -1,23 +1,14 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.util;
 
+import ch.njol.skript.localization.Adjective;
+import ch.njol.skript.localization.Language;
+import ch.njol.skript.variables.Variables;
+import ch.njol.yggdrasil.Fields;
+import org.bukkit.ChatColor;
+import org.bukkit.DyeColor;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
 import java.io.NotSerializableException;
 import java.io.StreamCorruptedException;
 import java.util.Arrays;
@@ -26,18 +17,6 @@
 import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
-import java.util.regex.Pattern;
-
-import org.bukkit.ChatColor;
-import org.bukkit.DyeColor;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-import ch.njol.skript.Skript;
-import ch.njol.skript.localization.Adjective;
-import ch.njol.skript.localization.Language;
-import ch.njol.skript.variables.Variables;
-import ch.njol.yggdrasil.Fields;
 
 @SuppressWarnings("null")
 public enum SkriptColor implements Color {
@@ -96,7 +75,27 @@ public enum SkriptColor implements Color {
 	public org.bukkit.Color asBukkitColor() {
 		return dye.getColor();
 	}
-	
+
+	@Override
+	public int getAlpha() {
+		return dye.getColor().getAlpha();
+	}
+
+	@Override
+	public int getRed() {
+		return dye.getColor().getRed();
+	}
+
+	@Override
+	public int getGreen() {
+		return dye.getColor().getGreen();
+	}
+
+	@Override
+	public int getBlue() {
+		return dye.getColor().getBlue();
+	}
+
 	@Override
 	public DyeColor asDyeColor() {
 		return dye;
@@ -176,10 +175,9 @@ public static SkriptColor fromDyeColor(DyeColor dye) {
 	
 	public static SkriptColor fromBukkitColor(org.bukkit.Color color) {
 		for (SkriptColor c : colors) {
-			if (c.asBukkitColor().equals(color))
+			if (c.asBukkitColor().equals(color) || c.asDyeColor().getFireworkColor().equals(color))
 				return c;
 		}
-		assert false;
 		return null;
 	}
 	
diff --git a/src/main/java/ch/njol/skript/util/Slot.java b/src/main/java/ch/njol/skript/util/Slot.java
deleted file mode 100644
index ff1094bb303..00000000000
--- a/src/main/java/ch/njol/skript/util/Slot.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
-package ch.njol.skript.util;
-
-/**
- * Preserved for addon compatibility for a limited amount of time.
- * Please, do use {@link ch.njol.skript.util.slot.Slot} instead!
- * @deprecated Slot stuff got its own package.
- */
-@Deprecated
-public abstract class Slot extends ch.njol.skript.util.slot.Slot {
-}
diff --git a/src/main/java/ch/njol/skript/util/StringMode.java b/src/main/java/ch/njol/skript/util/StringMode.java
index 327fe5b98b3..bbd16546013 100644
--- a/src/main/java/ch/njol/skript/util/StringMode.java
+++ b/src/main/java/ch/njol/skript/util/StringMode.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.util;
 
 /**
diff --git a/src/main/java/ch/njol/skript/util/StructureType.java b/src/main/java/ch/njol/skript/util/StructureType.java
index cd86d074cdb..f15182c7892 100644
--- a/src/main/java/ch/njol/skript/util/StructureType.java
+++ b/src/main/java/ch/njol/skript/util/StructureType.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.util;
 
 import java.util.HashMap;
@@ -30,7 +12,6 @@
 import org.jetbrains.annotations.Nullable;
 
 import ch.njol.skript.localization.Language;
-import ch.njol.skript.localization.LanguageChangeListener;
 import ch.njol.skript.localization.Noun;
 import ch.njol.util.coll.CollectionUtils;
 
@@ -100,12 +81,7 @@ public boolean is(final TreeType type) {
 	final static Map<Pattern, StructureType> parseMap = new HashMap<>();
 	
 	static {
-		Language.addListener(new LanguageChangeListener() {
-			@Override
-			public void onLanguageChange() {
-				parseMap.clear();
-			}
-		});
+		Language.addListener(parseMap::clear);
 	}
 	
 	@Nullable
diff --git a/src/main/java/ch/njol/skript/util/Task.java b/src/main/java/ch/njol/skript/util/Task.java
index 86d4c03cac5..068b1cc758d 100644
--- a/src/main/java/ch/njol/skript/util/Task.java
+++ b/src/main/java/ch/njol/skript/util/Task.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.util;
 
 import java.util.concurrent.Callable;
@@ -33,45 +15,46 @@
 /**
  * @author Peter Güttinger
  */
+@SuppressWarnings("removal")
 public abstract class Task implements Runnable, Closeable {
-	
+
 	private final Plugin plugin;
 	private final boolean async;
 	private long period = -1;
-	
+
 	private int taskID = -1;
-	
+
 	public Task(final Plugin plugin, final long delay, final long period) {
 		this(plugin, delay, period, false);
 	}
-	
+
 	public Task(final Plugin plugin, final long delay, final long period, final boolean async) {
 		this.plugin = plugin;
 		this.period = period;
 		this.async = async;
 		schedule(delay);
 	}
-	
+
 	public Task(final Plugin plugin, final long delay) {
 		this(plugin, delay, false);
 	}
-	
+
 	public Task(final Plugin plugin, final long delay, final boolean async) {
 		this.plugin = plugin;
 		this.async = async;
 		schedule(delay);
 	}
-	
+
 	/**
 	 * Only call this if the task is not alive.
-	 * 
+	 *
 	 * @param delay
 	 */
 	private void schedule(final long delay) {
 		assert !isAlive();
 		if (!Skript.getInstance().isEnabled())
 			return;
-		
+
 		if (period == -1) {
 			if (async) {
 				taskID = Bukkit.getScheduler().runTaskLaterAsynchronously(plugin, this, delay).getTaskId();
@@ -87,7 +70,7 @@ private void schedule(final long delay) {
 		}
 		assert taskID != -1;
 	}
-	
+
 	/**
 	 * @return Whether this task is still running, i.e. whether it will run later or is currently running.
 	 */
@@ -96,7 +79,7 @@ public final boolean isAlive() {
 			return false;
 		return Bukkit.getScheduler().isQueued(taskID) || Bukkit.getScheduler().isCurrentlyRunning(taskID);
 	}
-	
+
 	/**
 	 * Cancels this task.
 	 */
@@ -106,15 +89,15 @@ public final void cancel() {
 			taskID = -1;
 		}
 	}
-	
+
 	@Override
 	public void close() {
 		cancel();
 	}
-	
+
 	/**
 	 * Re-schedules the task to run next after the given delay. If this task was repeating it will continue so using the same period as before.
-	 * 
+	 *
 	 * @param delay
 	 */
 	public void setNextExecution(final long delay) {
@@ -122,10 +105,10 @@ public void setNextExecution(final long delay) {
 		cancel();
 		schedule(delay);
 	}
-	
+
 	/**
 	 * Sets the period of this task. This will re-schedule the task to be run next after the given period if the task is still running.
-	 * 
+	 *
 	 * @param period Period in ticks or -1 to cancel the task and make it non-repeating
 	 */
 	public void setPeriod(final long period) {
@@ -139,7 +122,7 @@ public void setPeriod(final long period) {
 				schedule(period);
 		}
 	}
-	
+
 	/**
 	 * Equivalent to <tt>{@link #callSync(Callable, Plugin) callSync}(c, {@link Skript#getInstance()})</tt>
 	 */
@@ -147,12 +130,12 @@ public void setPeriod(final long period) {
 	public static <T> T callSync(final Callable<T> c) {
 		return callSync(c, Skript.getInstance());
 	}
-	
+
 	/**
 	 * Calls a method on Bukkit's main thread.
 	 * <p>
 	 * Hint: Use a Callable&lt;Void&gt; to make a task which blocks your current thread until it is completed.
-	 * 
+	 *
 	 * @param c The method
 	 * @param p The plugin that owns the task. Must be enabled.
 	 * @return What the method returned or null if it threw an error or was stopped (usually due to the server shutting down)
@@ -175,8 +158,8 @@ public static <T> T callSync(final Callable<T> c, final Plugin p) {
 			}
 		} catch (final ExecutionException e) {
 			Skript.exception(e);
-		} catch (final CancellationException e) {} catch (final ThreadDeath e) {}// server shutting down
+		} catch (final CancellationException e) {}
 		return null;
 	}
-	
+
 }
diff --git a/src/main/java/ch/njol/skript/util/Time.java b/src/main/java/ch/njol/skript/util/Time.java
index 30cf6c8b506..cba21da59af 100644
--- a/src/main/java/ch/njol/skript/util/Time.java
+++ b/src/main/java/ch/njol/skript/util/Time.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.util;
 
 import java.util.regex.Matcher;
diff --git a/src/main/java/ch/njol/skript/util/Timeperiod.java b/src/main/java/ch/njol/skript/util/Timeperiod.java
index 1144e0b5ab2..b700521f4fa 100644
--- a/src/main/java/ch/njol/skript/util/Timeperiod.java
+++ b/src/main/java/ch/njol/skript/util/Timeperiod.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.util;
 
 import org.jetbrains.annotations.Nullable;
diff --git a/src/main/java/ch/njol/skript/util/Timespan.java b/src/main/java/ch/njol/skript/util/Timespan.java
index 3b192a34dff..2522e2d2e36 100644
--- a/src/main/java/ch/njol/skript/util/Timespan.java
+++ b/src/main/java/ch/njol/skript/util/Timespan.java
@@ -1,71 +1,33 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.util;
 
 import ch.njol.skript.Skript;
+import ch.njol.skript.lang.ParseContext;
 import ch.njol.skript.localization.GeneralWords;
 import ch.njol.skript.localization.Language;
-import ch.njol.skript.localization.LanguageChangeListener;
 import ch.njol.skript.localization.Noun;
 import ch.njol.util.NonNullPair;
 import ch.njol.util.coll.CollectionUtils;
 import ch.njol.yggdrasil.YggdrasilSerializable;
-import org.jetbrains.annotations.ApiStatus;
-import org.jetbrains.annotations.ApiStatus.ScheduledForRemoval;
+import com.google.common.base.Preconditions;
 import org.jetbrains.annotations.Nullable;
 
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
+import java.time.Duration;
+import java.time.temporal.*;
+import java.util.*;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-public class Timespan implements YggdrasilSerializable, Comparable<Timespan> { // REMIND unit
-
-
-	public enum TimePeriod {
-
-		MILLISECOND(1L),
-		TICK(50L),
-		SECOND(1000L),
-		MINUTE(SECOND.time * 60L),
-		HOUR(MINUTE.time * 60L),
-		DAY(HOUR.time * 24L),
-		WEEK(DAY.time * 7L),
-		MONTH(DAY.time * 30L), // Who cares about 28, 29 or 31 days?
-		YEAR(DAY.time * 365L);
-
-		private final Noun name;
-		private final long time;
-
-		TimePeriod(long time) {
-			this.name = new Noun("time." + this.name().toLowerCase(Locale.ENGLISH));
-			this.time = time;
-		}
+import static java.time.temporal.ChronoUnit.MILLIS;
 
-		public long getTime() {
-			return time;
-		}
+/**
+ * Represents a duration of time, such as 2 days, similar to {@link Duration}.
+ */
+public class Timespan implements YggdrasilSerializable, Comparable<Timespan>, TemporalAmount { // REMIND unit
 
-	}
+	private static final Pattern TIMESPAN_PATTERN = Pattern.compile("^(\\d+):(\\d\\d)(:\\d\\d){0,2}(?<ms>\\.\\d{1,4})?$");
+	private static final Pattern TIMESPAN_NUMBER_PATTERN = Pattern.compile("^\\d+(\\.\\d+)?$");
+	private static final Pattern TIMESPAN_SPLIT_PATTERN = Pattern.compile("[:.]");
+	private static final Pattern SHORT_FORM_PATTERN = Pattern.compile("^(\\d+(?:\\.\\d+)?)([a-zA-Z]+)$");
 
 	private static final List<NonNullPair<Noun, Long>> SIMPLE_VALUES = Arrays.asList(
 		new NonNullPair<>(TimePeriod.YEAR.name, TimePeriod.YEAR.time),
@@ -80,29 +42,25 @@ public long getTime() {
 	private static final Map<String, Long> PARSE_VALUES = new HashMap<>();
 
 	static {
-		Language.addListener(new LanguageChangeListener() {
-			@Override
-			public void onLanguageChange() {
-				for (TimePeriod time : TimePeriod.values()) {
-					PARSE_VALUES.put(time.name.getSingular().toLowerCase(Locale.ENGLISH), time.getTime());
-					PARSE_VALUES.put(time.name.getPlural().toLowerCase(Locale.ENGLISH), time.getTime());
-				}
+		Language.addListener(() -> {
+			for (TimePeriod time : TimePeriod.values()) {
+				PARSE_VALUES.put(time.name.getSingular().toLowerCase(Locale.ENGLISH), time.getTime());
+				PARSE_VALUES.put(time.name.getPlural().toLowerCase(Locale.ENGLISH), time.getTime());
+				PARSE_VALUES.put(time.shortName.getSingular().toLowerCase(Locale.ENGLISH), time.getTime());
+				PARSE_VALUES.put(time.shortName.getPlural().toLowerCase(Locale.ENGLISH), time.getTime());
 			}
 		});
 	}
 
-	private static final Pattern TIMESPAN_PATTERN = Pattern.compile("^(\\d+):(\\d\\d)(:\\d\\d){0,2}(?<ms>\\.\\d{1,4})?$");
-	private static final Pattern TIMESPAN_NUMBER_PATTERN = Pattern.compile("^\\d+(\\.\\d+)?$");
-	private static final Pattern TIMESPAN_SPLIT_PATTERN = Pattern.compile("[:.]");
+	public static @Nullable Timespan parse(String value) {
+		return parse(value, ParseContext.DEFAULT);
+	}
 
-	private final long millis;
-	
-	@Nullable
-	public static Timespan parse(String value) {
+	public static @Nullable Timespan parse(String value, ParseContext context) {
 		if (value.isEmpty())
 			return null;
 
-		long t = 0;
+		long totalMillis = 0;
 		boolean minecraftTime = false;
 		boolean isMinecraftTimeSet = false;
 
@@ -120,19 +78,19 @@ else if (length == 3 && !hasMs || length == 4) // HH:MM:SS[.ms]
 				offset = 1;
 
 			for (int i = 0; i < substring.length; i++) {
-				t += times[offset + i] * Utils.parseLong("" + substring[i]);
+				totalMillis += times[offset + i] * Utils.parseLong(substring[i]);
 			}
 		} else { // <number> minutes/seconds/.. etc
 			String[] substring = value.toLowerCase(Locale.ENGLISH).split("\\s+");
 			for (int i = 0; i < substring.length; i++) {
 				String sub = substring[i];
-				
+
 				if (sub.equals(GeneralWords.and.toString())) {
 					if (i == 0 || i == substring.length - 1)
 						return null;
 					continue;
 				}
-				
+
 				double amount = 1;
 				if (Noun.isIndefiniteArticle(sub)) {
 					if (i == substring.length - 1)
@@ -148,7 +106,7 @@ else if (length == 3 && !hasMs || length == 4) // HH:MM:SS[.ms]
 					}
 					sub = substring[++i];
 				}
-				
+
 				if (CollectionUtils.contains(Language.getList("time.real"), sub)) {
 					if (i == substring.length - 1 || isMinecraftTimeSet && minecraftTime)
 						return null;
@@ -159,27 +117,64 @@ else if (length == 3 && !hasMs || length == 4) // HH:MM:SS[.ms]
 					minecraftTime = true;
 					sub = substring[++i];
 				}
-				
+
 				if (sub.endsWith(","))
 					sub = sub.substring(0, sub.length() - 1);
 
-				Long d = PARSE_VALUES.get(sub.toLowerCase(Locale.ENGLISH));
-				if (d == null)
+				if (context == ParseContext.COMMAND) {
+					Matcher shortFormMatcher = SHORT_FORM_PATTERN.matcher(sub);
+					if (shortFormMatcher.matches()) {
+						amount = Double.parseDouble(shortFormMatcher.group(1));
+						sub = shortFormMatcher.group(2).toLowerCase(Locale.ENGLISH);
+					}
+				}
+
+				Long millis = PARSE_VALUES.get(sub.toLowerCase(Locale.ENGLISH));
+				if (millis == null)
 					return null;
-				
-				if (minecraftTime && d != TimePeriod.TICK.time)
+
+				if (minecraftTime && millis != TimePeriod.TICK.time)
 					amount /= 72f;
-				
-				t += Math.round(amount * d);
-				
+
+				totalMillis += Math.round(amount * millis);
+
 				isMinecraftTimeSet = true;
-				
 			}
 		}
+		return new Timespan(totalMillis);
+	}
+
+	public static Timespan fromDuration(Duration duration) {
+		return new Timespan(duration.toMillis());
+	}
+
+	public static String toString(long millis) {
+		return toString(millis, 0);
+	}
+
+	public static String toString(long millis, int flags) {
+		for (int i = 0; i < SIMPLE_VALUES.size() - 1; i++) {
+			NonNullPair<Noun, Long> pair = SIMPLE_VALUES.get(i);
+			long second1 = pair.getSecond();
+			if (millis >= second1) {
+				long remainder = millis % second1;
+				double second = 1. * remainder / SIMPLE_VALUES.get(i + 1).getSecond();
+				if (!"0".equals(Skript.toString(second))) { // bad style but who cares...
+					return toString(Math.floor(1. * millis / second1), pair, flags) + " " + GeneralWords.and + " " + toString(remainder, flags);
+				} else {
+					return toString(1. * millis / second1, pair, flags);
+				}
+			}
+		}
+		return toString(1. * millis / SIMPLE_VALUES.get(SIMPLE_VALUES.size() - 1).getSecond(), SIMPLE_VALUES.get(SIMPLE_VALUES.size() - 1), flags);
+	}
 
-		return new Timespan(t);
+	private static String toString(double amount, NonNullPair<Noun, Long> pair, int flags) {
+		return pair.getFirst().withAmount(amount, flags);
 	}
-	
+
+	private final long millis;
+
 	public Timespan() {
 		millis = 0;
 	}
@@ -190,8 +185,7 @@ public Timespan() {
 	 * @param millis The milliseconds of Timespan
 	 */
 	public Timespan(long millis) {
-		if (millis < 0)
-			throw new IllegalArgumentException("millis must be >= 0");
+		Preconditions.checkArgument(millis >= 0, "millis must be >= 0");
 		this.millis = millis;
 	}
 
@@ -199,57 +193,51 @@ public Timespan(long millis) {
 	 * Builds a Timespan from the given long parameter of a specific {@link TimePeriod}.
 	 *
 	 * @param timePeriod The requested TimePeriod
-	 * @param time The time of the requested TimePeriod
+	 * @param time       The time of the requested TimePeriod
 	 */
 	public Timespan(TimePeriod timePeriod, long time) {
-		if (time < 0)
-			throw new IllegalArgumentException("time must be >= 0");
+		Preconditions.checkArgument(time >= 0, "time must be >= 0");
 		this.millis = time * timePeriod.getTime();
 	}
 
 	/**
-	 * Builds a Timespan from the given long parameter.
-	 *
 	 * @deprecated Use {@link #Timespan(TimePeriod, long)}
-	 * 
-	 * @param ticks The amount of Minecraft ticks to convert to a timespan.
-	 * @return Timespan based on the provided long.
 	 */
-	@Deprecated
-	@ApiStatus.ScheduledForRemoval
+	@Deprecated(forRemoval = true)
 	public static Timespan fromTicks(long ticks) {
 		return new Timespan(ticks * 50L);
 	}
 
 	/**
-	 * @deprecated Use {@link Timespan#fromTicks(long)} instead. Old API naming changes.
+	 * @deprecated Use {@link #Timespan(TimePeriod, long)} instead.
 	 */
-	@Deprecated
-	@ScheduledForRemoval
+	@Deprecated(forRemoval = true)
 	public static Timespan fromTicks_i(long ticks) {
 		return new Timespan(ticks * 50L);
 	}
 
 	/**
 	 * @deprecated Use {@link Timespan#getAs(TimePeriod)}
-	 *
-	 * @return the amount of milliseconds this timespan represents.
 	 */
-	@Deprecated
-	@ScheduledForRemoval
+	@Deprecated(forRemoval = true)
 	public long getMilliSeconds() {
-		return millis;
+		return getAs(TimePeriod.MILLISECOND);
 	}
 
 	/**
 	 * @deprecated Use {@link Timespan#getAs(TimePeriod)}
-	 *
-	 * @return the amount of Minecraft ticks this timespan represents.
 	 */
-	@Deprecated
-	@ScheduledForRemoval
+	@Deprecated(forRemoval = true)
 	public long getTicks() {
-		return Math.round((millis / 50.0));
+		return getAs(TimePeriod.TICK);
+	}
+
+	/**
+	 * @deprecated Use {@link Timespan#getAs(TimePeriod)}
+	 */
+	@Deprecated(forRemoval = true)
+	public long getTicks_i() {
+		return getAs(TimePeriod.TICK);
 	}
 
 	/**
@@ -260,75 +248,147 @@ public long getAs(TimePeriod timePeriod) {
 	}
 
 	/**
-	 * @deprecated Use getTicks() instead. Old API naming changes.
+	 * @return Converts this timespan to a {@link Duration}.
 	 */
-	@Deprecated
-	@ScheduledForRemoval
-	public long getTicks_i() {
-		return Math.round((millis / 50.0));
+	public Duration getDuration() {
+		return Duration.ofMillis(millis);
 	}
 
 	@Override
-	public String toString() {
-		return toString(millis);
+	public long get(TemporalUnit unit) {
+		if (unit instanceof TimePeriod period)
+			return this.getAs(period);
+
+		if (!(unit instanceof ChronoUnit chrono))
+			throw new UnsupportedTemporalTypeException("Not a supported temporal unit: " + unit);
+
+		return switch (chrono) {
+			case MILLIS -> this.getAs(TimePeriod.MILLISECOND);
+			case SECONDS -> this.getAs(TimePeriod.SECOND);
+			case MINUTES -> this.getAs(TimePeriod.MINUTE);
+			case HOURS -> this.getAs(TimePeriod.HOUR);
+			case DAYS -> this.getAs(TimePeriod.DAY);
+			case WEEKS -> this.getAs(TimePeriod.WEEK);
+			case MONTHS -> this.getAs(TimePeriod.MONTH);
+			case YEARS -> this.getAs(TimePeriod.YEAR);
+			default -> throw new UnsupportedTemporalTypeException("Not a supported time unit: " + chrono);
+		};
 	}
-	
-	public String toString(int flags) {
-		return toString(millis, flags);
-	}
-	
-	public static String toString(long millis) {
-		return toString(millis, 0);
+
+	@Override
+	public List<TemporalUnit> getUnits() {
+		return List.<TemporalUnit>of(TimePeriod.values()).reversed();
 	}
-	
-	@SuppressWarnings("null")
-	public static String toString(long millis, int flags) {
-		for (int i = 0; i < SIMPLE_VALUES.size() - 1; i++) {
-			if (millis >= SIMPLE_VALUES.get(i).getSecond()) {
-				long remainder = millis % SIMPLE_VALUES.get(i).getSecond();
-				double second = 1. * remainder / SIMPLE_VALUES.get(i + 1).getSecond();
-				if (!"0".equals(Skript.toString(second))) { // bad style but who cares...
-					return toString(Math.floor(1. * millis / SIMPLE_VALUES.get(i).getSecond()), SIMPLE_VALUES.get(i), flags) + " " + GeneralWords.and + " " + toString(remainder, flags);
-				} else {
-					return toString(1. * millis / SIMPLE_VALUES.get(i).getSecond(), SIMPLE_VALUES.get(i), flags);
-				}
-			}
-		}
-		return toString(1. * millis / SIMPLE_VALUES.get(SIMPLE_VALUES.size() - 1).getSecond(), SIMPLE_VALUES.get(SIMPLE_VALUES.size() - 1), flags);
+
+	@Override
+	public Temporal addTo(Temporal temporal) {
+		return temporal.plus(millis, MILLIS);
 	}
-	
-	private static String toString(double amount, NonNullPair<Noun, Long> pair, int flags) {
-		return pair.getFirst().withAmount(amount, flags);
+
+	@Override
+	public Temporal subtractFrom(Temporal temporal) {
+		return temporal.minus(millis, MILLIS);
 	}
 
-	/**
-	 * Compare this Timespan with another
-	 * @param time the Timespan to be compared.
-	 * @return -1 if this Timespan is less than argument Timespan, 0 if equals and 1 if greater than
-	 */
 	@Override
 	public int compareTo(@Nullable Timespan time) {
 		return Long.compare(millis, time == null ? millis : time.millis);
 	}
-	
+
 	@Override
 	public int hashCode() {
-		int prime = 31;
-		int result = 1;
-		result = prime * result + (int) (millis / Integer.MAX_VALUE);
-		return result;
+		return 31 + (int) (millis / Integer.MAX_VALUE);
 	}
-	
+
 	@Override
 	public boolean equals(@Nullable Object obj) {
 		if (this == obj)
 			return true;
 		if (obj == null)
 			return false;
-		if (!(obj instanceof Timespan))
+		if (!(obj instanceof Timespan other))
 			return false;
 
-		return millis == ((Timespan) obj).millis;
+		return millis == other.millis;
+	}
+
+	@Override
+	public String toString() {
+		return toString(millis);
+	}
+
+	public String toString(int flags) {
+		return toString(millis, flags);
 	}
-	
+
+	/**
+	 * Represents the unit used for the current {@link Timespan}.
+	 */
+	public enum TimePeriod implements TemporalUnit {
+
+		MILLISECOND(1L),
+		TICK(50L),
+		SECOND(1000L),
+		MINUTE(SECOND.time * 60L),
+		HOUR(MINUTE.time * 60L),
+		DAY(HOUR.time * 24L),
+		WEEK(DAY.time * 7L),
+		MONTH(DAY.time * 30L), // Who cares about 28, 29 or 31 days?
+		YEAR(DAY.time * 365L);
+
+		private final Noun name;
+		private final Noun shortName;
+		private final long time;
+
+		TimePeriod(long time) {
+			this.name = new Noun("time." + this.name().toLowerCase(Locale.ENGLISH) + ".full");
+			this.shortName = new Noun("time." + this.name().toLowerCase(Locale.ENGLISH) + ".short");
+			this.time = time;
+		}
+
+		public long getTime() {
+			return time;
+		}
+
+		public String getFullForm() {
+			return name.toString();
+		}
+
+		public String getShortForm() {
+			return shortName.toString();
+		}
+
+		@Override
+		public Duration getDuration() {
+			return Duration.ofMillis(time);
+		}
+
+		@Override
+		public boolean isDurationEstimated() {
+			return false;
+		}
+
+		@Override
+		public boolean isDateBased() {
+			return false;
+		}
+
+		@Override
+		public boolean isTimeBased() {
+			return true;
+		}
+
+		@Override
+		public <R extends Temporal> R addTo(R temporal, long amount) {
+			//noinspection unchecked
+			return (R) temporal.plus(amount, this);
+		}
+
+		@Override
+		public long between(Temporal temporal1Inclusive, Temporal temporal2Exclusive) {
+			return temporal1Inclusive.until(temporal2Exclusive, this);
+		}
+
+	}
+
 }
diff --git a/src/main/java/ch/njol/skript/util/Utils.java b/src/main/java/ch/njol/skript/util/Utils.java
index 2cda7d3109b..100c488cb95 100644
--- a/src/main/java/ch/njol/skript/util/Utils.java
+++ b/src/main/java/ch/njol/skript/util/Utils.java
@@ -1,63 +1,40 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.util;
 
-import java.io.File;
-import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.util.*;
-import java.util.concurrent.CompletableFuture;
-import java.util.function.Predicate;
-import java.util.jar.JarEntry;
-import java.util.jar.JarFile;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-import java.util.stream.Stream;
-
-import org.bukkit.Bukkit;
-import org.bukkit.entity.Player;
-import org.bukkit.plugin.Plugin;
-import org.bukkit.plugin.java.JavaPlugin;
-import org.bukkit.plugin.messaging.Messenger;
-import org.bukkit.plugin.messaging.PluginMessageListener;
-
-import com.google.common.collect.Iterables;
-import com.google.common.io.ByteArrayDataInput;
-import com.google.common.io.ByteArrayDataOutput;
-import com.google.common.io.ByteStreams;
-
 import ch.njol.skript.Skript;
 import ch.njol.skript.effects.EffTeleport;
 import ch.njol.skript.localization.Language;
-import ch.njol.skript.localization.LanguageChangeListener;
 import ch.njol.skript.registrations.Classes;
-import ch.njol.util.Callback;
-import ch.njol.util.Checker;
 import ch.njol.util.NonNullPair;
 import ch.njol.util.Pair;
 import ch.njol.util.StringUtils;
 import ch.njol.util.coll.CollectionUtils;
-import ch.njol.util.coll.iterator.EnumerationIterable;
+import com.google.common.collect.Iterables;
+import com.google.common.io.ByteArrayDataInput;
+import com.google.common.io.ByteArrayDataOutput;
+import com.google.common.io.ByteStreams;
 import net.md_5.bungee.api.ChatColor;
-import org.jetbrains.annotations.Nullable;
+import org.bukkit.Bukkit;
+import org.bukkit.entity.Player;
+import org.bukkit.plugin.Plugin;
+import org.bukkit.plugin.java.JavaPlugin;
+import org.bukkit.plugin.messaging.Messenger;
+import org.bukkit.plugin.messaging.PluginMessageListener;
+import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.io.File;
+import java.io.IOException;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.*;
+import java.util.concurrent.CompletableFuture;
+import java.util.function.Predicate;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import java.util.stream.Stream;
 
 /**
  * Utility class.
@@ -70,7 +47,7 @@ public abstract class Utils {
 	protected final static Deque<WordEnding> plurals = new LinkedList<>();
 
 	static {
-		plurals.add(new WordEnding("axe", "axes"));
+		plurals.add(new WordEnding("axe", "axes")); // not complete since we have battleaxe, etc.
 		plurals.add(new WordEnding("x", "xes"));
 
 		plurals.add(new WordEnding("ay", "ays"));
@@ -79,14 +56,20 @@ public abstract class Utils {
 		plurals.add(new WordEnding("oy", "oys"));
 		plurals.add(new WordEnding("uy", "uys"));
 		plurals.add(new WordEnding("kie", "kies"));
-		plurals.add(new WordEnding("zombie", "zombies"));
+		plurals.add(new WordEnding("zombie", "zombies", true));
 		plurals.add(new WordEnding("y", "ies"));
 
-		plurals.add(new WordEnding("wife", "wives")); // we have to do the -ife -> ives first
+		plurals.add(new WordEnding("wife", "wives", true)); // we have to do the -ife -> ives first
 		plurals.add(new WordEnding("life", "lives"));
-		plurals.add(new WordEnding("knife", "knives"));
+		plurals.add(new WordEnding("knife", "knives", true));
 		plurals.add(new WordEnding("ive", "ives"));
-		plurals.add(new WordEnding("elf", "elves")); // self shelf elf
+
+		plurals.add(new WordEnding("lf", "lves")); // self shelf elf wolf half etc.
+		plurals.add(new WordEnding("thief", "thieves", true));
+		plurals.add(new WordEnding("ief", "iefs")); // chiefs, fiefs, briefs
+
+		plurals.add(new WordEnding("hoof", "hooves"));
+
 		plurals.add(new WordEnding("fe", "ves"));// most -f words' plurals can end in -fs as well as -ves
 
 		plurals.add(new WordEnding("h", "hes"));
@@ -97,22 +80,25 @@ public abstract class Utils {
 		plurals.add(new WordEnding("api", "apis")); // api fix
 		plurals.add(new WordEnding("us", "i"));
 
-		plurals.add(new WordEnding("hoe", "hoes"));
-		plurals.add(new WordEnding("toe", "toes"));
+		plurals.add(new WordEnding("hoe", "hoes", true));
+		plurals.add(new WordEnding("toe", "toes", true));
+		plurals.add(new WordEnding("foe", "foes", true));
+		plurals.add(new WordEnding("woe", "woes", true));
 		plurals.add(new WordEnding("o", "oes"));
 
-		plurals.add(new WordEnding("alias", "aliases"));
-		plurals.add(new WordEnding("gas", "gases"));
+		plurals.add(new WordEnding("alias", "aliases", true));
+		plurals.add(new WordEnding("gas", "gases", true));
 
-		plurals.add(new WordEnding("child", "children"));
+		plurals.add(new WordEnding("child", "children")); // grandchild, etc.
 
-		plurals.add(new WordEnding("sheep", "sheep"));
+		plurals.add(new WordEnding("sheep", "sheep", true));
 
 		// general ending
 		plurals.add(new WordEnding("", "s"));
 	}
 
-	private Utils() {}
+	private Utils() {
+	}
 
 	public static String join(final Object[] objects) {
 		assert objects != null;
@@ -122,7 +108,7 @@ public static String join(final Object[] objects) {
 				b.append(", ");
 			b.append(Classes.toString(objects[i]));
 		}
-		return "" + b.toString();
+		return b.toString();
 	}
 
 	public static String join(final Iterable<?> objects) {
@@ -136,7 +122,7 @@ public static String join(final Iterable<?> objects) {
 				first = false;
 			b.append(Classes.toString(o));
 		}
-		return "" + b.toString();
+		return b.toString();
 	}
 
 	@SuppressWarnings("unchecked")
@@ -152,7 +138,7 @@ public static Pair<String, Integer> getAmount(String s) {
 		} else if (s.matches("an? .+")) {
 			return new Pair<>(s.split(" ", 2)[1], 1);
 		}
-		return new Pair<>(s, Integer.valueOf(-1));
+		return new Pair<>(s, -1);
 	}
 
 //	public final static class AmountResponse {
@@ -204,57 +190,35 @@ public static Pair<String, Integer> getAmount(String s) {
 	 * Loads classes of the plugin by package. Useful for registering many syntax elements like Skript does it.
 	 *
 	 * @param basePackage The base package to add to all sub packages, e.g. <tt>"ch.njol.skript"</tt>.
-	 * @param subPackages Which subpackages of the base package should be loaded, e.g. <tt>"expressions", "conditions", "effects"</tt>. Subpackages of these packages will be loaded
-	 *            as well. Use an empty array to load all subpackages of the base package.
-	 * @throws IOException If some error occurred attempting to read the plugin's jar file.
+	 * @param subPackages Which subpackages of the base package should be loaded, e.g. <tt>"expressions",
+	 *                       "conditions", "effects"</tt>. Subpackages of these packages will be loaded
+	 *                    as well. Use an empty array to load all subpackages of the base package.
 	 * @return This SkriptAddon
+	 * @throws IOException If some error occurred attempting to read the plugin's jar file.
+	 * @deprecated Use {@link org.skriptlang.skript.util.ClassLoader}.
 	 */
+	@Deprecated
 	public static Class<?>[] getClasses(Plugin plugin, String basePackage, String... subPackages) throws IOException {
-		assert subPackages != null;
-		JarFile jar = new JarFile(getFile(plugin));
-		for (int i = 0; i < subPackages.length; i++)
-			subPackages[i] = subPackages[i].replace('.', '/') + "/";
-		basePackage = basePackage.replace('.', '/') + "/";
 		List<Class<?>> classes = new ArrayList<>();
-		try {
-			List<String> classNames = new ArrayList<>();
-
-			for (JarEntry e : new EnumerationIterable<>(jar.entries())) {
-				if (e.getName().startsWith(basePackage) && e.getName().endsWith(".class") && !e.getName().endsWith("package-info.class")) {
-					boolean load = subPackages.length == 0;
-					for (String sub : subPackages) {
-						if (e.getName().startsWith(sub, basePackage.length())) {
-							load = true;
-							break;
-						}
-					}
-
-					if (load)
-						classNames.add(e.getName().replace('/', '.').substring(0, e.getName().length() - ".class".length()));
-				}
-			}
-
-			classNames.sort(String::compareToIgnoreCase);
-
-			for (String c : classNames) {
-				try {
-					classes.add(Class.forName(c, true, plugin.getClass().getClassLoader()));
-				} catch (ClassNotFoundException | NoClassDefFoundError ex) {
-					Skript.exception(ex, "Cannot load class " + c);
-				} catch (ExceptionInInitializerError err) {
-					Skript.exception(err.getCause(), "class " + c + " generated an exception while loading");
-				}
-			}
-		} finally {
-			try {
-				jar.close();
-			} catch (IOException e) {}
+		org.skriptlang.skript.util.ClassLoader loader = org.skriptlang.skript.util.ClassLoader.builder()
+			.basePackage(basePackage)
+			.addSubPackages(subPackages)
+			.deep(true)
+			.initialize(true)
+			.forEachClass(classes::add)
+			.build();
+		File jarFile = getFile(plugin);
+		if (jarFile != null) {
+			loader.loadClasses(plugin.getClass(), jarFile);
+		} else {
+			loader.loadClasses(plugin.getClass());
 		}
-		return classes.toArray(new Class<?>[classes.size()]);
+		return classes.toArray(new Class[0]);
 	}
 
 	/**
-	 * The first invocation of this method uses reflection to invoke the protected method {@link JavaPlugin#getFile()} to get the plugin's jar file.
+	 * The first invocation of this method uses reflection to invoke the protected method {@link JavaPlugin#getFile()}
+	 * to get the plugin's jar file.
 	 *
 	 * @return The jar file of the plugin.
 	 */
@@ -285,14 +249,55 @@ public static File getFile(Plugin plugin) {
 	public static NonNullPair<String, Boolean> getEnglishPlural(String word) {
 		assert word != null;
 		if (word.isEmpty())
-			return new NonNullPair<>("", Boolean.FALSE);
+			return new NonNullPair<>("", false);
+		if (!couldBeSingular(word)) {
+			for (final WordEnding ending : plurals) {
+				if (ending.isCompleteWord()) {
+					// Complete words shouldn't be used as partial pieces
+					if (word.length() != ending.plural().length())
+						continue;
+				}
+				if (word.endsWith(ending.plural()))
+					return new NonNullPair<>(
+						word.substring(0, word.length() - ending.plural().length()) + ending.singular(),
+						true
+					);
+				if (word.endsWith(ending.plural().toUpperCase(Locale.ENGLISH)))
+					return new NonNullPair<>(
+						word.substring(0, word.length() - ending.plural().length())
+							+ ending.singular().toUpperCase(Locale.ENGLISH),
+						true
+					);
+			}
+		}
+		return new NonNullPair<>(word, false);
+	}
+
+	private static boolean couldBeSingular(String word) {
 		for (final WordEnding ending : plurals) {
-			if (word.endsWith(ending.plural()))
-				return new NonNullPair<>(word.substring(0, word.length() - ending.plural().length()) + ending.singular(), Boolean.TRUE);
-			if (word.endsWith(ending.plural().toUpperCase(Locale.ENGLISH)))
-				return new NonNullPair<>(word.substring(0, word.length() - ending.plural().length()) + ending.singular().toUpperCase(Locale.ENGLISH), Boolean.TRUE);
+			if (ending.singular().isBlank())
+				continue;
+			if (ending.isCompleteWord() && ending.singular().length() != word.length())
+				continue; // Skip complete words
+
+			if (word.endsWith(ending.singular()) || word.toLowerCase().endsWith(ending.singular())) {
+				return true;
+			}
 		}
-		return new NonNullPair<>(word, Boolean.FALSE);
+		return false;
+	}
+
+	/**
+	 * Adds a singular/plural word override for the given words.
+	 * This is inserted first in the list of words to be checked: it will always be matched
+	 * and will override all other plurality rules.
+	 * This will only match the word <s>exactly</s>, and will not apply to derivations of the word.
+	 *
+	 * @param singular The singular form of the word
+	 * @param plural   The plural form of the word
+	 */
+	public static void addPluralOverride(String singular, String plural) {
+		Utils.plurals.addFirst(new WordEnding(singular, plural, true));
 	}
 
 	/**
@@ -304,6 +309,11 @@ public static NonNullPair<String, Boolean> getEnglishPlural(String word) {
 	public static String toEnglishPlural(String word) {
 		assert word != null && word.length() != 0;
 		for (WordEnding ending : plurals) {
+			if (ending.isCompleteWord()) {
+				// Complete words shouldn't be used as partial pieces
+				if (word.length() != ending.singular().length())
+					continue;
+			}
 			if (word.endsWith(ending.singular()))
 				return word.substring(0, word.length() - ending.singular().length()) + ending.plural();
 		}
@@ -351,7 +361,7 @@ public static String A(final String s) {
 	/**
 	 * Adds 'a' or 'an' to the given string, depending on the first character of the string.
 	 *
-	 * @param s The string to add the article to
+	 * @param s    The string to add the article to
 	 * @param capA Whether to use a capital a or not
 	 * @return The given string with an appended a/an (or A/An if capA is true) and a space at the beginning
 	 * @see #a(String)
@@ -429,12 +439,12 @@ public static double getBlockHeight(final int type, final byte data) {
 
 	/**
 	 * Sends a plugin message using the first player from {@link Bukkit#getOnlinePlayers()}.
-	 *
+	 * <p>
 	 * The next plugin message to be received through {@code channel} will be assumed to be
 	 * the response.
 	 *
 	 * @param channel the channel for this plugin message
-	 * @param data the data to add to the outgoing message
+	 * @param data    the data to add to the outgoing message
 	 * @return a completable future for the message of the responding plugin message, if there is one.
 	 * this completable future will complete exceptionally if no players are online.
 	 */
@@ -444,32 +454,35 @@ public static CompletableFuture<ByteArrayDataInput> sendPluginMessage(String cha
 
 	/**
 	 * Sends a plugin message using the from {@code player}.
-	 *
+	 * <p>
 	 * The next plugin message to be received through {@code channel} will be assumed to be
 	 * the response.
 	 *
-	 * @param player the player to send the plugin message through
+	 * @param player  the player to send the plugin message through
 	 * @param channel the channel for this plugin message
-	 * @param data the data to add to the outgoing message
+	 * @param data    the data to add to the outgoing message
 	 * @return a completable future for the message of the responding plugin message, if there is one.
 	 * this completable future will complete exceptionally if no players are online.
 	 */
-	public static CompletableFuture<ByteArrayDataInput> sendPluginMessage(Player player, String channel, String... data) {
+	public static CompletableFuture<ByteArrayDataInput> sendPluginMessage(Player player, String channel,
+																		  String... data) {
 		return sendPluginMessage(player, channel, r -> true, data);
 	}
 
 	/**
 	 * Sends a plugin message using the first player from {@link Bukkit#getOnlinePlayers()}.
 	 *
-	 * @param channel the channel for this plugin message
+	 * @param channel         the channel for this plugin message
 	 * @param messageVerifier verifies that a plugin message is the response to the sent message
-	 * @param data the data to add to the outgoing message
+	 * @param data            the data to add to the outgoing message
 	 * @return a completable future for the message of the responding plugin message, if there is one.
 	 * this completable future will complete exceptionally if the player is null.
 	 * @throws IllegalStateException when there are no players online
 	 */
-	public static CompletableFuture<ByteArrayDataInput> sendPluginMessage(String channel,
-			Predicate<ByteArrayDataInput> messageVerifier, String... data) throws IllegalStateException {
+	public static CompletableFuture<ByteArrayDataInput> sendPluginMessage(
+		String channel,
+		Predicate<ByteArrayDataInput> messageVerifier, String... data
+	) throws IllegalStateException {
 		Player firstPlayer = Iterables.getFirst(Bukkit.getOnlinePlayers(), null);
 		if (firstPlayer == null)
 			throw new IllegalStateException("There are no players online");
@@ -478,26 +491,28 @@ public static CompletableFuture<ByteArrayDataInput> sendPluginMessage(String cha
 
 	/**
 	 * Sends a plugin message.
-	 *
+	 * <p>
 	 * Example usage using the "GetServers" bungee plugin message channel via an overload:
 	 * <code>
-	 *     Utils.sendPluginMessage("BungeeCord", r -> "GetServers".equals(r.readUTF()), "GetServers")
-	 *     			.thenAccept(response -> Bukkit.broadcastMessage(response.readUTF()) // comma delimited server broadcast
-	 *     			.exceptionally(ex -> {
-	 *     			 	Skript.warning("Failed to get servers because there are no players online");
-	 *     			 	return null;
-	 *     			});
+	 * Utils.sendPluginMessage("BungeeCord", r -> "GetServers".equals(r.readUTF()), "GetServers")
+	 * .thenAccept(response -> Bukkit.broadcastMessage(response.readUTF()) // comma delimited server broadcast
+	 * .exceptionally(ex -> {
+	 * Skript.warning("Failed to get servers because there are no players online");
+	 * return null;
+	 * });
 	 * </code>
 	 *
-	 * @param player the player to send the plugin message through
-	 * @param channel the channel for this plugin message
+	 * @param player          the player to send the plugin message through
+	 * @param channel         the channel for this plugin message
 	 * @param messageVerifier verifies that a plugin message is the response to the sent message
-	 * @param data the data to add to the outgoing message
+	 * @param data            the data to add to the outgoing message
 	 * @return a completable future for the message of the responding plugin message, if there is one.
 	 * this completable future will complete exceptionally if the player is null.
 	 */
-	public static CompletableFuture<ByteArrayDataInput> sendPluginMessage(Player player, String channel,
-			Predicate<ByteArrayDataInput> messageVerifier, String... data) {
+	public static CompletableFuture<ByteArrayDataInput> sendPluginMessage(
+		Player player, String channel,
+		Predicate<ByteArrayDataInput> messageVerifier, String... data
+	) {
 		CompletableFuture<ByteArrayDataInput> completableFuture = new CompletableFuture<>();
 
 		Skript skript = Skript.getInstance();
@@ -508,14 +523,15 @@ public static CompletableFuture<ByteArrayDataInput> sendPluginMessage(Player pla
 		PluginMessageListener listener = (sendingChannel, sendingPlayer, message) -> {
 			ByteArrayDataInput input = ByteStreams.newDataInput(message);
 			if (channel.equals(sendingChannel) && sendingPlayer == player && !completableFuture.isDone()
-					&& !completableFuture.isCancelled() && messageVerifier.test(input)) {
+				&& !completableFuture.isCancelled() && messageVerifier.test(input)) {
 				completableFuture.complete(input);
 			}
 		};
 
 		messenger.registerIncomingPluginChannel(skript, channel, listener);
 
-		completableFuture.whenComplete((r, ex) -> messenger.unregisterIncomingPluginChannel(skript, channel, listener));
+		completableFuture.whenComplete((r, ex) -> messenger.unregisterIncomingPluginChannel(skript, channel,
+			listener));
 
 		// if we haven't gotten a response after a minute, let's just assume there wil never be one
 		Bukkit.getScheduler().scheduleSyncDelayedTask(skript, () -> {
@@ -532,25 +548,20 @@ public static CompletableFuture<ByteArrayDataInput> sendPluginMessage(Player pla
 		return completableFuture;
 	}
 
-	final static ChatColor[] styles = {ChatColor.BOLD, ChatColor.ITALIC, ChatColor.STRIKETHROUGH, ChatColor.UNDERLINE, ChatColor.MAGIC, ChatColor.RESET};
+	final static ChatColor[] styles = {ChatColor.BOLD, ChatColor.ITALIC, ChatColor.STRIKETHROUGH, ChatColor.UNDERLINE,
+		ChatColor.MAGIC, ChatColor.RESET};
 	final static Map<String, String> chat = new HashMap<>();
 	final static Map<String, String> englishChat = new HashMap<>();
 
-	public final static boolean HEX_SUPPORTED = Skript.isRunningMinecraft(1, 16);
-	public final static boolean COPY_SUPPORTED = Skript.isRunningMinecraft(1, 15);
-
 	static {
-		Language.addListener(new LanguageChangeListener() {
-			@Override
-			public void onLanguageChange() {
-				final boolean english = englishChat.isEmpty();
-				chat.clear();
-				for (final ChatColor style : styles) {
-					for (final String s : Language.getList("chat styles." + style.name())) {
-						chat.put(s.toLowerCase(Locale.ENGLISH), style.toString());
-						if (english)
-							englishChat.put(s.toLowerCase(Locale.ENGLISH), style.toString());
-					}
+		Language.addListener(() -> {
+			final boolean english = englishChat.isEmpty();
+			chat.clear();
+			for (final ChatColor style : styles) {
+				for (final String s : Language.getList("chat styles." + style.name())) {
+					chat.put(s.toLowerCase(Locale.ENGLISH), style.toString());
+					if (english)
+						englishChat.put(s.toLowerCase(Locale.ENGLISH), style.toString());
 				}
 			}
 		});
@@ -565,100 +576,104 @@ public static String getChatStyle(final String s) {
 		return chat.get(s);
 	}
 
-	private final static Pattern stylePattern = Pattern.compile("<([^<>]+)>");
-
 	/**
 	 * Replaces &lt;chat styles&gt; in the message
 	 *
 	 * @param message
 	 * @return message with localised chat styles converted to Minecraft's format
 	 */
-	public static String replaceChatStyles(final String message) {
+	public static @NotNull String replaceChatStyles(String message) {
 		if (message.isEmpty())
 			return message;
-		String m = StringUtils.replaceAll(Matcher.quoteReplacement("" + message.replace("<<none>>", "")), stylePattern, new Callback<String, Matcher>() {
-			@Override
-			public String run(final Matcher m) {
-				SkriptColor color = SkriptColor.fromName("" + m.group(1));
-				if (color != null)
-					return color.getFormattedChat();
-				final String tag = m.group(1).toLowerCase(Locale.ENGLISH);
-				final String f = chat.get(tag);
-				if (f != null)
-					return f;
-				if (HEX_SUPPORTED && tag.startsWith("#")) { // Check for parsing hex colors
-					ChatColor chatColor = parseHexColor(tag);
-					if (chatColor != null)
-						return chatColor.toString();
-				}
-				return "" + m.group();
-			}
-		});
-		assert m != null;
-		// Restore user input post-sanitization
-		// Sometimes, the message has already been restored
-		if (!message.equals(m)) {
-			m = m.replace("\\$", "$").replace("\\\\", "\\");
-		}
-		m = ChatColor.translateAlternateColorCodes('&', "" + m);
-		return "" + m;
+
+		return replaceChatStyle(message.replace("<<none>>", ""));
 	}
 
 	/**
-	 * Replaces english &lt;chat styles&gt; in the message. This is used for messages in the language file as the language of colour codes is not well defined while the language is
+	 * Replaces english &lt;chat styles&gt; in the message. This is used for messages in the language file as the
+	 * language of colour codes is not well defined while the language is
 	 * changing, and for some hardcoded messages.
 	 *
 	 * @param message
 	 * @return message with english chat styles converted to Minecraft's format
 	 */
-	public static String replaceEnglishChatStyles(final String message) {
+	public static @NotNull String replaceEnglishChatStyles(String message) {
 		if (message.isEmpty())
 			return message;
-		String m = StringUtils.replaceAll(Matcher.quoteReplacement(message), stylePattern, new Callback<String, Matcher>() {
-			@Override
-			public String run(final Matcher m) {
-				SkriptColor color = SkriptColor.fromName("" + m.group(1));
-				if (color != null)
-					return color.getFormattedChat();
-				final String tag = m.group(1).toLowerCase(Locale.ENGLISH);
-				final String f = englishChat.get(tag);
-				if (f != null)
-					return f;
-				if (HEX_SUPPORTED && tag.startsWith("#")) { // Check for parsing hex colors
-					ChatColor chatColor = parseHexColor(tag);
-					if (chatColor != null)
-						return chatColor.toString();
-				}
-				return "" + m.group();
+
+		return replaceChatStyle(message);
+	}
+
+	private final static Pattern STYLE_PATTERN = Pattern.compile("<([^<>]+)>");
+
+	private static @NotNull String replaceChatStyle(String message) {
+		String m = StringUtils.replaceAll(Matcher.quoteReplacement(message), STYLE_PATTERN, matcher -> {
+			SkriptColor color = SkriptColor.fromName(matcher.group(1));
+			if (color != null)
+				return color.getFormattedChat();
+
+			String tag = matcher.group(1).toLowerCase(Locale.ENGLISH);
+			String f = englishChat.get(tag);
+			if (f != null)
+				return f;
+
+			if (tag.startsWith("#")) {
+				ChatColor chatColor = parseHexColor(tag);
+				if (chatColor != null)
+					return chatColor.toString();
+			} else if (tag.startsWith("u:") || tag.startsWith("unicode:")) {
+				String character = parseUnicode(tag);
+				if (character != null)
+					return character;
 			}
+			return matcher.group();
 		});
-		assert m != null;
+
 		// Restore user input post-sanitization
 		// Sometimes, the message has already been restored
 		if (!message.equals(m)) {
 			m = m.replace("\\$", "$").replace("\\\\", "\\");
 		}
-		m = ChatColor.translateAlternateColorCodes('&', "" + m);
-		return "" + m;
+
+		return ChatColor.translateAlternateColorCodes('&', m);
 	}
 
-	private static final Pattern HEX_PATTERN = Pattern.compile("(?i)#{0,2}[0-9a-f]{6}");
+	private static final Pattern UNICODE_PATTERN = Pattern.compile("(?i)u(?:nicode)?:(?<code>[0-9a-f]{4,})");
+
+	/**
+	 * Tries to extract a Unicode character from the given string.
+	 *
+	 * @param string The string.
+	 * @return The Unicode character, or null if it could not be parsed.
+	 */
+	public static @Nullable String parseUnicode(String string) {
+		Matcher matcher = UNICODE_PATTERN.matcher(string);
+		if (!matcher.matches())
+			return null;
+
+		try {
+			return Character.toString(Integer.parseInt(matcher.group("code"), 16));
+		} catch (IllegalArgumentException ex) {
+			return null;
+		}
+	}
+
+	private static final Pattern HEX_PATTERN = Pattern.compile("(?i)#{0,2}(?<code>[0-9a-f]{6})");
 
 	/**
 	 * Tries to get a {@link ChatColor} from the given string.
-	 * @param hex The hex code to parse.
+	 *
+	 * @param string The string code to parse.
 	 * @return The ChatColor, or null if it couldn't be parsed.
 	 */
-	@SuppressWarnings("null")
-	@Nullable
-	public static ChatColor parseHexColor(String hex) {
-		if (!HEX_SUPPORTED || !HEX_PATTERN.matcher(hex).matches()) // Proper hex code validation
+	public static @Nullable ChatColor parseHexColor(String string) {
+		Matcher matcher = HEX_PATTERN.matcher(string);
+		if (!matcher.matches())
 			return null;
 
-		hex = hex.replace("#", "");
 		try {
-			return ChatColor.of('#' + hex.substring(0, 6));
-		} catch (IllegalArgumentException e) {
+			return ChatColor.of('#' + matcher.group("code"));
+		} catch (IllegalArgumentException ex) {
 			return null;
 		}
 	}
@@ -697,14 +712,15 @@ public static Class<?> getSuperType(final Class<?>... classes) {
 	 * Note that if the "best guess" is <i>not</i> a real supertype, it can never be selected.
 	 *
 	 * @param bestGuess The fallback class to guess
-	 * @param classes The types to check
+	 * @param classes   The types to check
+	 * @param <Found>   The highest common denominator found
+	 * @param <Type>    The input type spread
 	 * @return The most appropriate common class of all provided
-	 * @param <Found> The highest common denominator found
-	 * @param <Type> The input type spread
 	 */
 	@SafeVarargs
 	@SuppressWarnings("unchecked")
-	public static <Found, Type extends Found> Class<Found> highestDenominator(Class<? super Found> bestGuess, @NotNull Class<? extends Type> @NotNull ... classes) {
+	public static <Found, Type extends Found> Class<Found> highestDenominator(Class<? super Found> bestGuess,
+																			  @NotNull Class<? extends Type> @NotNull ... classes) {
 		assert classes.length > 0;
 		Class<?> chosen = classes[0];
 		outer:
@@ -736,7 +752,8 @@ public static <Found, Type extends Found> Class<Found> highestDenominator(Class<
 	}
 
 	/**
-	 * Parses a number that was validated to be an integer but might still result in a {@link NumberFormatException} when parsed with {@link Integer#parseInt(String)} due to
+	 * Parses a number that was validated to be an integer but might still result in a {@link NumberFormatException}
+	 * when parsed with {@link Integer#parseInt(String)} due to
 	 * overflow.
 	 * This method will return {@link Integer#MIN_VALUE} or {@link Integer#MAX_VALUE} respectively if that happens.
 	 *
@@ -753,7 +770,8 @@ public static int parseInt(final String s) {
 	}
 
 	/**
-	 * Parses a number that was validated to be an integer but might still result in a {@link NumberFormatException} when parsed with {@link Long#parseLong(String)} due to
+	 * Parses a number that was validated to be an integer but might still result in a {@link NumberFormatException}
+	 * when parsed with {@link Long#parseLong(String)} due to
 	 * overflow.
 	 * This method will return {@link Long#MIN_VALUE} or {@link Long#MAX_VALUE} respectively if that happens.
 	 *
@@ -772,6 +790,7 @@ public static long parseLong(final String s) {
 	/**
 	 * Gets class for name. Throws RuntimeException instead of checked one.
 	 * Use this only when absolutely necessary.
+	 *
 	 * @param name Class name.
 	 * @return The class.
 	 */
@@ -786,16 +805,16 @@ public static Class<?> classForName(String name) {
 	}
 
 	/**
-	 * Finds the index of the last in a {@link List} that matches the given {@link Checker}.
+	 * Finds the index of the last in a {@link List} that matches the given {@link Predicate}.
 	 *
-	 * @param list the {@link List} to search.
-	 * @param checker the {@link Checker} to match elements against.
+	 * @param list    the {@link List} to search.
+	 * @param checker the {@link Predicate} to match elements against.
 	 * @return the index of the element found, or -1 if no matching element was found.
 	 */
-	public static <T> int findLastIndex(List<T> list, Checker<T> checker) {
+	public static <T> int findLastIndex(List<T> list, Predicate<T> checker) {
 		int lastIndex = -1;
 		for (int i = 0; i < list.size(); i++) {
-			if (checker.check(list.get(i)))
+			if (checker.test(list.get(i)))
 				lastIndex = i;
 		}
 		return lastIndex;
@@ -809,13 +828,10 @@ public static boolean isInteger(Number... numbers) {
 		return true;
 	}
 
-	protected static class WordEnding { // To be a record in 2.10
+	protected record WordEnding(String singular, String plural, boolean isCompleteWord) {
 
-		private final String singular, plural;
-
-		private WordEnding(String singular, String plural) {
-			this.singular = singular;
-			this.plural = plural;
+		public WordEnding(String singular, String plural) {
+			this(singular, plural, false);
 		}
 
 		public String singular() {
@@ -829,8 +845,7 @@ public String plural() {
 		@Override
 		public boolean equals(Object object) {
 			if (this == object) return true;
-			if (!(object instanceof WordEnding)) return false;
-			WordEnding ending = (WordEnding) object;
+			if (!(object instanceof WordEnding ending)) return false;
 			return Objects.equals(singular, ending.singular) && Objects.equals(plural, ending.plural);
 		}
 
@@ -841,4 +856,51 @@ public int hashCode() {
 
 	}
 
+	/**
+	 * Prints a warning about the loading/use of a class that has been deprecated or removed.
+	 * This is a fairly-unsafe method and should only be used during class-loading.
+	 *
+	 * @param source The class about which to print the warning. This MUST be the class calling this method.
+	 * @return 0 (for use by interfaces)
+	 */
+	@ApiStatus.Internal
+	public static int loadedRemovedClassWarning(Class<?> source) {
+		Logger logger = Skript.getInstance().getLogger();
+		Exception exception = new Exception();
+		exception.fillInStackTrace();
+		StackTraceElement[] stackTrace = exception.getStackTrace();
+		StackTraceElement caller = stackTrace[2];
+		String authors, name;
+		try {
+			Class<?> callingClass = Class.forName(caller.getClassName());
+			JavaPlugin plugin = JavaPlugin.getProvidingPlugin(callingClass);
+			name = plugin.getDescription().getFullName();
+			authors = String.valueOf(plugin.getDescription().getAuthors());
+		} catch (ClassNotFoundException | IllegalArgumentException | ClassCastException error) {
+			name = caller.getClassLoaderName();
+			authors = "(unknown)";
+		}
+		logger.log(Level.SEVERE,
+			String.format("""
+						
+						
+						WARNING!
+						
+						An addon attempted to load a deprecated/outdated/removed '%s' class.
+						
+						The plugin '%s' tried to use a class that has been deprecated/removed in this version of Skript.
+						Please make sure you are using the latest supported version of the addon.
+						
+						If there are no supported versions, you should contact the author(s): %s, and ask them to update it.
+						
+						(This addon may not work correctly on this version of Skript.)
+						
+						""",
+				source.getSimpleName(),
+				name,
+				authors)
+		);
+		return 0;
+	}
+
 }
diff --git a/src/main/java/ch/njol/skript/util/Version.java b/src/main/java/ch/njol/skript/util/Version.java
index bfe994175df..4a2141c2427 100644
--- a/src/main/java/ch/njol/skript/util/Version.java
+++ b/src/main/java/ch/njol/skript/util/Version.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.util;
 
 import java.io.Serializable;
diff --git a/src/main/java/ch/njol/skript/util/WeatherType.java b/src/main/java/ch/njol/skript/util/WeatherType.java
index 2ace679dc43..b9f8363a16b 100644
--- a/src/main/java/ch/njol/skript/util/WeatherType.java
+++ b/src/main/java/ch/njol/skript/util/WeatherType.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.util;
 
 import java.util.HashMap;
diff --git a/src/main/java/ch/njol/skript/util/chat/BungeeConverter.java b/src/main/java/ch/njol/skript/util/chat/BungeeConverter.java
index 3ceb4bf29ed..4189cb1298b 100644
--- a/src/main/java/ch/njol/skript/util/chat/BungeeConverter.java
+++ b/src/main/java/ch/njol/skript/util/chat/BungeeConverter.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.util.chat;
 
 import java.util.Arrays;
diff --git a/src/main/java/ch/njol/skript/util/chat/ChatCode.java b/src/main/java/ch/njol/skript/util/chat/ChatCode.java
index b7ea7995f6d..af61f884633 100644
--- a/src/main/java/ch/njol/skript/util/chat/ChatCode.java
+++ b/src/main/java/ch/njol/skript/util/chat/ChatCode.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.util.chat;
 
 import org.jetbrains.annotations.Nullable;
diff --git a/src/main/java/ch/njol/skript/util/chat/ChatMessages.java b/src/main/java/ch/njol/skript/util/chat/ChatMessages.java
index b032b76207e..5dc2c29d15c 100644
--- a/src/main/java/ch/njol/skript/util/chat/ChatMessages.java
+++ b/src/main/java/ch/njol/skript/util/chat/ChatMessages.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.util.chat;
 
 import ch.njol.skript.Skript;
@@ -86,34 +68,28 @@ public class ChatMessages {
 	 */
 	public static void registerListeners() {
 		// When language changes or server is loaded loop through all chatcodes
-		Language.addListener(new LanguageChangeListener() {
-			
-			@Override
-			public void onLanguageChange() {
-				codes.clear();
-				
-				Skript.debug("Parsing message style lang files");
-				for (SkriptChatCode code : SkriptChatCode.values()) {
-					assert code != null;
-					if (code == SkriptChatCode.copy_to_clipboard && !Utils.COPY_SUPPORTED)
-						continue;
-					registerChatCode(code);
-				}
-				
-				// Re-register any missing addon chat codes
-				for (ChatCode code : addonCodes) {
-					assert code != null;
-					registerChatCode(code);
-				}
-				
-				// Add formatting chars
-				addColorChar('k', SkriptChatCode.obfuscated);
-				addColorChar('l', SkriptChatCode.bold);
-				addColorChar('m', SkriptChatCode.strikethrough);
-				addColorChar('n', SkriptChatCode.underlined);
-				addColorChar('o', SkriptChatCode.italic);
-				addColorChar('r', SkriptChatCode.reset);
+		Language.addListener(() -> {
+			codes.clear();
+
+			Skript.debug("Parsing message style lang files");
+			for (SkriptChatCode code : SkriptChatCode.values()) {
+				assert code != null;
+				registerChatCode(code);
+			}
+
+			// Re-register any missing addon chat codes
+			for (ChatCode code : addonCodes) {
+				assert code != null;
+				registerChatCode(code);
 			}
+
+			// Add formatting chars
+			addColorChar('k', SkriptChatCode.obfuscated);
+			addColorChar('l', SkriptChatCode.bold);
+			addColorChar('m', SkriptChatCode.strikethrough);
+			addColorChar('n', SkriptChatCode.underlined);
+			addColorChar('o', SkriptChatCode.italic);
+			addColorChar('r', SkriptChatCode.reset);
 		});
 	}
 	
@@ -231,7 +207,7 @@ else if (c2 == '>')
 					}
 					name = name.toLowerCase(Locale.ENGLISH); // Tags are case-insensitive
 					
-					boolean tryHex = Utils.HEX_SUPPORTED && name.startsWith("#");
+					boolean tryHex = name.startsWith("#");
 					ChatColor chatColor = null;
 					if (tryHex) {
 						chatColor = Utils.parseHexColor(name);
@@ -279,7 +255,7 @@ else if (c2 == '>')
 				
 				char color = chars[i + 1];
 				
-				boolean tryHex = Utils.HEX_SUPPORTED && color == 'x';
+				boolean tryHex = color == 'x';
 				ChatColor chatColor = null;
 				if (tryHex && i + 14 < chars.length) { // Try to parse hex "&x&1&2&3&4&5&6"
 					chatColor = Utils.parseHexColor(msg.substring(i + 2, i + 14).replace("&", "").replace("§", ""));
@@ -442,7 +418,7 @@ public static List<MessageComponent> fromParsedString(String msg) {
 
 				char color = chars[i + 1];
 
-				boolean tryHex = Utils.HEX_SUPPORTED && color == 'x';
+				boolean tryHex = color == 'x';
 				ChatColor chatColor = null;
 				if (tryHex && i + 14 < chars.length) { // Try to parse hex "&x&1&2&3&4&5&6"
 					chatColor = Utils.parseHexColor(msg.substring(i + 2, i + 14).replace("&", "").replace("§", ""));
@@ -600,9 +576,8 @@ public static String stripStyles(String text) {
 				builder.append(component.text);
 			}
 			String plain = builder.toString();
-			
-			if (Utils.HEX_SUPPORTED) // Strip '§x', '&x'
-				plain = HEX_COLOR_PATTERN.matcher(plain).replaceAll("");
+
+			plain = HEX_COLOR_PATTERN.matcher(plain).replaceAll("");
 			
 			result = ANY_COLOR_PATTERN.matcher(plain).replaceAll(""); // strips colors & or § (ex. &5)
 		} while (!previous.equals(result));
diff --git a/src/main/java/ch/njol/skript/util/chat/LinkParseMode.java b/src/main/java/ch/njol/skript/util/chat/LinkParseMode.java
index 227008969ed..7e11aabf30e 100644
--- a/src/main/java/ch/njol/skript/util/chat/LinkParseMode.java
+++ b/src/main/java/ch/njol/skript/util/chat/LinkParseMode.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.util.chat;
 
 /**
diff --git a/src/main/java/ch/njol/skript/util/chat/MessageComponent.java b/src/main/java/ch/njol/skript/util/chat/MessageComponent.java
index 036b5ad8724..b03dad3f7b1 100644
--- a/src/main/java/ch/njol/skript/util/chat/MessageComponent.java
+++ b/src/main/java/ch/njol/skript/util/chat/MessageComponent.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.util.chat;
 
 import java.lang.reflect.Type;
diff --git a/src/main/java/ch/njol/skript/util/chat/SkriptChatCode.java b/src/main/java/ch/njol/skript/util/chat/SkriptChatCode.java
index ba675614a53..201b3e1c793 100644
--- a/src/main/java/ch/njol/skript/util/chat/SkriptChatCode.java
+++ b/src/main/java/ch/njol/skript/util/chat/SkriptChatCode.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.util.chat;
 
 import org.jetbrains.annotations.Nullable;
diff --git a/src/main/java/ch/njol/skript/util/slot/CursorSlot.java b/src/main/java/ch/njol/skript/util/slot/CursorSlot.java
index 3dda986c103..c0e9b08363a 100644
--- a/src/main/java/ch/njol/skript/util/slot/CursorSlot.java
+++ b/src/main/java/ch/njol/skript/util/slot/CursorSlot.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.util.slot;
 
 import org.bukkit.entity.Player;
diff --git a/src/main/java/ch/njol/skript/util/slot/DisplayEntitySlot.java b/src/main/java/ch/njol/skript/util/slot/DisplayEntitySlot.java
new file mode 100644
index 00000000000..c40a3275404
--- /dev/null
+++ b/src/main/java/ch/njol/skript/util/slot/DisplayEntitySlot.java
@@ -0,0 +1,48 @@
+package ch.njol.skript.util.slot;
+
+import ch.njol.skript.registrations.Classes;
+import org.bukkit.entity.ItemDisplay;
+import org.bukkit.event.Event;
+import org.bukkit.inventory.ItemStack;
+import org.jetbrains.annotations.Nullable;
+
+public class DisplayEntitySlot extends Slot {
+	
+	private ItemDisplay display;
+	
+	public DisplayEntitySlot(ItemDisplay display) {
+		this.display = display;
+	}
+
+	@Override
+	@Nullable
+	public ItemStack getItem() {
+		return display.getItemStack();
+	}
+
+	@Override
+	public void setItem(@Nullable ItemStack item) {
+		display.setItemStack(item);
+	}
+
+	@Override
+	public int getAmount() {
+		return 1;
+	}
+
+	@Override
+	public void setAmount(int amount) {}
+
+	@Override
+	public boolean isSameSlot(Slot other) {
+		if (other instanceof DisplayEntitySlot) // Same display
+			return ((DisplayEntitySlot) other).display.equals(display);
+		return false;
+	}
+
+	@Override
+	public String toString(@Nullable Event event, boolean debug) {
+		return Classes.toString(getItem());
+	}
+
+}
diff --git a/src/main/java/ch/njol/skript/util/slot/DroppedItemSlot.java b/src/main/java/ch/njol/skript/util/slot/DroppedItemSlot.java
index 859ad635365..3af5bb9eb65 100644
--- a/src/main/java/ch/njol/skript/util/slot/DroppedItemSlot.java
+++ b/src/main/java/ch/njol/skript/util/slot/DroppedItemSlot.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.util.slot;
 
 import org.bukkit.entity.Item;
diff --git a/src/main/java/ch/njol/skript/util/slot/EquipmentSlot.java b/src/main/java/ch/njol/skript/util/slot/EquipmentSlot.java
index d20628ce6d2..a5d6ee21e0e 100644
--- a/src/main/java/ch/njol/skript/util/slot/EquipmentSlot.java
+++ b/src/main/java/ch/njol/skript/util/slot/EquipmentSlot.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.util.slot;
 
 import java.util.Locale;
@@ -110,6 +92,18 @@ public ItemStack get(final EntityEquipment e) {
 			public void set(final EntityEquipment e, final @Nullable ItemStack item) {
 				e.setBoots(item);
 			}
+		},
+
+		BODY() {
+			@Override
+			public @Nullable ItemStack get(EntityEquipment equipment) {
+				return equipment.getItem(org.bukkit.inventory.EquipmentSlot.BODY);
+			}
+
+			@Override
+			public void set(EntityEquipment equipment, @Nullable ItemStack item) {
+				equipment.setItem(org.bukkit.inventory.EquipmentSlot.BODY, item);
+			}
 		};
 		
 		public final int slotNumber;
diff --git a/src/main/java/ch/njol/skript/util/slot/InventorySlot.java b/src/main/java/ch/njol/skript/util/slot/InventorySlot.java
index 3d3feafbbd7..7ace6271dbc 100644
--- a/src/main/java/ch/njol/skript/util/slot/InventorySlot.java
+++ b/src/main/java/ch/njol/skript/util/slot/InventorySlot.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.util.slot;
 
 import org.bukkit.Material;
diff --git a/src/main/java/ch/njol/skript/util/slot/ItemFrameSlot.java b/src/main/java/ch/njol/skript/util/slot/ItemFrameSlot.java
index 2f68a96dc0e..a5140d1dad4 100644
--- a/src/main/java/ch/njol/skript/util/slot/ItemFrameSlot.java
+++ b/src/main/java/ch/njol/skript/util/slot/ItemFrameSlot.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.util.slot;
 
 import org.bukkit.entity.ItemFrame;
diff --git a/src/main/java/ch/njol/skript/util/slot/Slot.java b/src/main/java/ch/njol/skript/util/slot/Slot.java
index a9b9abf3867..515cdabfa46 100644
--- a/src/main/java/ch/njol/skript/util/slot/Slot.java
+++ b/src/main/java/ch/njol/skript/util/slot/Slot.java
@@ -1,50 +1,41 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.util.slot;
 
+import ch.njol.skript.aliases.Aliases;
+import ch.njol.skript.aliases.ItemType;
+import ch.njol.skript.bukkitutil.ItemUtils;
+import ch.njol.skript.lang.util.common.AnyAmount;
+import ch.njol.skript.lang.util.common.AnyNamed;
+import org.bukkit.Bukkit;
 import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.meta.ItemMeta;
 import org.jetbrains.annotations.Nullable;
 
 import ch.njol.skript.lang.Debuggable;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.UnknownNullability;
 
 /**
  * Represents a container for a single item. It could be an ordinary inventory
  * slot or perhaps an item frame.
  */
-public abstract class Slot implements Debuggable {
-	
+public abstract class Slot implements Debuggable, AnyNamed, AnyAmount {
+
 	protected Slot() {}
-	
+
 	@Nullable
 	public abstract ItemStack getItem();
-	
+
 	public abstract void setItem(final @Nullable ItemStack item);
-	
+
 	public abstract int getAmount();
-	
+
 	public abstract void setAmount(int amount);
-	
+
 	@Override
 	public final String toString() {
 		return toString(null, false);
 	}
-	
+
 	/**
 	 * Checks if given slot is in same position with this.
 	 * Ignores slot contents.
@@ -52,4 +43,52 @@ public final String toString() {
 	 * @return True if positions equal, false otherwise.
 	 */
 	public abstract boolean isSameSlot(Slot o);
+
+	/**
+	 * @return The name of the item in this slot
+	 */
+	@Override
+	public @UnknownNullability String name() {
+		ItemStack stack = this.getItem();
+		if (stack != null && stack.hasItemMeta()) {
+			ItemMeta meta = stack.getItemMeta();
+			return meta.hasDisplayName() ? meta.getDisplayName() : null;
+		}
+		return null;
+	}
+
+	@Override
+	public boolean supportsNameChange() {
+		return true;
+	}
+
+	/**
+	 * @param name The name to change
+	 */
+	@Override
+	public void setName(String name) {
+		ItemStack stack = this.getItem();
+		if (stack != null && !ItemUtils.isAir(stack.getType())) {
+			ItemMeta meta = stack.hasItemMeta() ? stack.getItemMeta() : Bukkit.getItemFactory().getItemMeta(stack.getType());
+			meta.setDisplayName(name);
+			stack.setItemMeta(meta);
+			this.setItem(stack);
+		}
+	}
+
+	@Override
+	public @NotNull Number amount() {
+		return this.getAmount();
+	}
+
+	@Override
+	public boolean supportsAmountChange() {
+		return true;
+	}
+
+	@Override
+	public void setAmount(@Nullable Number amount) {
+		this.setAmount(amount != null ? amount.intValue() : 0);
+	}
+
 }
diff --git a/src/main/java/ch/njol/skript/util/slot/SlotWithIndex.java b/src/main/java/ch/njol/skript/util/slot/SlotWithIndex.java
index 17efbfe400a..1fff41f286e 100644
--- a/src/main/java/ch/njol/skript/util/slot/SlotWithIndex.java
+++ b/src/main/java/ch/njol/skript/util/slot/SlotWithIndex.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.util.slot;
 
 /**
diff --git a/src/main/java/ch/njol/skript/util/slot/ThrowableProjectileSlot.java b/src/main/java/ch/njol/skript/util/slot/ThrowableProjectileSlot.java
index 80ffa552dcc..e1d4444213a 100644
--- a/src/main/java/ch/njol/skript/util/slot/ThrowableProjectileSlot.java
+++ b/src/main/java/ch/njol/skript/util/slot/ThrowableProjectileSlot.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.util.slot;
 
 import org.bukkit.Material;
diff --git a/src/main/java/ch/njol/skript/util/visual/ParticleOption.java b/src/main/java/ch/njol/skript/util/visual/ParticleOption.java
index 690b89e9a84..0fae7e7b214 100644
--- a/src/main/java/ch/njol/skript/util/visual/ParticleOption.java
+++ b/src/main/java/ch/njol/skript/util/visual/ParticleOption.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.util.visual;
 
 import ch.njol.skript.util.Color;
diff --git a/src/main/java/ch/njol/skript/util/visual/VisualEffect.java b/src/main/java/ch/njol/skript/util/visual/VisualEffect.java
index 02aa5a25a6c..ebff4d02fe6 100644
--- a/src/main/java/ch/njol/skript/util/visual/VisualEffect.java
+++ b/src/main/java/ch/njol/skript/util/visual/VisualEffect.java
@@ -1,22 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.util.visual;
 
 import ch.njol.skript.Skript;
@@ -33,6 +14,7 @@
 import org.bukkit.Particle;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.Objects;
@@ -178,5 +160,10 @@ public boolean equals(@Nullable Object o) {
 		VisualEffect that = (VisualEffect) o;
 		return type == that.type && Objects.equals(data, that.data);
 	}
+
+	@Override
+	public @NotNull String getSyntaxTypeName() {
+		return "visual effect"; // why is this a unique syntax element, it really needs to go
+	}
 	
 }
diff --git a/src/main/java/ch/njol/skript/util/visual/VisualEffectType.java b/src/main/java/ch/njol/skript/util/visual/VisualEffectType.java
index b9220074293..fa8dd41d9ce 100644
--- a/src/main/java/ch/njol/skript/util/visual/VisualEffectType.java
+++ b/src/main/java/ch/njol/skript/util/visual/VisualEffectType.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.util.visual;
 
 import ch.njol.skript.localization.Language;
diff --git a/src/main/java/ch/njol/skript/util/visual/VisualEffects.java b/src/main/java/ch/njol/skript/util/visual/VisualEffects.java
index b6aaafe5fbc..51e7d771e06 100644
--- a/src/main/java/ch/njol/skript/util/visual/VisualEffects.java
+++ b/src/main/java/ch/njol/skript/util/visual/VisualEffects.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.util.visual;
 
 import ch.njol.skript.Skript;
@@ -227,7 +209,7 @@ private static void registerDataSupplier(String id, BiFunction<Object, Location,
 			// TODO test how this works
 			registerDataSupplier("Particle.NOTE", (raw, location) -> {
 				int colorValue = (int) (((Number) raw).floatValue() * 255);
-				ColorRGB color = new ColorRGB(colorValue, 0, 0);
+				ColorRGB color = ColorRGB.fromRGB(colorValue, 0, 0);
 				return new ParticleOption(color, 1);
 			});
 
@@ -238,7 +220,7 @@ private static void registerDataSupplier(String id, BiFunction<Object, Location,
 			registerDataSupplier("Particle.SHRIEK", (raw, location) -> {
 				int delay = 0;
 				if (raw instanceof Timespan)
-					delay = (int) Math.min(Math.max(((Timespan) raw).getTicks(), 0), Integer.MAX_VALUE);
+					delay = (int) Math.min(Math.max(((Timespan) raw).getAs(Timespan.TimePeriod.TICK), 0), Integer.MAX_VALUE);
 				return delay;
 			});
 
@@ -249,23 +231,24 @@ private static void registerDataSupplier(String id, BiFunction<Object, Location,
 	}
 
 	// exists to avoid NoClassDefFoundError from Vibration
+	@SuppressWarnings({"removal"})
 	private static final class VibrationUtils {
 		private static Vibration buildVibration(Object[] data, Location location) {
 			int arrivalTime = -1;
 			if (data[1] != null)
-				arrivalTime = (int) Math.min(Math.max(((Timespan) data[1]).getTicks(), 0), Integer.MAX_VALUE);
+				arrivalTime = (int) Math.min(Math.max(((Timespan) data[1]).getAs(Timespan.TimePeriod.TICK), 0), Integer.MAX_VALUE);
 			if (data[0] instanceof Entity) {
 				Entity entity = (Entity) data[0];
 				if (arrivalTime == -1)
 					arrivalTime = (int) (location.distance(entity.getLocation()) / 20);
-				//noinspection removal - new constructor only exists on newer versions
+				// new constructor only exists on newer versions
 				return new Vibration(location, new Vibration.Destination.EntityDestination(entity), arrivalTime);
 			}
 			// assume it's a location
 			Location destination = data[0] != null ? (Location) data[0] : location;
 			if (arrivalTime == -1)
 				arrivalTime = (int) (location.distance(destination) / 20);
-			//noinspection removal - new constructor only exists on newer versions
+			// new constructor only exists on newer versions
 			return new Vibration(location, new Vibration.Destination.BlockDestination(destination), arrivalTime);
 		}
 	}
diff --git a/src/main/java/ch/njol/skript/variables/FlatFileStorage.java b/src/main/java/ch/njol/skript/variables/FlatFileStorage.java
index c9dadeb265b..7c7eaa5e71e 100644
--- a/src/main/java/ch/njol/skript/variables/FlatFileStorage.java
+++ b/src/main/java/ch/njol/skript/variables/FlatFileStorage.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.variables;
 
 import ch.njol.skript.Skript;
@@ -126,10 +108,10 @@ public class FlatFileStorage extends VariablesStorage {
 	/**
 	 * Create a new CSV storage of the given name.
 	 *
-	 * @param name the name.
+	 * @param type the databse type i.e. CSV.
 	 */
-	FlatFileStorage(String name) {
-		super(name);
+	FlatFileStorage(String type) {
+		super(type);
 	}
 
 	/**
@@ -439,7 +421,7 @@ public final void saveVariables(boolean finalSave) {
 						pw.close();
 						FileUtils.move(tempFile, file, true);
 					} catch (IOException e) {
-						Skript.error("Unable to make a final save of the database '" + databaseName +
+						Skript.error("Unable to make a final save of the database '" + getUserConfigurationName() +
 								"' (no variables are lost): " + ExceptionUtils.toString(e));
 						// FIXME happens at random - check locks/threads
 					}
diff --git a/src/main/java/ch/njol/skript/variables/MySQLStorage.java b/src/main/java/ch/njol/skript/variables/MySQLStorage.java
index d81594c3bc7..ff5ac5d39ac 100644
--- a/src/main/java/ch/njol/skript/variables/MySQLStorage.java
+++ b/src/main/java/ch/njol/skript/variables/MySQLStorage.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.variables;
 
 import ch.njol.skript.config.SectionNode;
@@ -25,8 +7,8 @@
 
 public class MySQLStorage extends SQLStorage {
 
-	MySQLStorage(String name) {
-		super(name, "CREATE TABLE IF NOT EXISTS %s (" +
+	MySQLStorage(String type) {
+		super(type, "CREATE TABLE IF NOT EXISTS %s (" +
 				"rowid        BIGINT  NOT NULL  AUTO_INCREMENT  PRIMARY KEY," +
 				"name         VARCHAR(" + MAX_VARIABLE_NAME_LENGTH + ")  NOT NULL  UNIQUE," +
 				"type         VARCHAR(" + MAX_CLASS_CODENAME_LENGTH + ")," +
diff --git a/src/main/java/ch/njol/skript/variables/SQLStorage.java b/src/main/java/ch/njol/skript/variables/SQLStorage.java
index 6dce0d4910a..e0ab25c3ee8 100644
--- a/src/main/java/ch/njol/skript/variables/SQLStorage.java
+++ b/src/main/java/ch/njol/skript/variables/SQLStorage.java
@@ -1,28 +1,9 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.variables;
 
 import java.io.File;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
-import java.util.Map.Entry;
 import java.util.UUID;
 import java.util.concurrent.Callable;
 
@@ -79,11 +60,11 @@ public abstract class SQLStorage extends VariablesStorage {
 	/**
 	 * Creates a SQLStorage with a create table query.
 	 * 
-	 * @param name The name to be sent through this constructor when newInstance creates this class.
+	 * @param type The database type i.e. CSV.
 	 * @param createTableQuery The create table query to send to the SQL engine.
 	 */
-	public SQLStorage(String name, String createTableQuery) {
-		super(name);
+	public SQLStorage(String type, String createTableQuery) {
+		super(type);
 		this.createTableQuery = createTableQuery;
 		this.tableName = "variables21";
 	}
@@ -134,7 +115,7 @@ protected boolean load_i(SectionNode n) {
 			if (monitor_changes == null || monitor_interval == null)
 				return false;
 			monitor = monitor_changes;
-			this.monitor_interval = monitor_interval.getMilliSeconds();
+			this.monitor_interval = monitor_interval.getAs(Timespan.TimePeriod.MILLISECOND);
 
 			final Database db;
 			try {
@@ -156,18 +137,18 @@ protected boolean load_i(SectionNode n) {
 				return false;
 
 			try {
-				final boolean hasOldTable = db.isTable(OLD_TABLE_NAME);
+				final boolean hasOldTable = false;
 				final boolean hadNewTable = db.isTable(getTableName());
 
 				if (getFormattedCreateQuery() == null){
-					Skript.error("Could not create the variables table in the database. The query to create the variables table '" + tableName + "' in the database '" + databaseName + "' is null.");
+					Skript.error("Could not create the variables table in the database. The query to create the variables table '" + tableName + "' in the database '" + getUserConfigurationName() + "' is null.");
 					return false;
 				}
 
 				try {
 					db.query(getFormattedCreateQuery());
 				} catch (final SQLException e) {
-					Skript.error("Could not create the variables table '" + tableName + "' in the database '" + databaseName + "': " + e.getLocalizedMessage() + ". "
+					Skript.error("Could not create the variables table '" + tableName + "' in the database '" + getUserConfigurationName() + "': " + e.getLocalizedMessage() + ". "
 							+ "Please create the table yourself using the following query: " + String.format(createTableQuery, tableName).replace(",", ", ").replaceAll("\\s+", " "));
 					return false;
 				}
@@ -178,15 +159,6 @@ protected boolean load_i(SectionNode n) {
 				
 				// old
 				// Table name support was added after the verison that used the legacy database format
-				if (hasOldTable && !tableName.equals("variables")) {
-					final ResultSet r1 = db.query("SELECT " + SELECT_ORDER + " FROM " + OLD_TABLE_NAME);
-					assert r1 != null;
-					try {
-						oldLoadVariables(r1, hadNewTable);
-					} finally {
-						r1.close();
-					}
-				}
 
 				// new
 				final ResultSet r2 = db.query("SELECT " + SELECT_ORDER + " FROM " + getTableName());
@@ -198,51 +170,6 @@ protected boolean load_i(SectionNode n) {
 				}
 
 				// store old variables in new table and delete the old table
-				if (hasOldTable) {
-					if (!hadNewTable) {
-						Skript.info("[2.1] Updating the database '" + databaseName + "' to the new format...");
-						try {
-							Variables.getReadLock().lock();
-							for (final Entry<String, Object> v : Variables.getVariablesHashMap().entrySet()) {
-								if (accept(v.getKey())) {// only one database was possible, so only checking this database is correct
-									@SuppressWarnings("null")
-									final SerializedVariable var = Variables.serialize(v.getKey(), v.getValue());
-									final SerializedVariable.Value d = var.value;
-									save(var.name, d == null ? null : d.type, d == null ? null : d.data);
-								}
-							}
-							Skript.info("Updated and transferred " + Variables.getVariablesHashMap().size() + " variables to the new table.");
-						} finally {
-							Variables.getReadLock().unlock();
-						}
-					}
-					db.query("DELETE FROM " + OLD_TABLE_NAME + " WHERE value IS NULL");
-					db.query("DELETE FROM old USING " + OLD_TABLE_NAME + " AS old, " + getTableName() + " AS new WHERE old.name = new.name");
-					final ResultSet r = db.query("SELECT * FROM " + OLD_TABLE_NAME + " LIMIT 1");
-					try {
-						if (r.next()) {// i.e. the old table is not empty
-							Skript.error("Could not successfully convert & transfer all variables to the new table in the database '" + databaseName + "'. "
-									+ "Variables that could not be transferred are left in the old table and Skript will reattempt to transfer them whenever it starts until the old table is empty or is manually deleted. "
-									+ "Please note that variables recreated by scripts will count as converted and will be removed from the old table on the next restart.");
-						} else {
-							boolean error = false;
-							try {
-								disconnect(); // prevents SQLITE_LOCKED error
-								connect();
-								db.query("DROP TABLE " + OLD_TABLE_NAME);
-							} catch (final SQLException e) {
-								Skript.error("There was an error deleting the old variables table from the database '" + databaseName + "', please delete it yourself: " + e.getLocalizedMessage());
-								error = true;
-							}
-							if (!error)
-								Skript.info("Successfully deleted the old variables table from the database '" + databaseName + "'.");
-							if (!hadNewTable)
-								Skript.info("Database '" + databaseName + "' successfully updated.");
-						}
-					} finally {
-						r.close();
-					}
-				}
 			} catch (final SQLException e) {
 				sqlException(e);
 				return false;
@@ -265,7 +192,7 @@ public void run() {
 						} catch (final InterruptedException e) {}
 					}
 				}
-			}, "Skript database '" + databaseName + "' connection keep-alive thread").start();
+			}, "Skript database '" + getUserConfigurationName() + "' connection keep-alive thread").start();
 
 			return true;
 		}
@@ -273,7 +200,7 @@ public void run() {
 
 	@Override
 	protected void allLoaded() {
-		Skript.debug("Database " + databaseName + " loaded. Queue size = " + changesQueue.size());
+		Skript.debug("Database " + getUserConfigurationName() + " loaded. Queue size = " + changesQueue.size());
 
 		// start committing thread. Its first execution will also commit the first batch of changed variables.
 		Skript.newThread(new Runnable() {
@@ -296,7 +223,7 @@ public void run() {
 					} catch (final InterruptedException e) {}
 				}
 			}
-		}, "Skript database '" + databaseName + "' transaction committing thread").start();
+		}, "Skript database '" + getUserConfigurationName() + "' transaction committing thread").start();
 
 		if (monitor) {
 			Skript.newThread(new Runnable() {
@@ -327,7 +254,7 @@ public void run() {
 						}
 					}
 				}
-			}, "Skript database '" + databaseName + "' monitor thread").start();
+			}, "Skript database '" + getUserConfigurationName() + "' monitor thread").start();
 		}
 
 	}
@@ -352,9 +279,9 @@ private final boolean connect(final boolean first) {
 			final Database db = this.db.get();
 			if (db == null || !db.open()) {
 				if (first)
-					Skript.error("Cannot connect to the database '" + databaseName + "'! Please make sure that all settings are correct");// + (type == Type.MYSQL ? " and that the database software is running" : "") + ".");
+					Skript.error("Cannot connect to the database '" + getUserConfigurationName() + "'! Please make sure that all settings are correct");// + (type == Type.MYSQL ? " and that the database software is running" : "") + ".");
 				else
-					Skript.exception("Cannot reconnect to the database '" + databaseName + "'!");
+					Skript.exception("Cannot reconnect to the database '" + getUserConfigurationName() + "'!");
 				return false;
 			}
 			try {
@@ -400,7 +327,7 @@ private boolean prepareQueries() {
 				} catch (final SQLException e) {}
 				monitorCleanUpQuery = db.prepare("DELETE FROM " + getTableName() + " WHERE value IS NULL AND rowid < ?");
 			} catch (final SQLException e) {
-				Skript.exception(e, "Could not prepare queries for the database '" + databaseName + "': " + e.getLocalizedMessage());
+				Skript.exception(e, "Could not prepare queries for the database '" + getUserConfigurationName() + "': " + e.getLocalizedMessage());
 				return false;
 			}
 		}
@@ -577,7 +504,7 @@ public SQLException call() throws Exception {
 						int i = 1;
 						final String name = r.getString(i++);
 						if (name == null) {
-							Skript.error("Variable with NULL name found in the database '" + databaseName + "', ignoring it");
+							Skript.error("Variable with NULL name found in the database '" + getUserConfigurationName() + "', ignoring it");
 							continue;
 						}
 						final String type = r.getString(i++);
@@ -590,7 +517,7 @@ public SQLException call() throws Exception {
 							@SuppressWarnings("unused")
 							Serializer<?> s;
 							if (c == null || (s = c.getSerializer()) == null) {
-								Skript.error("Cannot load the variable {" + name + "} from the database '" + databaseName + "', because the type '" + type + "' cannot be recognised or cannot be stored in variables");
+								Skript.error("Cannot load the variable {" + name + "} from the database '" + getUserConfigurationName() + "', because the type '" + type + "' cannot be recognised or cannot be stored in variables");
 								continue;
 							}
 //					if (s.mustSyncDeserialization()) {
@@ -598,7 +525,7 @@ public SQLException call() throws Exception {
 //					} else {
 							final Object d = Classes.deserialize(c, value);
 							if (d == null) {
-								Skript.error("Cannot load the variable {" + name + "} from the database '" + databaseName + "', because it cannot be loaded as " + c.getName().withIndefiniteArticle());
+								Skript.error("Cannot load the variable {" + name + "} from the database '" + getUserConfigurationName() + "', because it cannot be loaded as " + c.getName().withIndefiniteArticle());
 								continue;
 							}
 							Variables.variableLoaded(name, d, SQLStorage.this);
@@ -623,7 +550,7 @@ public SQLException call() throws Exception {
 //							for (final VariableInfo o : syncDeserializing) {
 //								final Object d = Classes.deserialize(o.ci, o.value);
 //								if (d == null) {
-//									Skript.error("Cannot load the variable {" + o.name + "} from the database " + databaseName + ", because it cannot be loaded as a " + o.ci.getName());
+//									Skript.error("Cannot load the variable {" + o.name + "} from the database " + getUserConfigurationName() + ", because it cannot be loaded as a " + o.ci.getName());
 //									continue;
 //								}
 //								Variables.variableLoaded(o.name, d, DatabaseStorage.this);
@@ -651,132 +578,6 @@ public SQLException call() throws Exception {
 
 //	final static LinkedList<OldVariableInfo> oldSyncDeserializing = new LinkedList<OldVariableInfo>();
 
-	@Deprecated
-	private void oldLoadVariables(final ResultSet r, final boolean hadNewTable) throws SQLException {
-//		synchronized (oldSyncDeserializing) {
-
-		final VariablesStorage temp = new VariablesStorage(databaseName + " old variables table") {
-			@Override
-			protected boolean save(final String name, @Nullable final String type, @Nullable final byte[] value) {
-				assert type == null : name + "; " + type;
-				return true;
-			}
-
-			@Override
-			boolean accept(@Nullable final String var) {
-				assert false;
-				return false;
-			}
-
-			@Override
-			protected boolean requiresFile() {
-				assert false;
-				return false;
-			}
-
-			@Override
-			protected boolean load_i(final SectionNode n) {
-				assert false;
-				return false;
-			}
-
-			@Override
-			protected File getFile(final String file) {
-				assert false;
-				return new File(file);
-			}
-
-			@Override
-			protected void disconnect() {
-				assert false;
-			}
-
-			@Override
-			protected boolean connect() {
-				assert false;
-				return false;
-			}
-
-			@Override
-			protected void allLoaded() {
-				assert false;
-			}
-		};
-
-		final SQLException e = Task.callSync(new Callable<SQLException>() {
-			@SuppressWarnings("null")
-			@Override
-			@Nullable
-			public SQLException call() throws Exception {
-				try {
-					while (r.next()) {
-						int i = 1;
-						final String name = r.getString(i++);
-						if (name == null) {
-							Skript.error("Variable with NULL name found in the database, ignoring it");
-							continue;
-						}
-						final String type = r.getString(i++);
-						final String value = r.getString(i++);
-						lastRowID = r.getLong(i++);
-						if (type == null || value == null) {
-							Variables.variableLoaded(name, null, hadNewTable ? temp : SQLStorage.this);
-						} else {
-							final ClassInfo<?> c = Classes.getClassInfoNoError(type);
-							Serializer<?> s;
-							if (c == null || (s = c.getSerializer()) == null) {
-								Skript.error("Cannot load the variable {" + name + "} from the database, because the type '" + type + "' cannot be recognised or not stored in variables");
-								continue;
-							}
-//					if (s.mustSyncDeserialization()) {
-//						oldSyncDeserializing.add(new OldVariableInfo(name, value, c));
-//					} else {
-							final Object d = s.deserialize(value);
-							if (d == null) {
-								Skript.error("Cannot load the variable {" + name + "} from the database, because '" + value + "' cannot be parsed as a " + type);
-								continue;
-							}
-							Variables.variableLoaded(name, d, SQLStorage.this);
-//					}
-						}
-					}
-				} catch (final SQLException e) {
-					return e;
-				}
-				return null;
-			}
-		});
-		if (e != null)
-			throw e;
-
-//			if (!oldSyncDeserializing.isEmpty()) {
-//				Task.callSync(new Callable<Void>() {
-//					@Override
-//					@Nullable
-//					public Void call() throws Exception {
-//						synchronized (oldSyncDeserializing) {
-//							for (final OldVariableInfo o : oldSyncDeserializing) {
-//								final Serializer<?> s = o.ci.getSerializer();
-//								if (s == null) {
-//									assert false : o.ci;
-//									continue;
-//								}
-//								final Object d = s.deserialize(o.value);
-//								if (d == null) {
-//									Skript.error("Cannot load the variable {" + o.name + "} from the database, because '" + o.value + "' cannot be parsed as a " + o.ci.getCodeName());
-//									continue;
-//								}
-//								Variables.variableLoaded(o.name, d, DatabaseStorage.this);
-//							}
-//							oldSyncDeserializing.clear();
-//							return null;
-//						}
-//					}
-//				});
-//			}
-//		}
-	}
-
 	void sqlException(final SQLException e) {
 		Skript.error("database error: " + e.getLocalizedMessage());
 		if (Skript.testing())
diff --git a/src/main/java/ch/njol/skript/variables/SQLiteStorage.java b/src/main/java/ch/njol/skript/variables/SQLiteStorage.java
index fc4c54072d6..57032218f95 100644
--- a/src/main/java/ch/njol/skript/variables/SQLiteStorage.java
+++ b/src/main/java/ch/njol/skript/variables/SQLiteStorage.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.variables;
 
 import java.io.File;
@@ -27,8 +9,8 @@
 
 public class SQLiteStorage extends SQLStorage {
 
-	SQLiteStorage(String name) {
-		super(name, "CREATE TABLE IF NOT EXISTS %s (" +
+	SQLiteStorage(String type) {
+		super(type, "CREATE TABLE IF NOT EXISTS %s (" +
 				"name         VARCHAR(" + MAX_VARIABLE_NAME_LENGTH + ")  NOT NULL  PRIMARY KEY," +
 				"type         VARCHAR(" + MAX_CLASS_CODENAME_LENGTH + ")," +
 				"value        BLOB(" + MAX_VALUE_SIZE + ")," +
diff --git a/src/main/java/ch/njol/skript/variables/SerializedVariable.java b/src/main/java/ch/njol/skript/variables/SerializedVariable.java
index b66b9acc333..258a251a9b5 100644
--- a/src/main/java/ch/njol/skript/variables/SerializedVariable.java
+++ b/src/main/java/ch/njol/skript/variables/SerializedVariable.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.variables;
 
 import org.jetbrains.annotations.Nullable;
diff --git a/src/main/java/ch/njol/skript/variables/TypeHints.java b/src/main/java/ch/njol/skript/variables/TypeHints.java
index 7340d2fd970..12b7768f365 100644
--- a/src/main/java/ch/njol/skript/variables/TypeHints.java
+++ b/src/main/java/ch/njol/skript/variables/TypeHints.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.variables;
 
 import java.util.ArrayDeque;
diff --git a/src/main/java/ch/njol/skript/variables/Variables.java b/src/main/java/ch/njol/skript/variables/Variables.java
index f8add5a4331..090f060bdd4 100644
--- a/src/main/java/ch/njol/skript/variables/Variables.java
+++ b/src/main/java/ch/njol/skript/variables/Variables.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.variables;
 
 import ch.njol.skript.Skript;
@@ -32,28 +14,33 @@
 import ch.njol.skript.variables.SerializedVariable.Value;
 import ch.njol.util.Kleenean;
 import ch.njol.util.NonNullPair;
+import ch.njol.util.Pair;
+import ch.njol.util.StringUtils;
 import ch.njol.util.SynchronizedReference;
+import ch.njol.util.coll.iterator.EmptyIterator;
 import ch.njol.yggdrasil.Yggdrasil;
+import com.google.common.collect.HashMultimap;
+import com.google.common.collect.Multimap;
 import org.bukkit.Bukkit;
 import org.bukkit.configuration.serialization.ConfigurationSerializable;
 import org.bukkit.configuration.serialization.ConfigurationSerialization;
 import org.bukkit.event.Event;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
+import org.jetbrains.annotations.UnmodifiableView;
 import org.skriptlang.skript.lang.converter.Converters;
 
-import com.google.common.collect.HashMultimap;
-import com.google.common.collect.Multimap;
-
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 import java.util.Map.Entry;
+import java.util.NoSuchElementException;
 import java.util.Optional;
 import java.util.Queue;
 import java.util.TreeMap;
@@ -140,9 +127,16 @@ public Class<? extends ConfigurationSerializable> getClass(@NotNull String id) {
 	 */
 	static final List<VariablesStorage> STORAGES = new ArrayList<>();
 
+	/**
+	 * @return a copy of the list of variable storage handlers
+	 */
+	public static @UnmodifiableView List<VariablesStorage> getStores() {
+		return Collections.unmodifiableList(STORAGES);
+	}
+
 	/**
 	 * Register a VariableStorage class for Skript to create if the user config value matches.
-	 * 
+	 *
 	 * @param <T> A class to extend VariableStorage.
 	 * @param storage The class of the VariableStorage implementation.
 	 * @param names The names used in the config of Skript to select this VariableStorage.
@@ -240,7 +234,7 @@ public static boolean load() {
 						constructor.setAccessible(true);
 						variablesStorage = (VariablesStorage) constructor.newInstance(type);
 					} catch (InstantiationException | IllegalAccessException | IllegalArgumentException | InvocationTargetException | NoSuchMethodException | SecurityException e) {
-						Skript.error("Failed to initalize database type '" + type + "'");
+						Skript.error("Failed to initialize database `" + name + "`");
 						successful = false;
 						continue;
 					}
@@ -409,8 +403,7 @@ public static void setLocalVariables(Event event, @Nullable Object map) {
 	 * @param event the event to copy local variables from.
 	 * @return the copy.
 	 */
-	@Nullable
-	public static Object copyLocalVariables(Event event) {
+	public static @Nullable Object copyLocalVariables(Event event) {
 		VariablesMap from = localVariables.get(event);
 		if (from == null)
 			return null;
@@ -418,6 +411,20 @@ public static Object copyLocalVariables(Event event) {
 		return from.copy();
 	}
 
+	/**
+	 * Copies local variables from provider to user, runs action, then copies variables back to provider.
+	 * Removes local variables from user after action is finished.
+	 * @param provider The originator of the local variables.
+	 * @param user The event to copy the variables to and back from.
+	 * @param action The code to run while the variables are copied.
+	 */
+	public static void withLocalVariables(Event provider, Event user, @NotNull Runnable action) {
+		Variables.setLocalVariables(user, Variables.copyLocalVariables(provider));
+		action.run();
+		Variables.setLocalVariables(provider, Variables.copyLocalVariables(user));
+		Variables.removeLocals(user);
+	}
+
 	/**
 	 * Returns the internal value of the requested variable.
 	 * <p>
@@ -474,6 +481,67 @@ public static Object getVariable(String name, @Nullable Event event, boolean loc
 		}
 	}
 
+	/**
+	 * Returns an iterator over the values of this list variable.
+	 *
+	 * @param name the variable's name. This must be the name of a list variable, ie. it must end in *.
+	 * @param event if {@code local} is {@code true}, this is the event
+	 *                 the local variable resides in.
+	 * @param local if this variable is a local or global variable.
+	 * @return an {@link Iterator} of {@link Pair}s, containing the {@link String} index and {@link Object} value of the
+	 * 			elements of the list. An empty iterator is returned if the variable does not exist.
+	 */
+	public static Iterator<Pair<String, Object>> getVariableIterator(String name, boolean local, @Nullable Event event) {
+		assert name.endsWith("*");
+		Object val = getVariable(name, event, local);
+		String subName = StringUtils.substring(name, 0, -1);
+
+		if (val == null)
+			return new EmptyIterator<>();
+		assert val instanceof TreeMap;
+		// temporary list to prevent CMEs
+		@SuppressWarnings("unchecked")
+		Iterator<String> keys = new ArrayList<>(((Map<String, Object>) val).keySet()).iterator();
+		return new Iterator<>() {
+			@Nullable
+			private String key;
+			@Nullable
+			private Object next = null;
+
+			@Override
+			public boolean hasNext() {
+				if (next != null)
+					return true;
+				while (keys.hasNext()) {
+					key = keys.next();
+					if (key != null) {
+						next = Variable.convertIfOldPlayer(subName + key, local, event, Variables.getVariable(subName + key, event, local));
+						if (next != null && !(next instanceof TreeMap))
+							return true;
+					}
+				}
+				next = null;
+				return false;
+			}
+
+			@Override
+			public Pair<String, Object> next() {
+				if (!hasNext())
+					throw new NoSuchElementException();
+				Pair<String, Object> n = new Pair<>(key, next);
+				next = null;
+				return n;
+			}
+
+			@Override
+			public void remove() {
+				if (key == null)
+					throw new IllegalStateException();
+				Variables.deleteVariable(key, event, local);
+			}
+		};
+	}
+
 	/**
 	 * Deletes a variable.
 	 *
@@ -680,8 +748,8 @@ static boolean variableLoaded(String name, @Nullable Object value, VariablesStor
 					// Warn if needed
 					if (loadConflicts <= MAX_CONFLICT_WARNINGS) {
 						Skript.warning("The variable {" + name + "} was loaded twice from different databases (" +
-							existingVariableStorage.databaseName + " and " + source.databaseName +
-							"), only the one from " + source.databaseName + " will be kept.");
+							existingVariableStorage.getUserConfigurationName() + " and " + source.getUserConfigurationName() +
+							"), only the one from " + source.getUserConfigurationName() + " will be kept.");
 					} else if (loadConflicts == MAX_CONFLICT_WARNINGS + 1) {
 						Skript.warning("[!] More than " + MAX_CONFLICT_WARNINGS +
 							" variables were loaded more than once from different databases, " +
diff --git a/src/main/java/ch/njol/skript/variables/VariablesMap.java b/src/main/java/ch/njol/skript/variables/VariablesMap.java
index cef587e9f38..9934f46eba5 100644
--- a/src/main/java/ch/njol/skript/variables/VariablesMap.java
+++ b/src/main/java/ch/njol/skript/variables/VariablesMap.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.variables;
 
 import ch.njol.skript.lang.Variable;
diff --git a/src/main/java/ch/njol/skript/variables/VariablesStorage.java b/src/main/java/ch/njol/skript/variables/VariablesStorage.java
index a8b54114949..10c4bf99d01 100644
--- a/src/main/java/ch/njol/skript/variables/VariablesStorage.java
+++ b/src/main/java/ch/njol/skript/variables/VariablesStorage.java
@@ -1,25 +1,10 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.variables;
 
 import java.io.File;
 import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.Set;
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.regex.Pattern;
 import java.util.regex.PatternSyntaxException;
@@ -47,6 +32,7 @@
  * @see DatabaseStorage
  */
 // FIXME ! large databases (>25 MB) cause the server to be unresponsive instead of loading slowly
+@SuppressWarnings({"SuspiciousIndentAfterControlStatement", "removal"})
 public abstract class VariablesStorage implements Closeable {
 
 	/**
@@ -67,9 +53,14 @@ public abstract class VariablesStorage implements Closeable {
 	protected volatile boolean closed = false;
 
 	/**
-	 * The name of the database, i.e. this storage.
+	 * The name of the database
+	 */
+	private String databaseName;
+
+	/**
+	 * The type of the database, i.e. CSV.
 	 */
-	protected final String databaseName;
+	private final String databaseType;
 
 	/**
 	 * The file associated with this variable storage.
@@ -97,11 +88,11 @@ public abstract class VariablesStorage implements Closeable {
 	 * This will also create the {@link #writeThread}, but it must be started
 	 * with {@link #load(SectionNode)}.
 	 *
-	 * @param name the name.
+	 * @param type the database type i.e. CSV.
 	 */
-	protected VariablesStorage(String name) {
-		assert name != null;
-		databaseName = name;
+	protected VariablesStorage(String type) {
+		assert type != null;
+		databaseType = type;
 
 		writeThread = Skript.newThread(() -> {
 			while (!closed) {
@@ -119,7 +110,29 @@ protected VariablesStorage(String name) {
 					// Ignored as the `closed` field will indicate whether the thread actually needs to stop
 				}
 			}
-		}, "Skript variable save thread for database '" + name + "'");
+		}, "Skript variable save thread for database '" + type + "'");
+	}
+
+	/**
+	 * Get the config name of a database
+	 * <p>
+	 * Note: Returns the user set name for the database, ex:
+	 * <pre>{@code
+	 * default: <- Config Name
+	 *    type: CSV
+	 * }</pre>
+	 * @return name of database
+	 */
+	protected final String getUserConfigurationName() {
+		return databaseName;
+	}
+
+	/**
+	 * Get the config type of a database
+	 * @return type of databse
+	 */
+	protected final String getDatabaseType() {
+		return databaseType;
 	}
 
 	/**
@@ -169,6 +182,8 @@ protected <T> T getValue(SectionNode sectionNode, String key, Class<T> type) {
 		}
 	}
 
+	private static final Set<File> registeredFiles = new HashSet<>();
+
 	/**
 	 * Loads the configuration for this variable storage
 	 * from the given section node.
@@ -177,6 +192,8 @@ protected <T> T getValue(SectionNode sectionNode, String key, Class<T> type) {
 	 * @return whether the loading succeeded.
 	 */
 	public final boolean load(SectionNode sectionNode) {
+		databaseName = sectionNode.getKey();
+
 		String pattern = getValue(sectionNode, "pattern");
 		if (pattern == null)
 			return false;
@@ -221,12 +238,33 @@ public final boolean load(SectionNode sectionNode) {
 				return false;
 			}
 
+			if (registeredFiles.contains(file)) {
+				Skript.error("Database `" + databaseName + "` failed to load. The file `" + fileName + "` is already registered to another database.");
+				return false;
+			}
+			registeredFiles.add(file);
+
 			// Set the backup interval, if present & enabled
 			if (!"0".equals(getValue(sectionNode, "backup interval"))) {
 				Timespan backupInterval = getValue(sectionNode, "backup interval", Timespan.class);
-
+				int toKeep = getValue(sectionNode, "backups to keep", Integer.class);
+				boolean removeBackups = false;
+				boolean startBackup = true;
 				if (backupInterval != null)
-					startBackupTask(backupInterval);
+					if (toKeep == 0) {
+						startBackup = false;
+					} else if (toKeep >= 1) {
+						removeBackups = true;
+					}
+					if (startBackup) {
+						startBackupTask(backupInterval, removeBackups, toKeep);
+					} else {
+						try {
+							FileUtils.backupPurge(file, toKeep);
+						} catch (IOException e) {
+							Skript.error("Variables backup wipe failed: " + e.getLocalizedMessage());
+						}
+					}
 			}
 		}
 
@@ -307,12 +345,11 @@ public final boolean load(SectionNode sectionNode) {
 	 *
 	 * @param backupInterval the backup interval.
 	 */
-	public void startBackupTask(Timespan backupInterval) {
+	public void startBackupTask(Timespan backupInterval, boolean removeBackups, int toKeep) {
 		// File is null or backup interval is invalid
-		if (file == null || backupInterval.getTicks() == 0)
+		if (file == null || backupInterval.getAs(Timespan.TimePeriod.TICK) == 0)
 			return;
-
-		backupTask = new Task(Skript.getInstance(), backupInterval.getTicks(), backupInterval.getTicks(), true) {
+		backupTask = new Task(Skript.getInstance(), backupInterval.getAs(Timespan.TimePeriod.TICK), backupInterval.getAs(Timespan.TimePeriod.TICK), true) {
 			@Override
 			public void run() {
 				synchronized (connectionLock) {
@@ -321,6 +358,13 @@ public void run() {
 					try {
 						// ..., then backup
 						FileUtils.backup(file);
+						if (removeBackups) {
+							try {
+								FileUtils.backupPurge(file, toKeep);
+							} catch (IOException | IllegalArgumentException e) {
+								Skript.error("Automatic variables backup purge failed: " + e.getLocalizedMessage());
+							}
+						}
 					} catch (IOException e) {
 						Skript.error("Automatic variables backup failed: " + e.getLocalizedMessage());
 					} finally {
@@ -347,6 +391,14 @@ boolean accept(@Nullable String var) {
 		return variableNamePattern == null || variableNamePattern.matcher(var).matches();
 	}
 
+	/**
+	 * Returns the name pattern accepted by this variable storage
+	 * @return the name pattern, or null if accepting all
+	 */
+	public @Nullable Pattern getNamePattern() {
+		return variableNamePattern;
+	}
+
 	/**
 	 * The interval between warnings that many variables are being written
 	 * at once, in seconds.
diff --git a/src/main/java/ch/njol/util/Callback.java b/src/main/java/ch/njol/util/Callback.java
index efce012642b..bc3b5488308 100644
--- a/src/main/java/ch/njol/util/Callback.java
+++ b/src/main/java/ch/njol/util/Callback.java
@@ -1,28 +1,23 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.util;
 
 import org.jetbrains.annotations.Nullable;
+import org.jetbrains.annotations.ApiStatus;
+
+import java.util.function.Function;
+
+/**
+ * @deprecated use {@link Function}
+ */
+@Deprecated(forRemoval = true)
+@FunctionalInterface
+public interface Callback<R, A> extends Function<A, R> {
 
-public interface Callback<R, A> {
-	
 	@Nullable
 	public R run(A arg);
-	
+
+	@Override
+	default R apply(A a) {
+		return run(a);
+	}
+
 }
diff --git a/src/main/java/ch/njol/util/CaseInsensitiveString.java b/src/main/java/ch/njol/util/CaseInsensitiveString.java
index 1f77cd834a9..ccf421c2096 100644
--- a/src/main/java/ch/njol/util/CaseInsensitiveString.java
+++ b/src/main/java/ch/njol/util/CaseInsensitiveString.java
@@ -1,62 +1,43 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.util;
 
+import org.jetbrains.annotations.ApiStatus;
+
 import java.io.Serializable;
 import java.util.Locale;
 
 import javax.annotation.Nullable;
 
-
-
 /**
- * A string which is compared ignoring it's case.
- * 
- * @author Peter Güttinger
+ * @deprecated use {@link java.lang.String#equalsIgnoreCase(String)}
  */
+@Deprecated(forRemoval = true)
 public class CaseInsensitiveString implements Serializable, Comparable<CharSequence>, CharSequence {
-	
+
 	private static final long serialVersionUID = 1205018864604639962L;
-	
+
 	private final String s;
 	private final String lc;
-	
+
 	private final Locale locale;
-	
+
 	@SuppressWarnings("null")
 	public CaseInsensitiveString(final String s) {
 		this.s = s;
 		locale = Locale.getDefault();
 		lc = "" + s.toLowerCase(locale);
 	}
-	
+
 	public CaseInsensitiveString(final String s, final Locale locale) {
 		this.s = s;
 		this.locale = locale;
 		lc = "" + s.toLowerCase(locale);
 	}
-	
+
 	@Override
 	public int hashCode() {
 		return lc.hashCode();
 	}
-	
+
 	@SuppressWarnings("null")
 	@Override
 	public boolean equals(final @Nullable Object o) {
@@ -66,27 +47,27 @@ public boolean equals(final @Nullable Object o) {
 			return ((CharSequence) o).toString().toLowerCase(locale).equals(lc);
 		return false;
 	}
-	
+
 	@Override
 	public String toString() {
 		return s;
 	}
-	
+
 	@Override
 	public char charAt(final int i) {
 		return s.charAt(i);
 	}
-	
+
 	@Override
 	public int length() {
 		return s.length();
 	}
-	
+
 	@Override
 	public CaseInsensitiveString subSequence(final int start, final int end) {
 		return new CaseInsensitiveString("" + s.substring(start, end), locale);
 	}
-	
+
 	@SuppressWarnings("null")
 	@Override
 	public int compareTo(final CharSequence s) {
diff --git a/src/main/java/ch/njol/util/Checker.java b/src/main/java/ch/njol/util/Checker.java
index 95b8f02c073..8f98a7a08b7 100644
--- a/src/main/java/ch/njol/util/Checker.java
+++ b/src/main/java/ch/njol/util/Checker.java
@@ -1,26 +1,19 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.util;
 
+import java.util.function.Predicate;
+
+/**
+ * @deprecated use {@link Predicate}
+ */
+@Deprecated(forRemoval = true)
 @FunctionalInterface
-public interface Checker<T> {
-	
-	public boolean check(T o);
-	
+public interface Checker<T> extends Predicate<T> {
+
+	boolean check(T o);
+
+	@Override
+	default boolean test(T t) {
+		return this.check(t);
+	}
+
 }
diff --git a/src/main/java/ch/njol/util/Closeable.java b/src/main/java/ch/njol/util/Closeable.java
index ddeb460d301..b4fa7c18ee7 100644
--- a/src/main/java/ch/njol/util/Closeable.java
+++ b/src/main/java/ch/njol/util/Closeable.java
@@ -1,34 +1,18 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.util;
 
 /**
  * Like {@link java.io.Closeable}, but not used for resources, thus it neither throws checked exceptions nor causes resource leak warnings.
- * 
- * @author Peter Güttinger
+ *
+ * This is an auto-closeable resource and so may be used within a try-with-resources section for automatic disposal.
+ * @deprecated use {@link java.io.Closeable}
  */
-public interface Closeable {
-	
+@Deprecated(forRemoval = true)
+public interface Closeable extends AutoCloseable {
+
 	/**
 	 * Closes this object. This method may be called multiple times and may or may not have an effect on subsequent calls (e.g. a task might be stopped, but resumed later and
 	 * stopped again).
 	 */
-	public void close();
-	
+	void close();
+
 }
diff --git a/src/main/java/ch/njol/util/EnumTypeAdapter.java b/src/main/java/ch/njol/util/EnumTypeAdapter.java
index 4a955bb6dfb..8031e753fce 100644
--- a/src/main/java/ch/njol/util/EnumTypeAdapter.java
+++ b/src/main/java/ch/njol/util/EnumTypeAdapter.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.util;
 
 import com.google.gson.Gson;
diff --git a/src/main/java/ch/njol/util/Kleenean.java b/src/main/java/ch/njol/util/Kleenean.java
index 6939a301e1c..09e6dabf07e 100644
--- a/src/main/java/ch/njol/util/Kleenean.java
+++ b/src/main/java/ch/njol/util/Kleenean.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.util;
 
 import java.util.Locale;
diff --git a/src/main/java/ch/njol/util/LoggerFilter.java b/src/main/java/ch/njol/util/LoggerFilter.java
index b2e1aa6db8c..6ef542de9f0 100644
--- a/src/main/java/ch/njol/util/LoggerFilter.java
+++ b/src/main/java/ch/njol/util/LoggerFilter.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.util;
 
 import java.util.ArrayList;
@@ -26,18 +8,19 @@
 
 import org.jetbrains.annotations.Nullable;
 
+@SuppressWarnings("removal")
 public final class LoggerFilter implements Filter, Closeable {
 	private final Logger l;
 	private final Collection<Filter> filters = new ArrayList<>(5);
 	@Nullable
 	private final Filter oldFilter;
-	
+
 	public LoggerFilter(final Logger l) {
 		this.l = l;
 		oldFilter = l.getFilter();
 		l.setFilter(this);
 	}
-	
+
 	@Override
 	public boolean isLoggable(final @Nullable LogRecord record) {
 		if (oldFilter != null && !oldFilter.isLoggable(record))
@@ -47,15 +30,15 @@ public boolean isLoggable(final @Nullable LogRecord record) {
 				return false;
 		return true;
 	}
-	
+
 	public final void addFilter(final Filter f) {
 		filters.add(f);
 	}
-	
+
 	public final boolean removeFilter(final Filter f) {
 		return filters.remove(f);
 	}
-	
+
 	@Override
 	public void close() {
 		l.setFilter(oldFilter);
diff --git a/src/main/java/ch/njol/util/Math2.java b/src/main/java/ch/njol/util/Math2.java
index d17ac6910d1..6029be12027 100644
--- a/src/main/java/ch/njol/util/Math2.java
+++ b/src/main/java/ch/njol/util/Math2.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.util;
 
 import ch.njol.skript.Skript;
@@ -32,9 +14,9 @@
  */
 @ApiStatus.Internal
 public final class Math2 {
-	
+
 	private Math2() {}
-	
+
 	/**
 	 * Fits an int into the given interval. The method's behaviour when min > max is unspecified.
 	 *
@@ -44,7 +26,7 @@ public static int fit(int min, int value, int max) {
 		assert min <= max : min + "," + value + "," + max;
 		return Math.min(Math.max(value, min), max);
 	}
-	
+
 	/**
 	 * Fits a long into the given interval. The method's behaviour when min > max is unspecified.
 	 *
@@ -64,17 +46,17 @@ public static float fit(float min, float value, float max) {
 		assert min <= max : min + "," + value + "," + max;
 		return Math.min(Math.max(value, min), max);
 	}
-	
+
 	/**
 	 * Fits a double into the given interval. The method's behaviour when min > max is unspecified.
-	 * 
+	 *
 	 * @return A double in between min and max
 	 */
 	public static double fit(double min, double value, double max) {
 		assert min <= max : min + "," + value + "," + max;
 		return Math.min(Math.max(value, min), max);
 	}
-	
+
 	/**
 	 * Modulo that returns positive values even for negative arguments.
 	 *
@@ -83,7 +65,7 @@ public static double fit(double min, double value, double max) {
 	public static int mod(int value, int mod) {
 		return (value % mod + mod) % mod;
 	}
-	
+
 	/**
 	 * Modulo that returns positive values even for negative arguments.
 	 *
@@ -92,7 +74,7 @@ public static int mod(int value, int mod) {
 	public static long mod(long value, long mod) {
 		return (value % mod + mod) % mod;
 	}
-	
+
 	/**
 	 * Modulo that returns positive values even for negative arguments.
 	 *
@@ -101,7 +83,7 @@ public static long mod(long value, long mod) {
 	public static float mod(float value, float mod) {
 		return (value % mod + mod) % mod;
 	}
-	
+
 	/**
 	 * Modulo that returns positive values even for negative arguments.
 	 *
@@ -110,42 +92,42 @@ public static float mod(float value, float mod) {
 	public static double mod(double value, double mod) {
 		return (value % mod + mod) % mod;
 	}
-	
+
 	/**
 	 * Ceils the given float and returns the result as an int.
 	 */
 	public static int ceil(float value) {
 		return (int) Math.ceil(value - Skript.EPSILON);
 	}
-	
+
 	/**
 	 * Rounds the given float (where .5 is rounded up) and returns the result as an int.
 	 */
 	public static int round(float value) {
 		return (int) Math.round(value + Skript.EPSILON);
 	}
-	
+
 	/**
 	 * Floors the given double and returns the result as a long.
 	 */
 	public static long floor(double value) {
 		return (long) Math.floor(value + Skript.EPSILON);
 	}
-	
+
 	/**
 	 * Ceils the given double and returns the result as a long.
 	 */
 	public static long ceil(double value) {
 		return (long) Math.ceil(value - Skript.EPSILON);
 	}
-	
+
 	/**
 	 * Rounds the given double (where .5 is rounded up) and returns the result as a long.
 	 */
 	public static long round(double value) {
 		return Math.round(value + Skript.EPSILON);
 	}
-	
+
 	/**
 	 * Guarantees a float is neither NaN nor infinite.
 	 * Useful for situations when safe floats are required.
@@ -169,103 +151,16 @@ public static long addClamped(long x, long y) {
 			return Long.MAX_VALUE;
 		return result;
 	}
-	
+
 	public static long multiplyClamped(long x, long y) {
 		long result = x * y;
 		long ax = Math.abs(x);
 		long ay = Math.abs(y);
 		// Logic extracted from Math#multiplyExact to avoid having to catch an expensive exception
-        if (((ax | ay) >>> 31 != 0) && (((y != 0) && (result / y != x)) || (x == Long.MIN_VALUE && y == -1)))
+		if (((ax | ay) >>> 31 != 0) && (((y != 0) && (result / y != x)) || (x == Long.MIN_VALUE && y == -1)))
 			// If either x or y is negative return the min value, otherwise return the max value
-            return x < 0 == y < 0 ? Long.MAX_VALUE : Long.MIN_VALUE;
+			return x < 0 == y < 0 ? Long.MAX_VALUE : Long.MIN_VALUE;
 		return result;
 	}
-	
-	@Deprecated
-	@ScheduledForRemoval
-	public static int floorI(double value) {
-		return (int) Math.floor(value + Skript.EPSILON);
-	}
-	
-	@Deprecated
-	@ScheduledForRemoval
-	public static int ceilI(double value) {
-		return (int) Math.ceil(value - Skript.EPSILON);
-	}
-	
-	// Change signature to return int instead of removing.
-	@Deprecated
-	@ScheduledForRemoval
-	public static long floor(float value) {
-		return (long) Math.floor(value + Skript.EPSILON);
-	}
-	
-	@Deprecated
-	@ScheduledForRemoval
-	public static int min(int a, int b, int c) {
-		return Math.min(a, Math.min(b, c));
-	}
-	
-	@Deprecated
-	@ScheduledForRemoval
-	public static int min(int... numbers) {
-		if (numbers.length == 0)
-			return 0;
-		
-		return Arrays.stream(numbers)
-			.min()
-			.getAsInt();
-	}
-	
-	@Deprecated
-	@ScheduledForRemoval
-	public static int max(int a, int b, int c) {
-		return Math.max(a, Math.max(b, c));
-	}
-	
-	@Deprecated
-	@ScheduledForRemoval
-	public static int max(int... numbers) {
-		if (numbers.length == 0)
-			return 0;
-		
-		return Arrays.stream(numbers)
-			.max()
-			.getAsInt();
-	}
-	
-	@Deprecated
-	@ScheduledForRemoval
-	public static double min(double a, double b, double c) {
-		return Math.min(a, Math.min(b, c));
-	}
-	
-	@Deprecated
-	@ScheduledForRemoval
-	public static double min(double... numbers) {
-		if (numbers.length == 0)
-			return Double.NaN;
-		
-		return Arrays.stream(numbers)
-			.min()
-			.getAsDouble();
-	}
-	
-	@Deprecated
-	@ScheduledForRemoval
-	public static double max(double a, double b, double c) {
-		return Math.max(a, Math.max(b, c));
-	}
-	
-	@Deprecated
-	@ScheduledForRemoval
-	public static double max(double... numbers) {
-		if (numbers.length == 0)
-			return Double.NaN;
-		
-		return Arrays.stream(numbers)
-			.max()
-			.getAsDouble();
-	}
 
 }
diff --git a/src/main/java/ch/njol/util/NonNullPair.java b/src/main/java/ch/njol/util/NonNullPair.java
index a02d8b0288c..d11807b2427 100644
--- a/src/main/java/ch/njol/util/NonNullPair.java
+++ b/src/main/java/ch/njol/util/NonNullPair.java
@@ -1,26 +1,9 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.util;
 
 /**
- * @author Peter Güttinger
+ * @deprecated Use a use-case specific record.
  */
+@Deprecated
 public class NonNullPair<T1, T2> extends Pair<T1, T2> {
 	private static final long serialVersionUID = 820250942098905541L;
 	
diff --git a/src/main/java/ch/njol/util/NotifyingReference.java b/src/main/java/ch/njol/util/NotifyingReference.java
index 8c173323f62..bca7b91b509 100644
--- a/src/main/java/ch/njol/util/NotifyingReference.java
+++ b/src/main/java/ch/njol/util/NotifyingReference.java
@@ -1,66 +1,40 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.util;
 
 import org.jetbrains.annotations.Nullable;
 
-/**
- * @author Peter G�ttinger
- *
- */
-public class NotifyingReference<V>
-{
-  @Nullable
-  private volatile V value;
-  private final boolean notifyAll;
-  
-  public NotifyingReference(@Nullable V value, boolean notifyAll)
-  {
-    this.value = value;
-    this.notifyAll = notifyAll;
-  }
-  
-  public NotifyingReference(@Nullable V value)
-  {
-    this.value = value;
-    this.notifyAll = true;
-  }
-  
-  public NotifyingReference()
-  {
-    this.value = null;
-    this.notifyAll = true;
-  }
-  
-  @Nullable
-  public synchronized V get()
-  {
-    return this.value;
-  }
-  
-  public synchronized void set(@Nullable V newValue)
-  {
-    this.value = newValue;
-    if (this.notifyAll) {
-      notifyAll();
-    } else {
-      notify();
-    }
-  }
+public class NotifyingReference<V> {
+
+	@Nullable
+	private volatile V value;
+	private final boolean notifyAll;
+
+	public NotifyingReference(@Nullable V value, boolean notifyAll) {
+		this.value = value;
+		this.notifyAll = notifyAll;
+	}
+
+	public NotifyingReference(@Nullable V value) {
+		this.value = value;
+		this.notifyAll = true;
+	}
+
+	public NotifyingReference() {
+		this.value = null;
+		this.notifyAll = true;
+	}
+
+	@Nullable
+	public synchronized V get() {
+		return this.value;
+	}
+
+	public synchronized void set(@Nullable V newValue) {
+		this.value = newValue;
+		if (this.notifyAll) {
+			notifyAll();
+		} else {
+			notify();
+		}
+	}
+
 }
diff --git a/src/main/java/ch/njol/util/NullableChecker.java b/src/main/java/ch/njol/util/NullableChecker.java
index a8f5d53f8c6..9f34909f6d1 100644
--- a/src/main/java/ch/njol/util/NullableChecker.java
+++ b/src/main/java/ch/njol/util/NullableChecker.java
@@ -1,35 +1,21 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.util;
 
 import org.jetbrains.annotations.Nullable;
 
-public interface NullableChecker<T> extends Checker<T> {
-	
+import java.util.Objects;
+import java.util.function.Predicate;
+
+@SuppressWarnings("removal")
+public interface NullableChecker<T> extends ch.njol.util.Checker<T>, Predicate<T> {
+
+	@Override
+	boolean check(@Nullable T o);
+
 	@Override
-	public boolean check(@Nullable T o);
-	
-	public static final NullableChecker<Object> nullChecker = new NullableChecker<Object>() {
-		@Override
-		public boolean check(final @Nullable Object o) {
-			return o != null;
-		}
-	};
-	
+	default boolean test(@Nullable T t) {
+		return this.check(t);
+	}
+
+	NullableChecker<Object> nullChecker = Objects::nonNull;
+
 }
diff --git a/src/main/java/ch/njol/util/OpenCloseable.java b/src/main/java/ch/njol/util/OpenCloseable.java
index 54d7bf547c1..6ba85bd42a6 100644
--- a/src/main/java/ch/njol/util/OpenCloseable.java
+++ b/src/main/java/ch/njol/util/OpenCloseable.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.util;
 
 import java.util.ArrayDeque;
diff --git a/src/main/java/ch/njol/util/Pair.java b/src/main/java/ch/njol/util/Pair.java
index c17887f9778..01e5453db3f 100644
--- a/src/main/java/ch/njol/util/Pair.java
+++ b/src/main/java/ch/njol/util/Pair.java
@@ -1,23 +1,10 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.util;
 
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+import org.jetbrains.annotations.UnknownNullability;
+
+import java.io.Serial;
 import java.io.Serializable;
 import java.util.Map.Entry;
 import java.util.Objects;
@@ -25,46 +12,44 @@
 import org.jetbrains.annotations.Nullable;
 
 /**
- * @author Peter Güttinger
+ * @deprecated Use a use-case specific record.
  */
+@Deprecated
 public class Pair<T1, T2> implements Entry<T1, T2>, Cloneable, Serializable {
+	@Serial
 	private static final long serialVersionUID = 8296563685697678334L;
-	
-	@Nullable
-	protected T1 first;
-	@Nullable
-	protected T2 second;
+
+	protected @UnknownNullability T1 first;
+	protected @UnknownNullability T2 second;
 	
 	public Pair() {
 		first = null;
 		second = null;
 	}
 	
-	public Pair(final @Nullable T1 first, final @Nullable T2 second) {
+	public Pair(@Nullable T1 first, @Nullable T2 second) {
 		this.first = first;
 		this.second = second;
 	}
 	
-	public Pair(final Entry<T1, T2> e) {
-		this.first = e.getKey();
-		this.second = e.getValue();
+	public Pair(@NotNull Entry<T1, T2> entry) {
+		this.first = entry.getKey();
+		this.second = entry.getValue();
 	}
-	
-	@Nullable
-	public T1 getFirst() {
+
+	public @UnknownNullability T1 getFirst() {
 		return first;
 	}
 	
-	public void setFirst(final @Nullable T1 first) {
+	public void setFirst(@Nullable T1 first) {
 		this.first = first;
 	}
-	
-	@Nullable
-	public T2 getSecond() {
+
+	public @UnknownNullability T2 getSecond() {
 		return second;
 	}
 	
-	public void setSecond(final @Nullable T2 second) {
+	public void setSecond(@Nullable T2 second) {
 		this.second = second;
 	}
 	
@@ -73,23 +58,22 @@ public void setSecond(final @Nullable T2 second) {
 	 */
 	@Override
 	public String toString() {
-		return "" + first + "," + second;
+		return first + "," + second;
 	}
 	
 	/**
 	 * Checks for equality with Entries to match {@link #hashCode()}
 	 */
 	@Override
-	public final boolean equals(final @Nullable Object obj) {
+	public final boolean equals(@Nullable Object obj) {
 		if (obj == this)
 			return true;
-		if (!(obj instanceof Entry))
+		if (!(obj instanceof Entry<?, ?> entry))
 			return false;
-		final Entry<?, ?> other = (Entry<?, ?>) obj;
-		final T1 first = this.first;
-		final T2 second = this.second;
-		return (first == null ? other.getKey() == null : first.equals(other.getKey())) &&
-				(second == null ? other.getValue() == null : second.equals(other.getValue()));
+		T1 first = this.first;
+		T2 second = this.second;
+		return (first == null ? entry.getKey() == null : first.equals(entry.getKey())) &&
+				(second == null ? entry.getValue() == null : second.equals(entry.getValue()));
 	}
 	
 	/**
@@ -101,21 +85,18 @@ public final int hashCode() {
 	}
 	
 	@Override
-	@Nullable
-	public T1 getKey() {
+	public @UnknownNullability T1 getKey() {
 		return first;
 	}
 	
 	@Override
-	@Nullable
-	public T2 getValue() {
+	public @UnknownNullability T2 getValue() {
 		return second;
 	}
 	
 	@Override
-	@Nullable
-	public T2 setValue(final @Nullable T2 value) {
-		final T2 old = second;
+	public @UnknownNullability T2 setValue(@Nullable T2 value) {
+		T2 old = second;
 		second = value;
 		return old;
 	}
diff --git a/src/main/java/ch/njol/util/Predicate.java b/src/main/java/ch/njol/util/Predicate.java
index f16b12968d2..e18627fd134 100644
--- a/src/main/java/ch/njol/util/Predicate.java
+++ b/src/main/java/ch/njol/util/Predicate.java
@@ -1,30 +1,15 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.util;
 
+import org.jetbrains.annotations.ApiStatus;
+
 import javax.annotation.Nullable;
 
 /**
- * @author Peter G�ttinger
- *
+ * @deprecated use {@link java.util.function.Predicate}
  */
-public abstract interface Predicate<T> {
-  public abstract boolean test(@Nullable T paramT);
+@Deprecated(forRemoval = true)
+@FunctionalInterface
+public interface Predicate<T> extends java.util.function.Predicate<T> {
+  boolean test(@Nullable T paramT);
 }
 
diff --git a/src/main/java/ch/njol/util/Setter.java b/src/main/java/ch/njol/util/Setter.java
index 6d03d4d6d14..246c57f1af5 100644
--- a/src/main/java/ch/njol/util/Setter.java
+++ b/src/main/java/ch/njol/util/Setter.java
@@ -1,28 +1,18 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.util;
 
+import java.util.function.Consumer;
+
 /**
- * @author Peter Güttinger
+ * @deprecated use {@link Consumer}
  */
-public interface Setter<T> {
-	
-	public void set(T t);
-	
+@Deprecated(forRemoval = true)
+@FunctionalInterface
+public interface Setter<T> extends Consumer<T> {
+
+	void set(T t);
+
+	@Override
+	default void accept(T t) {
+		this.set(t);
+	}
 }
diff --git a/src/main/java/ch/njol/util/StringUtils.java b/src/main/java/ch/njol/util/StringUtils.java
index aaa03754e14..aa277b454a3 100644
--- a/src/main/java/ch/njol/util/StringUtils.java
+++ b/src/main/java/ch/njol/util/StringUtils.java
@@ -1,43 +1,23 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.util;
 
+import org.jetbrains.annotations.Nullable;
+
 import java.util.Iterator;
 import java.util.Locale;
+import java.util.function.Function;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import org.jetbrains.annotations.Nullable;
-
-/**
- * @author Peter Güttinger
- */
 public abstract class StringUtils {
-	
+
 	public static void checkIndices(final String s, final int start, final int end) {
 		if (start < 0 || end > s.length())
 			throw new StringIndexOutOfBoundsException("invalid start/end indices " + start + "," + end + " for string \"" + s + "\" (length " + s.length() + ")");
 	}
-	
+
 	/**
 	 * Appends the english order suffix to the given number.
-	 * 
+	 *
 	 * @param i the number
 	 * @return 1st, 2nd, 3rd, 4th, etc.
 	 */
@@ -52,37 +32,37 @@ public static String fancyOrderNumber(int i) {
 			return i + "rd";
 		return i + "th";
 	}
-	
+
 	/**
 	 * Performs regex replacing using a callback.
-	 * 
-	 * @param string the String in which should be searched & replaced
-	 * @param regex the Regex to match
+	 *
+	 * @param string   the String in which should be searched & replaced
+	 * @param regex    the Regex to match
 	 * @param callback the callback will be run for every match of the regex in the string, and should return the replacement string for the given match.
-	 *            If the callback returns null for any given match this function will immediately terminate and return null.
+	 *                 If the callback returns null for any given match this function will immediately terminate and return null.
 	 * @return
 	 */
 	@SuppressWarnings("null")
 	@Nullable
-	public static String replaceAll(final CharSequence string, final String regex, final Callback<String, Matcher> callback) {
+	public static String replaceAll(final CharSequence string, final String regex, final Function<Matcher, String> callback) {
 		return replaceAll(string, Pattern.compile(regex), callback);
 	}
-	
+
 	/**
 	 * Performs regex replacing using a callback.
-	 * 
-	 * @param string the String in which should be searched & replaced
-	 * @param regex the Regex to match
+	 *
+	 * @param string   the String in which should be searched & replaced
+	 * @param regex    the Regex to match
 	 * @param callback the callback will be run for every match of the regex in the string, and should return the replacement string for the given match.
-	 *            If the callback returns null for any given match this function will immediately terminate and return null.
+	 *                 If the callback returns null for any given match this function will immediately terminate and return null.
 	 * @return
 	 */
 	@Nullable
-	public static String replaceAll(final CharSequence string, final Pattern regex, final Callback<String, Matcher> callback) {
+	public static String replaceAll(final CharSequence string, final Pattern regex, final Function<Matcher, String> callback) {
 		final Matcher m = regex.matcher(string);
 		final StringBuffer sb = new StringBuffer();
 		while (m.find()) {
-			final String r = callback.run(m);
+			final String r = callback.apply(m);
 			if (r == null)
 				return null;
 			m.appendReplacement(sb, r);
@@ -90,15 +70,15 @@ public static String replaceAll(final CharSequence string, final Pattern regex,
 		m.appendTail(sb);
 		return sb.toString();
 	}
-	
+
 	public static int count(final String s, final char c) {
 		return count(s, c, 0, s.length());
 	}
-	
+
 	public static int count(final String s, final char c, final int start) {
 		return count(s, c, start, s.length());
 	}
-	
+
 	public static int count(final String s, final char c, final int start, final int end) {
 		checkIndices(s, start, end);
 		int r = 0;
@@ -108,7 +88,7 @@ public static int count(final String s, final char c, final int start, final int
 		}
 		return r;
 	}
-	
+
 	public static boolean contains(final String s, final char c, final int start, final int end) {
 		checkIndices(s, start, end);
 		for (int i = start; i < end; i++) {
@@ -117,11 +97,11 @@ public static boolean contains(final String s, final char c, final int start, fi
 		}
 		return false;
 	}
-	
+
 	/**
 	 * Gets a rounded english (##.##) representation of a number
-	 * 
-	 * @param d The number to be turned into a string
+	 *
+	 * @param d        The number to be turned into a string
 	 * @param accuracy Maximum number of digits after the period
 	 * @return
 	 */
@@ -137,7 +117,7 @@ public static String toString(final double d, final int accuracy) {
 			c--;
 		return "" + s.substring(0, c + 1);
 	}
-	
+
 	public static String firstToUpper(final String s) {
 		if (s.isEmpty())
 			return s;
@@ -145,10 +125,10 @@ public static String firstToUpper(final String s) {
 			return s;
 		return Character.toUpperCase(s.charAt(0)) + s.substring(1);
 	}
-	
+
 	/**
 	 * Equal to {@link String#substring(int, int)}, but allows negative indices that are counted from the end of the string.
-	 * 
+	 *
 	 * @param s
 	 * @param start
 	 * @param end
@@ -163,10 +143,10 @@ public static String substring(final String s, int start, int end) {
 			throw new IllegalArgumentException("invalid indices");
 		return "" + s.substring(start, end);
 	}
-	
+
 	/**
 	 * Capitalises the first character of the string and all characters that follow periods, exclamation and question marks.
-	 * 
+	 *
 	 * @param string
 	 * @return
 	 */
@@ -184,7 +164,7 @@ public static String fixCapitalization(final String string) {
 		}
 		return new String(s);
 	}
-	
+
 	private static int indexOf(final char[] s, final int start, final char... cs) {
 		for (int i = start; i < s.length; i++) {
 			for (final char c : cs)
@@ -193,10 +173,10 @@ private static int indexOf(final char[] s, final int start, final char... cs) {
 		}
 		return -1;
 	}
-	
+
 	/**
 	 * Shorthand for <tt>{@link #numberAt(CharSequence, int, boolean) numberAt}(s, index, true)</tt>
-	 * 
+	 *
 	 * @param s
 	 * @param index
 	 * @return
@@ -204,10 +184,10 @@ private static int indexOf(final char[] s, final int start, final char... cs) {
 	public static double numberAfter(final CharSequence s, final int index) {
 		return numberAt(s, index, true);
 	}
-	
+
 	/**
 	 * Shorthand for <tt>{@link #numberAt(CharSequence, int, boolean) numberAt}(s, index, false)</tt>
-	 * 
+	 *
 	 * @param s
 	 * @param index
 	 * @return
@@ -215,15 +195,15 @@ public static double numberAfter(final CharSequence s, final int index) {
 	public static double numberBefore(final CharSequence s, final int index) {
 		return numberAt(s, index, false);
 	}
-	
+
 	/**
 	 * Finds a positive number in the given CharSequence, starting at the given index, and searching in the given direction.
 	 * <p>
 	 * The number has to start exactly at the given index (ignoring whitespace), and will only count if the other end of the number is either at an end of the string or padded by
 	 * whitespace.
-	 * 
-	 * @param s The ChatSequence to search the number in
-	 * @param index The index to start searching at (inclusive)
+	 *
+	 * @param s       The ChatSequence to search the number in
+	 * @param index   The index to start searching at (inclusive)
 	 * @param forward Whether to search forwards or backwards
 	 * @return The number found or -1 if no matching number was found
 	 */
@@ -267,11 +247,11 @@ public static double numberAt(final CharSequence s, final int index, final boole
 			return -1;
 		return Double.parseDouble(s.subSequence(Math.min(d1, d2), Math.max(d1, d2) + 1).toString());
 	}
-	
+
 	public static boolean startsWithIgnoreCase(final String string, final String start) {
 		return startsWithIgnoreCase(string, start, 0);
 	}
-	
+
 	public static boolean startsWithIgnoreCase(final String string, final String start, final int offset) {
 		assert string != null;
 		assert start != null;
@@ -279,7 +259,7 @@ public static boolean startsWithIgnoreCase(final String string, final String sta
 			return false;
 		return string.substring(offset, start.length()).equalsIgnoreCase(start);
 	}
-	
+
 	public static boolean endsWithIgnoreCase(final String string, final String end) {
 		assert string != null;
 		assert end != null;
@@ -287,7 +267,7 @@ public static boolean endsWithIgnoreCase(final String string, final String end)
 			return false;
 		return string.substring(string.length() - end.length()).equalsIgnoreCase(end);
 	}
-	
+
 	public static String multiply(final @Nullable String s, final int amount) {
 		assert amount >= 0 : amount;
 		if (s == null)
@@ -302,7 +282,7 @@ public static String multiply(final @Nullable String s, final int amount) {
 			System.arraycopy(input, 0, multiplied, i * input.length, input.length);
 		return new String(multiplied);
 	}
-	
+
 	public static String multiply(final char c, final int amount) {
 		if (amount == 0)
 			return "";
@@ -311,19 +291,19 @@ public static String multiply(final char c, final int amount) {
 			multiplied[i] = c;
 		return new String(multiplied);
 	}
-	
+
 	public static String join(final @Nullable Object[] strings) {
 		if (strings == null)
 			return "";
 		return join(strings, "", 0, strings.length);
 	}
-	
+
 	public static String join(final @Nullable Object[] strings, final String delimiter) {
 		if (strings == null)
 			return "";
 		return join(strings, delimiter, 0, strings.length);
 	}
-	
+
 	public static String join(final @Nullable Object[] strings, final String delimiter, final int start, final int end) {
 		if (strings == null)
 			return "";
@@ -337,33 +317,52 @@ public static String join(final @Nullable Object[] strings, final String delimit
 		}
 		return "" + b;
 	}
-	
+
 	public static String join(final @Nullable Iterable<?> strings) {
 		if (strings == null)
 			return "";
 		return join(strings.iterator(), "");
 	}
-	
-	public static String join(final @Nullable Iterable<?> strings, final String delimiter) {
+
+	public static String join(@Nullable Iterable<?> strings, String delimiter) {
 		if (strings == null)
 			return "";
 		return join(strings.iterator(), delimiter);
 	}
-	
-	public static String join(final @Nullable Iterator<?> strings, final String delimiter) {
+
+	public static String join(@Nullable Iterator<?> strings, String delimiter) {
+		return join(strings, delimiter, delimiter);
+	}
+
+	/**
+	 * Join elements with delimiter except last one will be joined with lastDelimiter.
+	 *
+	 * @param strings The strings to join
+	 * @param delimiter The delimiter to use between all elements except the last one
+	 * @param lastDelimiter The delimiter to use between the last two elements
+	 * @return The joined string
+	 */
+	public static String join(@Nullable Iterator<?> strings, String delimiter, String lastDelimiter) {
 		if (strings == null || !strings.hasNext())
 			return "";
-		final StringBuilder b = new StringBuilder("" + strings.next());
+		StringBuilder builder = new StringBuilder(String.valueOf(strings.next()));
 		while (strings.hasNext()) {
-			b.append(delimiter);
-			b.append(strings.next());
+			Object next = strings.next();
+			builder.append(!strings.hasNext() ? lastDelimiter : delimiter); // If this is last element
+			builder.append(next);
 		}
-		return "" + b;
+		return builder.toString();
 	}
-	
+
+	public static String join(@Nullable Iterable<?> strings, String delimiter, String lastDelimiter) {
+		if (strings == null)
+			return "";
+		return join(strings.iterator(), delimiter, lastDelimiter);
+	}
+
 	/**
 	 * Scans the string starting at <tt>start</tt> for digits.
-	 * 
+	 *
 	 * @param s
 	 * @param start Index of the first digit
 	 * @return The index <i>after</i> the last digit or <tt>start</tt> if there are no digits at the given index
@@ -374,10 +373,10 @@ public static int findLastDigit(final String s, final int start) {
 			end++;
 		return end;
 	}
-	
+
 	/**
 	 * Searches for whether a String contains any of the characters of another string.
-	 * 
+	 *
 	 * @param s
 	 * @param chars
 	 * @return
@@ -389,23 +388,23 @@ public static boolean containsAny(final String s, final String chars) {
 		}
 		return false;
 	}
-	
+
 	public static boolean equals(final String s1, final String s2, final boolean caseSensitive) {
 		return caseSensitive ? s1.equals(s2) : s1.equalsIgnoreCase(s2);
 	}
-	
+
 	public static boolean contains(final String haystack, final String needle, final boolean caseSensitive) {
 		if (caseSensitive)
 			return haystack.contains(needle);
 		return haystack.toLowerCase().contains(needle.toLowerCase());
 	}
-	
+
 	public static String replace(final String haystack, final String needle, final String replacement, final boolean caseSensitive) {
 		if (caseSensitive)
 			return "" + haystack.replace(needle, replacement);
 		return "" + haystack.replaceAll("(?ui)" + Pattern.quote(needle), Matcher.quoteReplacement(replacement));
 	}
-	
+
 	public static String replaceFirst(final String haystack, final String needle, final String replacement, final boolean caseSensitive) {
 		if (caseSensitive)
 			return "" + haystack.replaceFirst(needle, replacement);
@@ -417,11 +416,11 @@ public static byte[] hexStringToByteArray(String s) {
 		byte[] data = new byte[len / 2];
 		for (int i = 0; i < len; i += 2) {
 			data[i / 2] = (byte) ((Character.digit(s.charAt(i), 16) << 4)
-					+ Character.digit(s.charAt(i+1), 16));
+				+ Character.digit(s.charAt(i + 1), 16));
 		}
 		return data;
 	}
-	
+
 	public static int indexOfOutsideGroup(String string, char find, char groupOpen, char groupClose, int i) {
 		int group = 0;
 		for (; i < string.length(); i++) {
@@ -438,5 +437,5 @@ public static int indexOfOutsideGroup(String string, char find, char groupOpen,
 		}
 		return -1;
 	}
-	
+
 }
diff --git a/src/main/java/ch/njol/util/SynchronizedReference.java b/src/main/java/ch/njol/util/SynchronizedReference.java
index dfd7fbb9f5e..b21484e86c1 100644
--- a/src/main/java/ch/njol/util/SynchronizedReference.java
+++ b/src/main/java/ch/njol/util/SynchronizedReference.java
@@ -1,51 +1,28 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.util;
 
 import org.jetbrains.annotations.Nullable;
 
-/**
- * @author Peter G�ttinger
- *
- */
-public class SynchronizedReference<V>
-{
-  @Nullable
-  private volatile V value;
-  
-  public SynchronizedReference(@Nullable V initialValue)
-  {
-    this.value = initialValue;
-  }
-  
-  public SynchronizedReference() {}
-  
-  @Nullable
-  public final V get()
-  {
-    assert (Thread.holdsLock(this));
-    return this.value;
-  }
-  
-  public final void set(@Nullable V newValue)
-  {
-    assert (Thread.holdsLock(this));
-    this.value = newValue;
-  }
-}
\ No newline at end of file
+public class SynchronizedReference<V> {
+
+	@Nullable
+	private volatile V value;
+
+	public SynchronizedReference(@Nullable V initialValue) {
+		this.value = initialValue;
+	}
+
+	public SynchronizedReference() {
+	}
+
+	@Nullable
+	public final V get() {
+		assert (Thread.holdsLock(this));
+		return this.value;
+	}
+
+	public final void set(@Nullable V newValue) {
+		assert (Thread.holdsLock(this));
+		this.value = newValue;
+	}
+
+}
diff --git a/src/main/java/ch/njol/util/Validate.java b/src/main/java/ch/njol/util/Validate.java
index e47c320fb06..e87478dd94e 100644
--- a/src/main/java/ch/njol/util/Validate.java
+++ b/src/main/java/ch/njol/util/Validate.java
@@ -1,82 +1,67 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.util;
 
-import java.util.Collection;
-
 import org.jetbrains.annotations.Nullable;
 
+import java.util.Collection;
+
 /**
- * @author Peter Güttinger
+ * use {@link com.google.common.base.Preconditions}
  */
-public abstract class Validate {
-	
-	public static void notNull(final Object... objects) {
+@Deprecated(forRemoval = true)
+public final class Validate {
+
+	private Validate() {}
+
+	public static void notNull(Object... objects) {
 		for (int i = 0; i < objects.length; i++) {
 			if (objects[i] == null)
 				throw new IllegalArgumentException("the " + StringUtils.fancyOrderNumber(i + 1) + " parameter must not be null");
 		}
 	}
-	
-	public static void notNull(final @Nullable Object object, final String name) {
+
+	public static void notNull(@Nullable Object object, String name) {
 		if (object == null)
 			throw new IllegalArgumentException(name + " must not be null");
 	}
-	
-	public static void isTrue(final boolean b, final String error) {
-		if (!b)
+
+	public static void isTrue(boolean value, String error) {
+		if (!value)
 			throw new IllegalArgumentException(error);
 	}
-	
-	public static void isFalse(final boolean b, final String error) {
-		if (b)
+
+	public static void isFalse(boolean value, String error) {
+		if (value)
 			throw new IllegalArgumentException(error);
 	}
-	
-	public static void notNullOrEmpty(final @Nullable String s, final String name) {
-		if (s == null || s.isEmpty())
+
+	public static void notNullOrEmpty(@Nullable String value, final String name) {
+		if (value == null || value.isEmpty())
 			throw new IllegalArgumentException(name + " must neither be null nor empty");
 	}
-	
-	public static void notNullOrEmpty(final @Nullable Object[] array, final String name) {
+
+	public static void notNullOrEmpty(Object @Nullable [] array, String name) {
 		if (array == null || array.length == 0)
 			throw new IllegalArgumentException(name + " must neither be null nor empty");
 	}
-	
-	public static void notNullOrEmpty(final @Nullable Collection<?> collection, final String name) {
+
+	public static void notNullOrEmpty(@Nullable Collection<?> collection, String name) {
 		if (collection == null || collection.isEmpty())
 			throw new IllegalArgumentException(name + " must neither be null nor empty");
 	}
-	
-	public static void notEmpty(final @Nullable String s, final String name) {
-		if (s != null && s.isEmpty())
+
+	public static void notEmpty(@Nullable String value, String name) {
+		if (value != null && value.isEmpty())
 			throw new IllegalArgumentException(name + " must not be empty");
 	}
-	
-	public static void notEmpty(final Object[] array, final String name) {
+
+	public static void notEmpty(Object[] array, String name) {
 		if (array.length == 0)
 			throw new IllegalArgumentException(name + " must not be empty");
 	}
-	
-	public static void notEmpty(final int[] nums, final String name) {
-		if (nums.length == 0)
+
+	public static void notEmpty(int[] array, String name) {
+		if (array.length == 0)
 			throw new IllegalArgumentException(name + " must not be empty");
 	}
-	
+
 }
diff --git a/src/main/java/ch/njol/util/VectorMath.java b/src/main/java/ch/njol/util/VectorMath.java
index 5db05ecc41b..7ca9636e1cb 100644
--- a/src/main/java/ch/njol/util/VectorMath.java
+++ b/src/main/java/ch/njol/util/VectorMath.java
@@ -1,85 +1,39 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.util;
 
+import ch.njol.skript.expressions.ExprVectorCylindrical;
+import ch.njol.skript.expressions.ExprVectorFromYawAndPitch;
+import ch.njol.skript.expressions.ExprVectorSpherical;
+import ch.njol.skript.expressions.ExprYawPitch;
 import org.bukkit.util.Vector;
 
-/**
- * @author bi0qaw
- */
-public class VectorMath {
+@Deprecated(forRemoval = true)
+public final class VectorMath {
 
 	public static final double PI = Math.PI;
 	public static final double HALF_PI = PI / 2;
-	public static final double DEG_TO_RAD = PI / 180;
-	public static final double RAD_TO_DEG =  180 / PI;
+	public static final double DEG_TO_RAD = Math.PI / 180;
+	public static final double RAD_TO_DEG = 180 / Math.PI;
+
+	private VectorMath() {}
 
 	public static Vector fromSphericalCoordinates(double radius, double theta, double phi) {
-		double r = Math.abs(radius);
-		double t = theta * DEG_TO_RAD;
-		double p = phi * DEG_TO_RAD;
-		double sinp = Math.sin(p);
-		double x = r * sinp * Math.cos(t);
-		double y = r * Math.cos(p);
-		double z = r * sinp * Math.sin(t);
-		return new Vector(x, y, z);
+		return ExprVectorSpherical.fromSphericalCoordinates(radius, theta, phi);
 	}
 
 	public static Vector fromCylindricalCoordinates(double radius, double phi, double height) {
-		double r = Math.abs(radius);
-		double p = phi * DEG_TO_RAD;
-		double x = r * Math.cos(p);
-		double z = r * Math.sin(p);
-		return new Vector(x, height, z);
-
+		return ExprVectorCylindrical.fromCylindricalCoordinates(radius, phi, height);
 	}
 
 	public static Vector fromYawAndPitch(float yaw, float pitch) {
-		double y = Math.sin(pitch * DEG_TO_RAD);
-		double div = Math.cos(pitch * DEG_TO_RAD);
-		double x = Math.cos(yaw * DEG_TO_RAD);
-		double z = Math.sin(yaw * DEG_TO_RAD);
-		x *= div;
-		z *= div;
-		return new Vector(x,y,z);
+		return ExprYawPitch.fromYawAndPitch(yaw, pitch);
 	}
 
 	public static float getYaw(Vector vector) {
-		if (((Double) vector.getX()).equals((double) 0) && ((Double) vector.getZ()).equals((double) 0)){
-			return 0;
-		}
-		return (float) (Math.atan2(vector.getZ(), vector.getX()) * RAD_TO_DEG);
+		return ExprYawPitch.getYaw(vector);
 	}
 
 	public static float getPitch(Vector vector) {
-		double xy = Math.sqrt(vector.getX() * vector.getX() + vector.getZ() * vector.getZ());
-		return (float) (Math.atan(vector.getY() / xy) * RAD_TO_DEG);
-	}
-
-	public static Vector setYaw(Vector vector, float yaw) {
-		vector = fromYawAndPitch(yaw, getPitch(vector));
-		return vector;
-	}
-
-	public static Vector setPitch(Vector vector, float pitch) {
-		vector = fromYawAndPitch(getYaw(vector), pitch);
-		return vector;
+		return ExprYawPitch.getPitch(vector);
 	}
 
 	public static Vector rotX(Vector vector, double angle) {
@@ -132,70 +86,28 @@ public static Vector rot(Vector vector, Vector axis, double angle) {
 		return vector;
 	}
 
-	public static float notchYaw(float yaw){
-		float y = yaw - 90;
-		if (y < -180){
-			y += 360;
-		}
-		return y;
-	}
-
-	public static float notchPitch(float pitch){
-		return -pitch;
-	}
-
-	public static float fromNotchYaw(float notchYaw){
-		float y = notchYaw + 90;
-		if (y > 180){
-			y -= 360;
-		}
-		return y;
-	}
-
-	public static float fromNotchPitch(float notchPitch){
-		return -notchPitch;
+	public static float skriptYaw(float yaw) {
+		return ExprYawPitch.skriptYaw(yaw);
 	}
 
-	public static float skriptYaw(float yaw){
-		float y = yaw - 90;
-		if (y < 0){
-			y += 360;
-		}
-		return y;
+	public static float skriptPitch(float pitch) {
+		return ExprYawPitch.skriptPitch(pitch);
 	}
 
-	public static float skriptPitch(float pitch){
-		return -pitch;
+	public static float fromSkriptYaw(float yaw) {
+		return ExprYawPitch.fromSkriptYaw(yaw);
 	}
 
-	public static float fromSkriptYaw(float yaw){
-		float y = yaw + 90;
-		if (y > 360){
-			y -= 360;
-		}
-		return y;
-	}
-
-	public static float fromSkriptPitch(float pitch){
-		return -pitch;
+	public static float fromSkriptPitch(float pitch) {
+		return ExprYawPitch.fromSkriptPitch(pitch);
 	}
 
 	public static float wrapAngleDeg(float angle) {
-		angle %= 360f;
-		if (angle <= -180) {
-			return angle + 360;
-		} else if (angle > 180) {
-			return angle - 360;
-		} else {
-			return angle;
-		}
+		return ExprVectorFromYawAndPitch.wrapAngleDeg(angle);
 	}
 
-	/**
-	 * Copies vector components of {@code vector2} into {@code vector1}.
-	 */
 	public static void copyVector(Vector vector1, Vector vector2) {
-		vector1.setX(vector2.getX()).setY(vector2.getY()).setZ(vector2.getZ());
+		vector1.copy(vector2);
 	}
 
 	/**
diff --git a/src/main/java/ch/njol/util/coll/BidiHashMap.java b/src/main/java/ch/njol/util/coll/BidiHashMap.java
index 47003277110..3beb65301db 100644
--- a/src/main/java/ch/njol/util/coll/BidiHashMap.java
+++ b/src/main/java/ch/njol/util/coll/BidiHashMap.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.util.coll;
 
 import java.util.Collections;
@@ -26,64 +8,66 @@
 import org.jetbrains.annotations.Nullable;
 
 /**
- * @author Peter Güttinger
+ * @deprecated Use {@link com.google.common.collect.BiMap}
  */
+@Deprecated(forRemoval = true)
+@SuppressWarnings("removal")
 public class BidiHashMap<T1, T2> extends HashMap<T1, T2> implements BidiMap<T1, T2> {
-	
+
 	private static final long serialVersionUID = -9011678701069901061L;
-	
+
 	private final BidiHashMap<T2, T1> other;
-	
+
 	private BidiHashMap(final BidiHashMap<T2, T1> other) {
 		this.other = other;
 	}
-	
+
 	public BidiHashMap() {
 		other = new BidiHashMap<>(this);
 	}
-	
+
 	public BidiHashMap(final Map<? extends T1, ? extends T2> values) {
 		other = new BidiHashMap<>(this);
 		putAll(values);
 	}
-	
+
 	@Override
 	public BidiHashMap<T2, T1> getReverseView() {
 		return other;
 	}
-	
+
 	@SuppressWarnings("null")
 	@Override
 	@Nullable
 	public T1 getKey(final T2 value) {
 		return other.get(value);
 	}
-	
+
 	@SuppressWarnings("null")
 	@Override
 	@Nullable
 	public T2 getValue(final @Nullable T1 key) {
 		return get(key);
 	}
-	
+
 	@Nullable
 	private T2 putDirect(final @Nullable T1 key, final @Nullable T2 value) {
 		return super.put(key, value);
 	}
-	
+
 	@Override
 	@Nullable
 	public T2 put(final @Nullable T1 key, final @Nullable T2 value) {
 		if (key == null || value == null)
 			throw new NullPointerException("Can't store null in a BidiHashMap");
-		
+
 		removeDirect(key);
 		other.removeDirect(value);
 		final T2 oldValue = putDirect(key, value);
 		other.putDirect(value, key);
 		return oldValue;
 	}
-	
+
 	@SuppressWarnings("null")
 	@Override
 	public void putAll(final Map<? extends T1, ? extends T2> m) {
@@ -91,12 +75,12 @@ public void putAll(final Map<? extends T1, ? extends T2> m) {
 			put(e.getKey(), e.getValue());
 		}
 	}
-	
+
 	@Nullable
 	private T2 removeDirect(final @Nullable Object key) {
 		return super.remove(key);
 	}
-	
+
 	@Override
 	@Nullable
 	public T2 remove(final @Nullable Object key) {
@@ -105,50 +89,50 @@ public T2 remove(final @Nullable Object key) {
 			other.removeDirect(oldValue);
 		return oldValue;
 	}
-	
+
 	private void clearDirect() {
 		super.clear();
 	}
-	
+
 	@Override
 	public void clear() {
 		this.clearDirect();
 		other.clearDirect();
 	}
-	
+
 	@Override
 	public boolean containsValue(final @Nullable Object value) {
 		return other.containsKey(value);
 	}
-	
+
 	// TODO check how changes to the sets affect the map
-	
+
 	@SuppressWarnings("null")
 	@Override
 	public Set<Entry<T1, T2>> entrySet() {
 		return Collections.unmodifiableSet(super.entrySet());
 	}
-	
+
 	@SuppressWarnings("null")
 	@Override
 	public Set<T1> keySet() {
 		return Collections.unmodifiableSet(super.keySet());
 	}
-	
+
 	@Override
 	public Set<T2> values() {
 		return valueSet();
 	}
-	
+
 	@SuppressWarnings("null")
 	@Override
 	public Set<T2> valueSet() {
 		return Collections.unmodifiableSet(other.keySet());
 	}
-	
+
 	@Override
 	public BidiHashMap<T1, T2> clone() {
 		return new BidiHashMap<T1, T2>(this);
 	}
-	
+
 }
diff --git a/src/main/java/ch/njol/util/coll/BidiMap.java b/src/main/java/ch/njol/util/coll/BidiMap.java
index b4afe6632d4..2ace5935495 100644
--- a/src/main/java/ch/njol/util/coll/BidiMap.java
+++ b/src/main/java/ch/njol/util/coll/BidiMap.java
@@ -1,29 +1,12 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.util.coll;
 
 import java.util.Map;
 import java.util.Set;
 
 /**
- * @author Peter Güttinger
+ * @deprecated Use {@link com.google.common.collect.BiMap}
  */
+@Deprecated(forRemoval = true)
 public interface BidiMap<T1, T2> extends Map<T1, T2> {
 	
 	public BidiMap<T2, T1> getReverseView();
diff --git a/src/main/java/ch/njol/util/coll/CollectionUtils.java b/src/main/java/ch/njol/util/coll/CollectionUtils.java
index 8b48a505662..4440bebd020 100644
--- a/src/main/java/ch/njol/util/coll/CollectionUtils.java
+++ b/src/main/java/ch/njol/util/coll/CollectionUtils.java
@@ -1,38 +1,13 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.util.coll;
 
 import ch.njol.util.Pair;
-import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
+import org.jetbrains.annotations.UnknownNullability;
 
 import java.lang.reflect.Array;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.Map.Entry;
-import java.util.Objects;
-import java.util.Random;
-import java.util.Set;
+import java.util.function.Predicate;
 
 /**
  * Utils for collections and arrays. All methods will not print any errors for <tt>null</tt> collections/arrays, but will return false/-1/etc.
@@ -102,7 +77,30 @@ public static <T> boolean containsAll(final @Nullable T[] array, final @Nullable
 		}
 		return true;
 	}
-	
+
+	/**
+	 * Checks the elements of an array against a given predicate.
+	 *
+	 * @param array the array to check, can be null
+	 * @param predicate the predicate to test the elements against
+	 * @param and if true, all elements must satisfy the predicate; if false, any element satisfying the predicate is enough
+	 * @param <T> the type of elements in the array
+	 * @return true if the condition is met based on the value of the 'and' parameter, false otherwise
+	 */
+	public static <T> boolean check(T @Nullable [] array, Predicate<T> predicate, boolean and) {
+		if (array == null)
+			return false;
+		for (T value : array) {
+			boolean result = predicate.test(value);
+			// exit early if we find a FALSE and we're ANDing, or a TRUE and we're ORing
+			if (and && !result)
+				return false;
+			if (!and && result)
+				return true;
+		}
+		return and;
+	}
+
 	public static int indexOf(final @Nullable int[] array, final int num) {
 		if (array == null)
 			return -1;
diff --git a/src/main/java/ch/njol/util/coll/CyclicList.java b/src/main/java/ch/njol/util/coll/CyclicList.java
index a57bffed71e..8725def4edf 100644
--- a/src/main/java/ch/njol/util/coll/CyclicList.java
+++ b/src/main/java/ch/njol/util/coll/CyclicList.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.util.coll;
 
 import java.lang.reflect.Array;
@@ -29,8 +11,9 @@
 /**
  * A list with fixed size that overrides the oldest elements when new elements are added and no more space is available.
  * 
- * @author Peter Güttinger
+ * @deprecated unused
  */
+@Deprecated(forRemoval = true)
 public final class CyclicList<E> extends AbstractList<E> {
 	
 	private final Object[] items;
diff --git a/src/main/java/ch/njol/util/coll/ReversedListView.java b/src/main/java/ch/njol/util/coll/ReversedListView.java
index 632dc55924e..b833ab74403 100644
--- a/src/main/java/ch/njol/util/coll/ReversedListView.java
+++ b/src/main/java/ch/njol/util/coll/ReversedListView.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.util.coll;
 
 import java.lang.reflect.Array;
@@ -29,8 +11,9 @@
 import ch.njol.util.coll.iterator.ReversedListIterator;
 
 /**
- * @author Peter Güttinger
+ * @deprecated unused
  */
+@Deprecated(forRemoval = true)
 public class ReversedListView<T> implements List<T> {
 	
 	private final List<T> list;
diff --git a/src/main/java/ch/njol/util/coll/iterator/ArrayIterator.java b/src/main/java/ch/njol/util/coll/iterator/ArrayIterator.java
index 82bfd65b01b..d04ca2a6033 100644
--- a/src/main/java/ch/njol/util/coll/iterator/ArrayIterator.java
+++ b/src/main/java/ch/njol/util/coll/iterator/ArrayIterator.java
@@ -1,34 +1,16 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.util.coll.iterator;
 
-import java.util.Iterator;
-import java.util.NoSuchElementException;
-
+import com.google.common.collect.PeekingIterator;
 import org.jetbrains.annotations.Nullable;
 
+import java.util.NoSuchElementException;
+
 /**
  * A simple iterator to iterate over an array.
  * 
  * @author Peter Güttinger
  */
-public class ArrayIterator<T> implements Iterator<T> {
+public class ArrayIterator<T> implements PeekingIterator<T> {
 	
 	@Nullable
 	private final T[] array;
@@ -51,7 +33,15 @@ public boolean hasNext() {
 			return false;
 		return index < array.length;
 	}
-	
+
+	@Override
+	public T peek() {
+		int peekIndex = index + 1;
+		if (array == null || peekIndex >= array.length)
+			return null;
+		return array[peekIndex];
+	}
+
 	@Override
 	@Nullable
 	public T next() {
diff --git a/src/main/java/ch/njol/util/coll/iterator/CheckedIterator.java b/src/main/java/ch/njol/util/coll/iterator/CheckedIterator.java
index f17ac3ae36c..fc2d1c3ef71 100644
--- a/src/main/java/ch/njol/util/coll/iterator/CheckedIterator.java
+++ b/src/main/java/ch/njol/util/coll/iterator/CheckedIterator.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.util.coll.iterator;
 
 import java.util.Iterator;
diff --git a/src/main/java/ch/njol/util/coll/iterator/CombinedIterator.java b/src/main/java/ch/njol/util/coll/iterator/CombinedIterator.java
index aee12ce0f97..1a2cfdabc6f 100644
--- a/src/main/java/ch/njol/util/coll/iterator/CombinedIterator.java
+++ b/src/main/java/ch/njol/util/coll/iterator/CombinedIterator.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.util.coll.iterator;
 
 import java.util.Iterator;
@@ -28,8 +10,9 @@
  * <p>
  * Elements are removable from this iterator if the source iterables support element removal, unless removal is blocked on creation.
  * 
- * @author Peter Güttinger
+ * @deprecated use {@link com.google.common.collect.Iterators#concat(Iterator[])}
  */
+@Deprecated
 public class CombinedIterator<T> implements Iterator<T> {
 	
 	private final Iterator<? extends Iterable<T>> iterators;
diff --git a/src/main/java/ch/njol/util/coll/iterator/ConsumingIterator.java b/src/main/java/ch/njol/util/coll/iterator/ConsumingIterator.java
index 5ad15280ade..e221a614602 100644
--- a/src/main/java/ch/njol/util/coll/iterator/ConsumingIterator.java
+++ b/src/main/java/ch/njol/util/coll/iterator/ConsumingIterator.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.util.coll.iterator;
 
 import java.util.Iterator;
diff --git a/src/main/java/ch/njol/util/coll/iterator/EmptyIterable.java b/src/main/java/ch/njol/util/coll/iterator/EmptyIterable.java
index 0b400a13414..05f0a016ad0 100644
--- a/src/main/java/ch/njol/util/coll/iterator/EmptyIterable.java
+++ b/src/main/java/ch/njol/util/coll/iterator/EmptyIterable.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.util.coll.iterator;
 
 import java.util.Iterator;
diff --git a/src/main/java/ch/njol/util/coll/iterator/EmptyIterator.java b/src/main/java/ch/njol/util/coll/iterator/EmptyIterator.java
index a8ac451cb12..4a75b57d008 100644
--- a/src/main/java/ch/njol/util/coll/iterator/EmptyIterator.java
+++ b/src/main/java/ch/njol/util/coll/iterator/EmptyIterator.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.util.coll.iterator;
 
 import java.util.Iterator;
diff --git a/src/main/java/ch/njol/util/coll/iterator/EnumerationIterable.java b/src/main/java/ch/njol/util/coll/iterator/EnumerationIterable.java
index 16b7d077434..9ffd90b7fe2 100644
--- a/src/main/java/ch/njol/util/coll/iterator/EnumerationIterable.java
+++ b/src/main/java/ch/njol/util/coll/iterator/EnumerationIterable.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.util.coll.iterator;
 
 import java.util.Enumeration;
diff --git a/src/main/java/ch/njol/util/coll/iterator/ImprovedIterator.java b/src/main/java/ch/njol/util/coll/iterator/ImprovedIterator.java
index 3d9a4540447..0a6ef00e2bf 100644
--- a/src/main/java/ch/njol/util/coll/iterator/ImprovedIterator.java
+++ b/src/main/java/ch/njol/util/coll/iterator/ImprovedIterator.java
@@ -1,27 +1,13 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.util.coll.iterator;
 
 import java.util.Iterator;
 
 import org.jetbrains.annotations.Nullable;
 
+/**
+ * @deprecated use {@link Iterator}
+ */
+@Deprecated
 public class ImprovedIterator<T> implements Iterator<T> {
 	
 	private final Iterator<T> iter;
diff --git a/src/main/java/ch/njol/util/coll/iterator/IteratorIterable.java b/src/main/java/ch/njol/util/coll/iterator/IteratorIterable.java
index cbec8b3907b..ab349f8bb92 100644
--- a/src/main/java/ch/njol/util/coll/iterator/IteratorIterable.java
+++ b/src/main/java/ch/njol/util/coll/iterator/IteratorIterable.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.util.coll.iterator;
 
 import java.util.Iterator;
diff --git a/src/main/java/ch/njol/util/coll/iterator/ListRangeIterator.java b/src/main/java/ch/njol/util/coll/iterator/ListRangeIterator.java
index e7626d62761..8f554d2dfc7 100644
--- a/src/main/java/ch/njol/util/coll/iterator/ListRangeIterator.java
+++ b/src/main/java/ch/njol/util/coll/iterator/ListRangeIterator.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.util.coll.iterator;
 
 import java.util.Iterator;
diff --git a/src/main/java/ch/njol/util/coll/iterator/NonNullIterator.java b/src/main/java/ch/njol/util/coll/iterator/NonNullIterator.java
index b60e8c3c19f..eca9cb4105a 100644
--- a/src/main/java/ch/njol/util/coll/iterator/NonNullIterator.java
+++ b/src/main/java/ch/njol/util/coll/iterator/NonNullIterator.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.util.coll.iterator;
 
 import java.util.Iterator;
diff --git a/src/main/java/ch/njol/util/coll/iterator/ReversedListIterator.java b/src/main/java/ch/njol/util/coll/iterator/ReversedListIterator.java
index 1db1efa24b4..37f82d722c8 100644
--- a/src/main/java/ch/njol/util/coll/iterator/ReversedListIterator.java
+++ b/src/main/java/ch/njol/util/coll/iterator/ReversedListIterator.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.util.coll.iterator;
 
 import java.util.List;
@@ -24,8 +6,9 @@
 import org.jetbrains.annotations.Nullable;
 
 /**
- * @author Peter Güttinger
+ * @deprecated unused
  */
+@Deprecated
 public class ReversedListIterator<T> implements ListIterator<T> {
 	
 	private final ListIterator<T> iter;
diff --git a/src/main/java/ch/njol/util/coll/iterator/SingleItemIterable.java b/src/main/java/ch/njol/util/coll/iterator/SingleItemIterable.java
index d5246e1f131..2103374155d 100644
--- a/src/main/java/ch/njol/util/coll/iterator/SingleItemIterable.java
+++ b/src/main/java/ch/njol/util/coll/iterator/SingleItemIterable.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.util.coll.iterator;
 
 import java.util.Iterator;
diff --git a/src/main/java/ch/njol/util/coll/iterator/SingleItemIterator.java b/src/main/java/ch/njol/util/coll/iterator/SingleItemIterator.java
index 6038ed62312..805853ef6da 100644
--- a/src/main/java/ch/njol/util/coll/iterator/SingleItemIterator.java
+++ b/src/main/java/ch/njol/util/coll/iterator/SingleItemIterator.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.util.coll.iterator;
 
 import java.util.Iterator;
diff --git a/src/main/java/ch/njol/util/coll/iterator/StoppableIterator.java b/src/main/java/ch/njol/util/coll/iterator/StoppableIterator.java
index 5db87f67bad..cf0688572d6 100644
--- a/src/main/java/ch/njol/util/coll/iterator/StoppableIterator.java
+++ b/src/main/java/ch/njol/util/coll/iterator/StoppableIterator.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.util.coll.iterator;
 
 import java.util.Iterator;
diff --git a/src/main/java/ch/njol/yggdrasil/ClassResolver.java b/src/main/java/ch/njol/yggdrasil/ClassResolver.java
index ec4ecfe8621..bb6c4328800 100644
--- a/src/main/java/ch/njol/yggdrasil/ClassResolver.java
+++ b/src/main/java/ch/njol/yggdrasil/ClassResolver.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.yggdrasil;
 
 import org.jetbrains.annotations.Nullable;
diff --git a/src/main/java/ch/njol/yggdrasil/DefaultYggdrasilInputStream.java b/src/main/java/ch/njol/yggdrasil/DefaultYggdrasilInputStream.java
index 87142f293a1..6926cb3ce8e 100644
--- a/src/main/java/ch/njol/yggdrasil/DefaultYggdrasilInputStream.java
+++ b/src/main/java/ch/njol/yggdrasil/DefaultYggdrasilInputStream.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.yggdrasil;
 
 import ch.njol.util.coll.CollectionUtils;
diff --git a/src/main/java/ch/njol/yggdrasil/DefaultYggdrasilOutputStream.java b/src/main/java/ch/njol/yggdrasil/DefaultYggdrasilOutputStream.java
index f77b8c2405c..557762433a9 100644
--- a/src/main/java/ch/njol/yggdrasil/DefaultYggdrasilOutputStream.java
+++ b/src/main/java/ch/njol/yggdrasil/DefaultYggdrasilOutputStream.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.yggdrasil;
 
 import java.io.IOException;
diff --git a/src/main/java/ch/njol/yggdrasil/FieldHandler.java b/src/main/java/ch/njol/yggdrasil/FieldHandler.java
index ea894c68088..9cd34b5f2f7 100644
--- a/src/main/java/ch/njol/yggdrasil/FieldHandler.java
+++ b/src/main/java/ch/njol/yggdrasil/FieldHandler.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.yggdrasil;
 
 import ch.njol.yggdrasil.Fields.FieldContext;
diff --git a/src/main/java/ch/njol/yggdrasil/Fields.java b/src/main/java/ch/njol/yggdrasil/Fields.java
index 10f2c8f1c83..be64fccd971 100644
--- a/src/main/java/ch/njol/yggdrasil/Fields.java
+++ b/src/main/java/ch/njol/yggdrasil/Fields.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.yggdrasil;
 
 import ch.njol.yggdrasil.Fields.FieldContext;
diff --git a/src/main/java/ch/njol/yggdrasil/JRESerializer.java b/src/main/java/ch/njol/yggdrasil/JRESerializer.java
index 9585681eea6..2f6ae9eefe2 100644
--- a/src/main/java/ch/njol/yggdrasil/JRESerializer.java
+++ b/src/main/java/ch/njol/yggdrasil/JRESerializer.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.yggdrasil;
 
 import com.google.common.collect.ImmutableList;
diff --git a/src/main/java/ch/njol/yggdrasil/PseudoEnum.java b/src/main/java/ch/njol/yggdrasil/PseudoEnum.java
index e782b393aaf..aeac0c3ed30 100644
--- a/src/main/java/ch/njol/yggdrasil/PseudoEnum.java
+++ b/src/main/java/ch/njol/yggdrasil/PseudoEnum.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.yggdrasil;
 
 import org.jetbrains.annotations.Nullable;
diff --git a/src/main/java/ch/njol/yggdrasil/SimpleClassResolver.java b/src/main/java/ch/njol/yggdrasil/SimpleClassResolver.java
index 19123306a34..77eeff99653 100644
--- a/src/main/java/ch/njol/yggdrasil/SimpleClassResolver.java
+++ b/src/main/java/ch/njol/yggdrasil/SimpleClassResolver.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.yggdrasil;
 
 import com.google.common.collect.BiMap;
diff --git a/src/main/java/ch/njol/yggdrasil/Tag.java b/src/main/java/ch/njol/yggdrasil/Tag.java
index 8854466b74f..b55c99c2618 100644
--- a/src/main/java/ch/njol/yggdrasil/Tag.java
+++ b/src/main/java/ch/njol/yggdrasil/Tag.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.yggdrasil;
 
 import org.jetbrains.annotations.Nullable;
diff --git a/src/main/java/ch/njol/yggdrasil/Yggdrasil.java b/src/main/java/ch/njol/yggdrasil/Yggdrasil.java
index d73d27e1341..01db13c4396 100644
--- a/src/main/java/ch/njol/yggdrasil/Yggdrasil.java
+++ b/src/main/java/ch/njol/yggdrasil/Yggdrasil.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.yggdrasil;
 
 import ch.njol.yggdrasil.Fields.FieldContext;
diff --git a/src/main/java/ch/njol/yggdrasil/YggdrasilException.java b/src/main/java/ch/njol/yggdrasil/YggdrasilException.java
index 8ffb86dc39a..8263fa4a28a 100644
--- a/src/main/java/ch/njol/yggdrasil/YggdrasilException.java
+++ b/src/main/java/ch/njol/yggdrasil/YggdrasilException.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.yggdrasil;
 
 /**
diff --git a/src/main/java/ch/njol/yggdrasil/YggdrasilID.java b/src/main/java/ch/njol/yggdrasil/YggdrasilID.java
index 47b529a174a..233805dc5d7 100644
--- a/src/main/java/ch/njol/yggdrasil/YggdrasilID.java
+++ b/src/main/java/ch/njol/yggdrasil/YggdrasilID.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.yggdrasil;
 
 import java.lang.annotation.Documented;
diff --git a/src/main/java/ch/njol/yggdrasil/YggdrasilInputStream.java b/src/main/java/ch/njol/yggdrasil/YggdrasilInputStream.java
index bb1329f541f..2aa9f97ac8a 100644
--- a/src/main/java/ch/njol/yggdrasil/YggdrasilInputStream.java
+++ b/src/main/java/ch/njol/yggdrasil/YggdrasilInputStream.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.yggdrasil;
 
 import ch.njol.yggdrasil.YggdrasilSerializable.YggdrasilExtendedSerializable;
diff --git a/src/main/java/ch/njol/yggdrasil/YggdrasilOutputStream.java b/src/main/java/ch/njol/yggdrasil/YggdrasilOutputStream.java
index e9f5557e4f9..539ee9bc649 100644
--- a/src/main/java/ch/njol/yggdrasil/YggdrasilOutputStream.java
+++ b/src/main/java/ch/njol/yggdrasil/YggdrasilOutputStream.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.yggdrasil;
 
 import ch.njol.yggdrasil.Fields.FieldContext;
diff --git a/src/main/java/ch/njol/yggdrasil/YggdrasilSerializable.java b/src/main/java/ch/njol/yggdrasil/YggdrasilSerializable.java
index 2d1d511a5da..59933cce1ad 100644
--- a/src/main/java/ch/njol/yggdrasil/YggdrasilSerializable.java
+++ b/src/main/java/ch/njol/yggdrasil/YggdrasilSerializable.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.yggdrasil;
 
 import java.io.NotSerializableException;
diff --git a/src/main/java/ch/njol/yggdrasil/YggdrasilSerializer.java b/src/main/java/ch/njol/yggdrasil/YggdrasilSerializer.java
index f48d187447e..08a90ff67f4 100644
--- a/src/main/java/ch/njol/yggdrasil/YggdrasilSerializer.java
+++ b/src/main/java/ch/njol/yggdrasil/YggdrasilSerializer.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.yggdrasil;
 
 import org.jetbrains.annotations.Nullable;
diff --git a/src/main/java/ch/njol/yggdrasil/util/JREFieldHandler.java b/src/main/java/ch/njol/yggdrasil/util/JREFieldHandler.java
deleted file mode 100644
index 6bff027da85..00000000000
--- a/src/main/java/ch/njol/yggdrasil/util/JREFieldHandler.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
-package ch.njol.yggdrasil.util;
-
-import ch.njol.yggdrasil.FieldHandler;
-import ch.njol.yggdrasil.Fields.FieldContext;
-import ch.njol.yggdrasil.YggdrasilException;
-
-import java.io.StreamCorruptedException;
-import java.lang.reflect.Array;
-import java.lang.reflect.Field;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Map;
-
-/**
- * Handles common JRE-related incompatible field types.
- * This handler is not added by default and is merely a utility.
- */
-@Deprecated
-public class JREFieldHandler implements FieldHandler {
-	
-	@Override
-	public boolean excessiveField(Object object, FieldContext field) {
-		return false;
-	}
-	
-	@Override
-	public boolean missingField(Object object, Field field) {
-		return false;
-	}
-	
-	/**
-	 * Converts collection types and non-primitive arrays
-	 */
-	@SuppressWarnings({"rawtypes", "unchecked"})
-	@Override
-	public boolean incompatibleField(Object object, Field field, FieldContext context) throws StreamCorruptedException {
-		Object value = context.getObject();
-		if (value instanceof Object[])
-			value = Collections.singletonList(value);
-		if (value instanceof Collection) {
-			Collection collection = (Collection) value;
-			try {
-				if (Collection.class.isAssignableFrom(field.getType())) {
-					Collection c = (Collection) field.get(object);
-					if (c != null) {
-						c.clear();
-						c.addAll(collection);
-						return true;
-					}
-				} else if (Object[].class.isAssignableFrom(field.getType())) {
-					Object[] array = (Object[]) field.get(object);
-					if (array != null) {
-						if (array.length < collection.size())
-							return false;
-						Class<?> ct = array.getClass().getComponentType();
-						for (Object iterated : collection) {
-							if (!ct.isInstance(iterated))
-								return false;
-						}
-					} else {
-						array = (Object[]) Array.newInstance(field.getType().getComponentType(), collection.size());
-						field.set(object, array);
-					}
-					int length = array.length;
-					int i = 0;
-					for (Object iterated : collection)
-						array[i++] = iterated;
-					while (i < length)
-						array[i++] = null;
-				}
-			} catch (
-				IllegalArgumentException | NullPointerException | IllegalStateException |
-				ClassCastException | UnsupportedOperationException | IllegalAccessException e
-			) {
-				throw new YggdrasilException(e);
-			}
-		} else if (value instanceof Map) {
-			if (!Map.class.isAssignableFrom(field.getType()))
-				return false;
-			try {
-				Map m = (Map) field.get(object);
-				if (m != null) {
-					m.clear();
-					m.putAll((Map) value);
-					return true;
-				}
-			} catch (
-				IllegalArgumentException | IllegalAccessException | UnsupportedOperationException |
-				ClassCastException | NullPointerException e
-			) {
-				throw new YggdrasilException(e);
-			}
-		}
-		
-		return false;
-	}
-	
-}
diff --git a/src/main/java/ch/njol/yggdrasil/util/package-info.java b/src/main/java/ch/njol/yggdrasil/util/package-info.java
deleted file mode 100644
index b031f9cbe4a..00000000000
--- a/src/main/java/ch/njol/yggdrasil/util/package-info.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
-/**
- * @author Peter Güttinger
- */
-package ch.njol.yggdrasil.util;
-
-
diff --git a/src/main/java/org/skriptlang/skript/Skript.java b/src/main/java/org/skriptlang/skript/Skript.java
new file mode 100644
index 00000000000..25604cf5cbf
--- /dev/null
+++ b/src/main/java/org/skriptlang/skript/Skript.java
@@ -0,0 +1,56 @@
+package org.skriptlang.skript;
+
+import org.jetbrains.annotations.ApiStatus;
+import org.jetbrains.annotations.Contract;
+import org.jetbrains.annotations.Unmodifiable;
+import org.skriptlang.skript.addon.SkriptAddon;
+
+import java.util.Collection;
+
+/**
+ * The main class for everything related to Skript.
+ */
+@ApiStatus.Experimental
+public interface Skript extends SkriptAddon {
+
+	/**
+	 * Constructs a default implementation of a Skript.
+	 * It makes use of the default implementations of required components.
+	 * @param source The main class of the application creating this Skript.
+	 *  Typically, this can be the class invoking this method.
+	 * @param name The name for the Skript to use.
+	 * @return A Skript.
+	 */
+	@Contract("_, _ -> new")
+	static Skript of(Class<?> source, String name) {
+		return new SkriptImpl(source, name);
+	}
+
+	/**
+	 * Registers the provided addon with this Skript and loads the provided modules.
+	 * @param source The main class of the application registering this addon.
+	 *  Typically, this can be the class invoking this method.
+	 * @param name The name of the addon to register.
+	 */
+	@Contract("_, _ -> new")
+	SkriptAddon registerAddon(Class<?> source, String name);
+
+	/**
+	 * @return An unmodifiable snapshot of addons currently registered with this Skript.
+	 */
+	@Unmodifiable Collection<SkriptAddon> addons();
+
+	/**
+	 * Constructs an unmodifiable view of this Skript.
+	 * That is, the returned Skript will be unable to register new addons
+	 *  and the individual addons from {@link #addons()} will be unmodifiable.
+	 * Additionally, it will return unmodifiable views of its inherited {@link SkriptAddon} components.
+	 * @return An unmodifiable view of this Skript.
+	 */
+	@Override
+	@Contract("-> new")
+	default Skript unmodifiableView() {
+		return new SkriptImpl.UnmodifiableSkript(this, SkriptAddon.super.unmodifiableView());
+	}
+
+}
diff --git a/src/main/java/org/skriptlang/skript/SkriptImpl.java b/src/main/java/org/skriptlang/skript/SkriptImpl.java
new file mode 100644
index 00000000000..6c98e26a52c
--- /dev/null
+++ b/src/main/java/org/skriptlang/skript/SkriptImpl.java
@@ -0,0 +1,263 @@
+package org.skriptlang.skript;
+
+import ch.njol.skript.SkriptAPIException;
+import com.google.common.collect.ImmutableSet;
+import org.jetbrains.annotations.Nullable;
+import org.jetbrains.annotations.Unmodifiable;
+import org.skriptlang.skript.addon.AddonModule;
+import org.skriptlang.skript.addon.SkriptAddon;
+import org.skriptlang.skript.localization.Localizer;
+import org.skriptlang.skript.registration.SyntaxRegistry;
+import org.skriptlang.skript.util.Registry;
+
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.function.Supplier;
+
+final class SkriptImpl implements Skript {
+
+	/**
+	 * The addon instance backing this Skript.
+	 */
+	private final SkriptAddon addon;
+
+	SkriptImpl(Class<?> source, String name) {
+		addon = new SkriptAddonImpl(this, source, name, Localizer.of(this));
+		storeRegistry(SyntaxRegistry.class, SyntaxRegistry.empty());
+	}
+
+	/*
+	 * Registry Management
+	 */
+
+	private final Map<Class<?>, Registry<?>> registries = new ConcurrentHashMap<>();
+
+	@Override
+	public <R extends Registry<?>> void storeRegistry(Class<R> registryClass, R registry) {
+		registries.put(registryClass, registry);
+	}
+
+	@Override
+	public void removeRegistry(Class<? extends Registry<?>> registryClass) {
+		registries.remove(registryClass);
+	}
+
+	@Override
+	public boolean hasRegistry(Class<? extends Registry<?>> registryClass) {
+		return registries.containsKey(registryClass);
+	}
+
+	@Override
+	public <R extends Registry<?>> R registry(Class<R> registryClass) {
+		//noinspection unchecked
+		R registry = (R) registries.get(registryClass);
+		if (registry == null)
+			throw new NullPointerException("Registry not present for " + registryClass);
+		return registry;
+	}
+
+	@Override
+	public <R extends Registry<?>> R registry(Class<R> registryClass, Supplier<R> putIfAbsent) {
+		//noinspection unchecked
+		return (R) registries.computeIfAbsent(registryClass, key -> putIfAbsent.get());
+	}
+
+	/*
+	 * SkriptAddon Management
+	 */
+
+	private final Map<String, SkriptAddon> addons = new HashMap<>();
+
+	@Override
+	public SkriptAddon registerAddon(Class<?> source, String name) {
+		// make sure an addon is not already registered with this name
+		SkriptAddon existing = addons.get(name);
+		if (existing != null) {
+			throw new SkriptAPIException(
+				"An addon (provided by '" + existing.source().getName() + "') with the name '" + name + "' is already registered"
+			);
+		}
+
+		SkriptAddon addon = new SkriptAddonImpl(this, source, name, null);
+		addons.put(name, addon);
+		return addon;
+	}
+
+	@Override
+	public @Unmodifiable Collection<SkriptAddon> addons() {
+		return ImmutableSet.copyOf(addons.values());
+	}
+
+	/*
+	 * SkriptAddon Implementation
+	 */
+
+	@Override
+	public Class<?> source() {
+		return addon.source();
+	}
+
+	@Override
+	public String name() {
+		return addon.name();
+	}
+
+	@Override
+	public SyntaxRegistry syntaxRegistry() {
+		return registry(SyntaxRegistry.class);
+	}
+
+	@Override
+	public Localizer localizer() {
+		return addon.localizer();
+	}
+
+	@Override
+	public void loadModules(AddonModule... modules) {
+		addon.loadModules(modules);
+	}
+
+	private static final class SkriptAddonImpl implements SkriptAddon {
+
+		private final Skript skript;
+		private final Class<?> source;
+		private final String name;
+		private final Localizer localizer;
+
+		SkriptAddonImpl(Skript skript, Class<?> source, String name, @Nullable Localizer localizer) {
+			this.skript = skript;
+			this.source = source;
+			this.name = name;
+			this.localizer = localizer == null ? Localizer.of(this) : localizer;
+		}
+
+		@Override
+		public Class<?> source() {
+			return source;
+		}
+
+		@Override
+		public String name() {
+			return name;
+		}
+
+		@Override
+		public <R extends Registry<?>> void storeRegistry(Class<R> registryClass, R registry) {
+			skript.storeRegistry(registryClass, registry);
+		}
+
+		@Override
+		public void removeRegistry(Class<? extends Registry<?>> registryClass) {
+			skript.removeRegistry(registryClass);
+		}
+
+		@Override
+		public boolean hasRegistry(Class<? extends Registry<?>> registryClass) {
+			return skript.hasRegistry(registryClass);
+		}
+
+		@Override
+		public <R extends Registry<?>> R registry(Class<R> registryClass) {
+			return skript.registry(registryClass);
+		}
+
+		@Override
+		public <R extends Registry<?>> R registry(Class<R> registryClass, Supplier<R> putIfAbsent) {
+			return skript.registry(registryClass, putIfAbsent);
+		}
+
+		@Override
+		public SyntaxRegistry syntaxRegistry() {
+			return skript.syntaxRegistry();
+		}
+
+		@Override
+		public Localizer localizer() {
+			return localizer;
+		}
+
+	}
+
+	/*
+	 * ViewProvider Implementation
+	 */
+
+	static final class UnmodifiableSkript implements Skript {
+
+		private final Skript skript;
+		private final SkriptAddon unmodifiableAddon;
+
+		UnmodifiableSkript(Skript skript, SkriptAddon unmodifiableAddon) {
+			this.skript = skript;
+			this.unmodifiableAddon = unmodifiableAddon;
+		}
+
+		@Override
+		public SkriptAddon registerAddon(Class<?> source, String name) {
+			throw new UnsupportedOperationException("Cannot register addons using an unmodifiable Skript");
+		}
+
+		@Override
+		public @Unmodifiable Collection<SkriptAddon> addons() {
+			ImmutableSet.Builder<SkriptAddon> addons = ImmutableSet.builder();
+			skript.addons().stream()
+					.map(SkriptAddon::unmodifiableView)
+					.forEach(addons::add);
+			return addons.build();
+		}
+
+		@Override
+		public Class<?> source() {
+			return skript.source();
+		}
+
+		@Override
+		public String name() {
+			return skript.name();
+		}
+
+		@Override
+		public <R extends Registry<?>> void storeRegistry(Class<R> registryClass, R registry) {
+			unmodifiableAddon.storeRegistry(registryClass, registry);
+		}
+
+		@Override
+		public void removeRegistry(Class<? extends Registry<?>> registryClass) {
+			unmodifiableAddon.removeRegistry(registryClass);
+		}
+
+		@Override
+		public boolean hasRegistry(Class<? extends Registry<?>> registryClass) {
+			return unmodifiableAddon.hasRegistry(registryClass);
+		}
+
+		@Override
+		public <R extends Registry<?>> R registry(Class<R> registryClass) {
+			return unmodifiableAddon.registry(registryClass);
+		}
+
+		@Override
+		public <R extends Registry<?>> R registry(Class<R> registryClass, Supplier<R> putIfAbsent) {
+			return unmodifiableAddon.registry(registryClass, putIfAbsent);
+		}
+
+		@Override
+		public SyntaxRegistry syntaxRegistry() {
+			return unmodifiableAddon.syntaxRegistry();
+		}
+
+		@Override
+		public Localizer localizer() {
+			return unmodifiableAddon.localizer();
+		}
+
+		@Override
+		public void loadModules(AddonModule... modules) {
+			unmodifiableAddon.loadModules(modules);
+		}
+
+	}
+
+}
diff --git a/src/main/java/org/skriptlang/skript/addon/AddonModule.java b/src/main/java/org/skriptlang/skript/addon/AddonModule.java
new file mode 100644
index 00000000000..243d51b730b
--- /dev/null
+++ b/src/main/java/org/skriptlang/skript/addon/AddonModule.java
@@ -0,0 +1,36 @@
+package org.skriptlang.skript.addon;
+
+import org.jetbrains.annotations.ApiStatus;
+import org.skriptlang.skript.Skript;
+
+/**
+ * A module is a component of a {@link SkriptAddon} used for registering syntax and other {@link Skript} components.
+ * <br>
+ * Modules have two loading phases: {@link #init(SkriptAddon)} followed by {@link #load(SkriptAddon)}.
+ * <br>
+ * The <code>init</code> phase should be used for loading components that are needed first or that may be used by other modules,
+ *  such as class infos (think numeric types that are used everywhere).
+ * <br>
+ * The <code>load</code> phase should be used for loading components more specific to the module, such as syntax.
+ * @see SkriptAddon#loadModules(AddonModule...)
+ */
+@FunctionalInterface
+@ApiStatus.Experimental
+public interface AddonModule {
+
+	/**
+	 * Used for loading the components of this module that are needed first or by other modules (e.g. class infos).
+	 * <b>This method will always be called before {@link #load(SkriptAddon)}</b>.
+	 * @param addon The addon this module belongs to.
+	 * @see #load(SkriptAddon)
+	 */
+	default void init(SkriptAddon addon) { }
+
+	/**
+	 * Used for loading the components (e.g. syntax) of this module.
+	 * @param addon The addon this module belongs to.
+	 * @see #init(SkriptAddon)
+	 */
+	void load(SkriptAddon addon);
+
+}
diff --git a/src/main/java/org/skriptlang/skript/addon/SkriptAddon.java b/src/main/java/org/skriptlang/skript/addon/SkriptAddon.java
new file mode 100644
index 00000000000..13e47180ff3
--- /dev/null
+++ b/src/main/java/org/skriptlang/skript/addon/SkriptAddon.java
@@ -0,0 +1,112 @@
+package org.skriptlang.skript.addon;
+
+import org.jetbrains.annotations.ApiStatus;
+import org.jetbrains.annotations.Contract;
+import org.skriptlang.skript.Skript;
+import org.skriptlang.skript.localization.Localizer;
+import org.skriptlang.skript.registration.SyntaxRegistry;
+import org.skriptlang.skript.util.Registry;
+import org.skriptlang.skript.util.ViewProvider;
+
+import java.util.function.Supplier;
+
+/**
+ * A Skript addon is an extension to Skript that expands its features.
+ * Typically, an addon instance may be obtained through {@link Skript#registerAddon(Class, String)}.
+ */
+@ApiStatus.Experimental
+public interface SkriptAddon extends ViewProvider<SkriptAddon> {
+
+	/**
+	 * @return A class from the application that registered this addon.
+	 * Typically, this is the main class or the specific class in which registration occurred.
+	 */
+	Class<?> source();
+
+	/**
+	 * @return The name of this addon.
+	 */
+	String name();
+
+	/**
+	 * Stores a registry under <code>registryClass</code>.
+	 * If a registry is already stored under <code>registryClass</code>, it will be replaced.
+	 * @param registryClass The class (key) to store <code>registry</code> under.
+	 * @param registry The registry to store.
+	 * @param <R> The type of registry.
+	 */
+	<R extends Registry<?>> void storeRegistry(Class<R> registryClass, R registry);
+
+	/**
+	 * Removes the registry stored under <code>registryClass</code>.
+	 * It is safe to call this method even if a registry is not stored under <code>registryClass</code>.
+	 * @param registryClass The class (key) that the registry to remove is under.
+	 */
+	void removeRegistry(Class<? extends Registry<?>> registryClass);
+
+	/**
+	 * Determines whether a registry has been stored under <code>registryClass</code>.
+	 * @param registryClass The class (key) to search for a registry under.
+	 * @return Whether a registry is stored under <code>registryClass</code>.
+	 */
+	boolean hasRegistry(Class<? extends Registry<?>> registryClass);
+
+	/**
+	 * Obtains the registry stored under <code>registryClass</code>.
+	 * This method will never return null, meaning it may be necessary to call {@link #hasRegistry(Class)}
+	 *  if you are not sure whether the registry you need exists.
+	 * @param registryClass The class (key) that the registry is stored under.
+	 * @return The registry stored under <code>registryClass</code>.
+	 * @param <R> The type of registry.
+	 */
+	<R extends Registry<?>> R registry(Class<R> registryClass);
+
+	/**
+	 * Searches for a registry stored under <code>registryClass</code>.
+	 * If the search fails, <code>putIfAbsent</code> will be used to get, store, and return a registry of the requested type.
+	 * @param registryClass The class (key) to search for a registry under.
+	 * @param putIfAbsent A supplier to use for creating an instance of the desired type of registry if one
+	 *  is not already stored under <code>registryClass</code>.
+	 * @return The registry stored under <code>registryClass</code> or created from <code>putIfAbsent</code>.
+	 * @param <R> The type of registry.
+	 */
+	<R extends Registry<?>> R registry(Class<R> registryClass, Supplier<R> putIfAbsent);
+
+	/**
+	 * @return A syntax registry for this addon's syntax.
+	 */
+	SyntaxRegistry syntaxRegistry();
+
+	/**
+	 * @return A localizer for this addon's localizations.
+	 */
+	Localizer localizer();
+
+	/**
+	 * A helper method for loading addon modules.
+	 * Modules will be loaded as described by {@link AddonModule}.
+	 * @param modules The modules to load.
+	 */
+	default void loadModules(AddonModule... modules) {
+		for (AddonModule module : modules) {
+			module.init(this);
+		}
+		for (AddonModule module : modules) {
+			module.load(this);
+		}
+	}
+
+	/**
+	 * Constructs an unmodifiable view of this addon.
+	 * That is, the returned addon will return unmodifiable views of its {@link #syntaxRegistry()} and {@link #localizer()}.
+	 * @return An unmodifiable view of this addon.
+	 * @see SyntaxRegistry#unmodifiableView()
+	 * @see Localizer#unmodifiableView()
+	 */
+	@Override
+	@Contract("-> new")
+	default SkriptAddon unmodifiableView() {
+		return new SkriptAddonImpl.UnmodifiableAddon(this);
+	}
+
+}
diff --git a/src/main/java/org/skriptlang/skript/addon/SkriptAddonImpl.java b/src/main/java/org/skriptlang/skript/addon/SkriptAddonImpl.java
new file mode 100644
index 00000000000..33af5c65b74
--- /dev/null
+++ b/src/main/java/org/skriptlang/skript/addon/SkriptAddonImpl.java
@@ -0,0 +1,79 @@
+package org.skriptlang.skript.addon;
+
+import org.skriptlang.skript.localization.Localizer;
+import org.skriptlang.skript.registration.SyntaxRegistry;
+import org.skriptlang.skript.util.Registry;
+import org.skriptlang.skript.util.ViewProvider;
+
+import java.util.function.Supplier;
+
+class SkriptAddonImpl {
+
+	static class UnmodifiableAddon implements SkriptAddon {
+
+		private final SkriptAddon addon;
+		private final Localizer unmodifiableLocalizer;
+
+		UnmodifiableAddon(SkriptAddon addon) {
+			this.addon = addon;
+			this.unmodifiableLocalizer = addon.localizer().unmodifiableView();
+		}
+
+		@Override
+		public Class<?> source() {
+			return addon.source();
+		}
+
+		@Override
+		public String name() {
+			return addon.name();
+		}
+
+		@Override
+		public <R extends Registry<?>> void storeRegistry(Class<R> registryClass, R registry) {
+			throw new UnsupportedOperationException("Cannot store registries on an unmodifiable addon");
+		}
+
+		@Override
+		public void removeRegistry(Class<? extends Registry<?>> registryClass) {
+			throw new UnsupportedOperationException("Cannot remove registries from an unmodifiable addon");
+		}
+
+		@Override
+		public boolean hasRegistry(Class<? extends Registry<?>> registryClass) {
+			return addon.hasRegistry(registryClass);
+		}
+
+		@Override
+		public <R extends Registry<?>> R registry(Class<R> registryClass) {
+			R registry = addon.registry(registryClass);
+			if (registry instanceof ViewProvider) {
+				//noinspection unchecked
+				registry = ((ViewProvider<R>) registry).unmodifiableView();
+			}
+			return registry;
+		}
+
+		@Override
+		public <R extends Registry<?>> R registry(Class<R> registryClass, Supplier<R> putIfAbsent) {
+			throw new UnsupportedOperationException("Cannot store registries on an unmodifiable addon");
+		}
+
+		@Override
+		public SyntaxRegistry syntaxRegistry() {
+			return addon.syntaxRegistry().unmodifiableView();
+		}
+
+		@Override
+		public Localizer localizer() {
+			return unmodifiableLocalizer;
+		}
+
+		@Override
+		public void loadModules(AddonModule... modules) {
+			throw new UnsupportedOperationException("Cannot load modules using an unmodifiable addon");
+		}
+
+	}
+
+}
diff --git a/src/main/java/org/skriptlang/skript/bukkit/breeding/BreedingModule.java b/src/main/java/org/skriptlang/skript/bukkit/breeding/BreedingModule.java
new file mode 100644
index 00000000000..94e80e0dad3
--- /dev/null
+++ b/src/main/java/org/skriptlang/skript/bukkit/breeding/BreedingModule.java
@@ -0,0 +1,33 @@
+package org.skriptlang.skript.bukkit.breeding;
+
+import ch.njol.skript.Skript;
+import ch.njol.skript.lang.util.SimpleEvent;
+import ch.njol.skript.registrations.EventValues;
+import org.bukkit.entity.HumanEntity;
+import org.bukkit.entity.LivingEntity;
+import org.bukkit.event.entity.EntityBreedEvent;
+import org.bukkit.event.entity.EntityEnterLoveModeEvent;
+import org.bukkit.inventory.ItemStack;
+
+import java.io.IOException;
+
+public class BreedingModule {
+
+	public static void load() throws IOException {
+		Skript.getAddonInstance().loadClasses("org.skriptlang.skript.bukkit.breeding", "elements");
+
+		Skript.registerEvent("Love Mode Enter", SimpleEvent.class, EntityEnterLoveModeEvent.class,
+				"[entity] enter[s] love mode", "[entity] love mode [enter]")
+			.description("Called whenever an entity enters a state of being in love.")
+			.examples(
+				"on love mode enter:",
+					"\tcancel event # No one is allowed love here"
+			)
+			.since("2.10");
+
+		EventValues.registerEventValue(EntityBreedEvent.class, ItemStack.class, EntityBreedEvent::getBredWith);
+		EventValues.registerEventValue(EntityEnterLoveModeEvent.class, LivingEntity.class, EntityEnterLoveModeEvent::getEntity);
+		EventValues.registerEventValue(EntityEnterLoveModeEvent.class, HumanEntity.class, EntityEnterLoveModeEvent::getHumanEntity);
+	}
+
+}
diff --git a/src/main/java/org/skriptlang/skript/bukkit/breeding/elements/CondCanAge.java b/src/main/java/org/skriptlang/skript/bukkit/breeding/elements/CondCanAge.java
new file mode 100644
index 00000000000..88590d52d9c
--- /dev/null
+++ b/src/main/java/org/skriptlang/skript/bukkit/breeding/elements/CondCanAge.java
@@ -0,0 +1,35 @@
+package org.skriptlang.skript.bukkit.breeding.elements;
+
+import ch.njol.skript.conditions.base.PropertyCondition;
+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 org.bukkit.entity.Breedable;
+import org.bukkit.entity.LivingEntity;
+
+@Name("Can Age")
+@Description("Checks whether or not an entity will be able to age/grow up.")
+@Examples({
+	"on breeding:",
+		"\tentity can't age",
+		"\tbroadcast \"An immortal has been born!\" to player"
+})
+@Since("2.10")
+public class CondCanAge extends PropertyCondition<LivingEntity> {
+
+	static {
+		register(CondCanAge.class, PropertyType.CAN, "(age|grow (up|old[er]))", "livingentities");
+	}
+
+	@Override
+	public boolean check(LivingEntity entity) {
+		return entity instanceof Breedable breedable && !breedable.getAgeLock();
+	}
+
+	@Override
+	protected String getPropertyName() {
+		return "age";
+	}
+
+}
diff --git a/src/main/java/org/skriptlang/skript/bukkit/breeding/elements/CondCanBreed.java b/src/main/java/org/skriptlang/skript/bukkit/breeding/elements/CondCanBreed.java
new file mode 100644
index 00000000000..6cf33cc16ba
--- /dev/null
+++ b/src/main/java/org/skriptlang/skript/bukkit/breeding/elements/CondCanBreed.java
@@ -0,0 +1,36 @@
+package org.skriptlang.skript.bukkit.breeding.elements;
+
+import ch.njol.skript.Skript;
+import ch.njol.skript.conditions.base.PropertyCondition;
+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 org.bukkit.entity.Breedable;
+import org.bukkit.entity.LivingEntity;
+
+@Name("Can Breed")
+@Description("Checks whether or not a living entity can be bred.")
+@Examples({
+	"on right click on living entity:",
+		"\tevent-entity can't breed",
+		"\tsend \"Turns out %event-entity% is not breedable. Must be a Skript user!\" to player"
+})
+@Since("2.10")
+public class CondCanBreed extends PropertyCondition<LivingEntity> {
+
+	static {
+		register(CondCanBreed.class, PropertyType.CAN, "(breed|be bred)", "livingentities");
+	}
+
+	@Override
+	public boolean check(LivingEntity entity) {
+		return entity instanceof Breedable breedable && breedable.canBreed();
+	}
+
+	@Override
+	protected String getPropertyName() {
+		return "breed";
+	}
+
+}
diff --git a/src/main/java/org/skriptlang/skript/bukkit/breeding/elements/CondIsAdult.java b/src/main/java/org/skriptlang/skript/bukkit/breeding/elements/CondIsAdult.java
new file mode 100644
index 00000000000..d6c2c5d29bb
--- /dev/null
+++ b/src/main/java/org/skriptlang/skript/bukkit/breeding/elements/CondIsAdult.java
@@ -0,0 +1,35 @@
+package org.skriptlang.skript.bukkit.breeding.elements;
+
+import ch.njol.skript.conditions.base.PropertyCondition;
+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 org.bukkit.entity.Ageable;
+import org.bukkit.entity.LivingEntity;
+
+@Name("Is Adult")
+@Description("Checks whether or not a living entity is an adult.")
+@Examples({
+	"on drink:",
+		"\tevent-entity is not an adult",
+		"\tkill event-entity"
+})
+@Since("2.10")
+public class CondIsAdult extends PropertyCondition<LivingEntity> {
+
+	static {
+		register(CondIsAdult.class, "[an] adult", "livingentities");
+	}
+
+	@Override
+	public boolean check(LivingEntity entity) {
+		return entity instanceof Ageable ageable && ageable.isAdult();
+	}
+
+	@Override
+	protected String getPropertyName() {
+		return "an adult";
+	}
+
+}
diff --git a/src/main/java/org/skriptlang/skript/bukkit/breeding/elements/CondIsBaby.java b/src/main/java/org/skriptlang/skript/bukkit/breeding/elements/CondIsBaby.java
new file mode 100644
index 00000000000..a8d333617a9
--- /dev/null
+++ b/src/main/java/org/skriptlang/skript/bukkit/breeding/elements/CondIsBaby.java
@@ -0,0 +1,36 @@
+package org.skriptlang.skript.bukkit.breeding.elements;
+
+import ch.njol.skript.conditions.base.PropertyCondition;
+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 org.bukkit.entity.Ageable;
+import org.bukkit.entity.LivingEntity;
+
+@Name("Is Baby")
+@Description("Checks whether or not a living entity is a baby.")
+@Examples({
+	"on drink:",
+		"\tevent-entity is a baby",
+		"\tkill event-entity"
+})
+@Since("2.10")
+public class CondIsBaby extends PropertyCondition<LivingEntity> {
+
+	static {
+		register(CondIsBaby.class, "a (child|baby)", "livingentities");
+	}
+
+	@Override
+	public boolean check(LivingEntity entity) {
+		return entity instanceof Ageable ageable && !ageable.isAdult();
+
+	}
+
+	@Override
+	protected String getPropertyName() {
+		return "a baby";
+	}
+
+}
diff --git a/src/main/java/org/skriptlang/skript/bukkit/breeding/elements/CondIsInLove.java b/src/main/java/org/skriptlang/skript/bukkit/breeding/elements/CondIsInLove.java
new file mode 100644
index 00000000000..de7bcdf097b
--- /dev/null
+++ b/src/main/java/org/skriptlang/skript/bukkit/breeding/elements/CondIsInLove.java
@@ -0,0 +1,38 @@
+package org.skriptlang.skript.bukkit.breeding.elements;
+
+import ch.njol.skript.conditions.base.PropertyCondition;
+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 org.bukkit.entity.Animals;
+import org.bukkit.entity.LivingEntity;
+
+@Name("Is In Love")
+@Description("Checks whether or not a living entity is in love.")
+@Examples({
+	"on spawn of living entity:",
+		"\tif entity is in love:",
+			"broadcast \"That was quick!\""
+})
+@Since("2.10")
+public class CondIsInLove extends PropertyCondition<LivingEntity> {
+
+	static {
+		register(CondIsInLove.class, "in lov(e|ing) [state|mode]", "livingentities");
+	}
+
+	@Override
+	public boolean check(LivingEntity entity) {
+		if (entity instanceof Animals animals)
+			return animals.isLoveMode();
+
+		return false;
+	}
+
+	@Override
+	protected String getPropertyName() {
+		return "in love";
+	}
+
+}
diff --git a/src/main/java/org/skriptlang/skript/bukkit/breeding/elements/EffAllowAging.java b/src/main/java/org/skriptlang/skript/bukkit/breeding/elements/EffAllowAging.java
new file mode 100644
index 00000000000..9bc53ff84ac
--- /dev/null
+++ b/src/main/java/org/skriptlang/skript/bukkit/breeding/elements/EffAllowAging.java
@@ -0,0 +1,63 @@
+package org.skriptlang.skript.bukkit.breeding.elements;
+
+import ch.njol.skript.Skript;
+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.Effect;
+import ch.njol.skript.lang.Expression;
+import ch.njol.skript.lang.SkriptParser.ParseResult;
+import ch.njol.util.Kleenean;
+import org.bukkit.entity.Breedable;
+import org.bukkit.entity.LivingEntity;
+import org.bukkit.event.Event;
+import org.jetbrains.annotations.Nullable;
+
+@Name("Allow Aging")
+@Description("Sets whether or not living entities will be able to age.")
+@Examples({
+	"on spawn of animal:",
+		"\tallow aging of entity"
+})
+@Since("2.10")
+public class EffAllowAging extends Effect {
+
+	static {
+		Skript.registerEffect(EffAllowAging.class,
+			"lock age of %livingentities%",
+			"prevent aging of %livingentities%",
+			"prevent %livingentities% from aging",
+			"unlock age of %livingentities%",
+			"allow aging of %livingentities%",
+			"allow %livingentities% to age");
+	}
+
+	private boolean unlock;
+	private Expression<LivingEntity> entities;
+
+	@Override
+	public boolean init(Expression<?>[] expressions, int matchedPattern,
+						Kleenean isDelayed, ParseResult parseResult) {
+		//noinspection unchecked
+		entities = (Expression<LivingEntity>) expressions[0];
+		unlock = matchedPattern > 2;
+		return true;
+	}
+
+	@Override
+	protected void execute(Event event) {
+		for (LivingEntity livingEntity : entities.getArray(event)) {
+			if (!(livingEntity instanceof Breedable breedable))
+				continue;
+
+			breedable.setAgeLock(!unlock);
+		}
+	}
+
+	@Override
+	public String toString(@Nullable Event event, boolean debug) {
+		return (unlock ? "allow" : "prevent") + " aging of " + entities.toString(event,debug);
+	}
+
+}
diff --git a/src/main/java/org/skriptlang/skript/bukkit/breeding/elements/EffBreedable.java b/src/main/java/org/skriptlang/skript/bukkit/breeding/elements/EffBreedable.java
new file mode 100644
index 00000000000..12d7422b23b
--- /dev/null
+++ b/src/main/java/org/skriptlang/skript/bukkit/breeding/elements/EffBreedable.java
@@ -0,0 +1,61 @@
+package org.skriptlang.skript.bukkit.breeding.elements;
+
+import ch.njol.skript.Skript;
+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.Effect;
+import ch.njol.skript.lang.Expression;
+import ch.njol.skript.lang.SkriptParser.ParseResult;
+import ch.njol.util.Kleenean;
+import org.bukkit.entity.Breedable;
+import org.bukkit.entity.LivingEntity;
+import org.bukkit.event.Event;
+import org.jetbrains.annotations.Nullable;
+
+@Name("Make Breedable")
+@Description("Sets whether or not entities will be able to breed. Only works on animals.")
+@Examples({
+	"on spawn of animal:",
+		"\tmake entity unbreedable"
+})
+@Since("2.10")
+public class EffBreedable extends Effect {
+
+	static {
+		Skript.registerEffect(EffBreedable.class,
+			"make %livingentities% breedable",
+			"unsterilize %livingentities%",
+			"make %livingentities% (not |non(-| )|un)breedable",
+			"sterilize %livingentities%");
+	}
+
+	private boolean sterilize;
+	private Expression<LivingEntity> entities;
+
+	@Override
+	public boolean init(Expression<?>[] expressions, int matchedPattern,
+						Kleenean isDelayed, ParseResult parseResult) {
+		sterilize = matchedPattern > 1;
+		//noinspection unchecked
+		entities = (Expression<LivingEntity>) expressions[0];
+		return true;
+	}
+
+	@Override
+	protected void execute(Event event) {
+		for (LivingEntity entity : entities.getArray(event)) {
+			if (!(entity instanceof Breedable breedable))
+				continue;
+
+			breedable.setBreed(!sterilize);
+		}
+	}
+
+	@Override
+	public String toString(@Nullable Event event, boolean debug) {
+		return "make " + entities.toString(event, debug) + (sterilize ? " non-" : " ") + "breedable";
+	}
+
+}
diff --git a/src/main/java/org/skriptlang/skript/bukkit/breeding/elements/EffMakeAdultOrBaby.java b/src/main/java/org/skriptlang/skript/bukkit/breeding/elements/EffMakeAdultOrBaby.java
new file mode 100644
index 00000000000..7483f2d43e3
--- /dev/null
+++ b/src/main/java/org/skriptlang/skript/bukkit/breeding/elements/EffMakeAdultOrBaby.java
@@ -0,0 +1,64 @@
+package org.skriptlang.skript.bukkit.breeding.elements;
+
+import ch.njol.skript.Skript;
+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.Effect;
+import ch.njol.skript.lang.Expression;
+import ch.njol.skript.lang.SkriptParser.ParseResult;
+import ch.njol.util.Kleenean;
+import org.bukkit.entity.Ageable;
+import org.bukkit.entity.LivingEntity;
+import org.bukkit.event.Event;
+import org.jetbrains.annotations.Nullable;
+
+@Name("Make Adult/Baby")
+@Description("Force a animal to become an adult or baby.")
+@Examples({
+	"on spawn of mob:",
+	"\tentity is not an adult",
+	"\tmake entity an adult",
+})
+@Since("2.10")
+public class EffMakeAdultOrBaby extends Effect {
+
+	static {
+		Skript.registerEffect(EffMakeAdultOrBaby.class,
+			"make %livingentities% [a[n]] (adult|:baby)",
+			"force %livingentities% to be[come] a[n] (adult|:baby)");
+	}
+
+	private boolean baby;
+	private Expression<LivingEntity> entities;
+
+	@Override
+	public boolean init(Expression<?>[] expressions, int matchedPattern,
+						Kleenean isDelayed, ParseResult parseResult) {
+		baby = parseResult.hasTag("baby");
+		//noinspection unchecked
+		entities = (Expression<LivingEntity>) expressions[0];
+		return true;
+	}
+
+	@Override
+	protected void execute(Event event) {
+		for (LivingEntity entity : entities.getArray(event)) {
+			if (!(entity instanceof Ageable ageable))
+				continue;
+
+			if (baby) {
+				ageable.setBaby();
+			} else {
+				ageable.setAdult();
+			}
+		}
+	}
+
+	@Override
+	public String toString(@Nullable Event event, boolean debug) {
+		return "make " + entities + (baby ? " a baby" : " an adult");
+	}
+
+}
diff --git a/src/main/java/org/skriptlang/skript/bukkit/breeding/elements/EvtBreed.java b/src/main/java/org/skriptlang/skript/bukkit/breeding/elements/EvtBreed.java
new file mode 100644
index 00000000000..24f40f3feb2
--- /dev/null
+++ b/src/main/java/org/skriptlang/skript/bukkit/breeding/elements/EvtBreed.java
@@ -0,0 +1,61 @@
+package org.skriptlang.skript.bukkit.breeding.elements;
+
+import ch.njol.skript.Skript;
+import ch.njol.skript.entity.EntityType;
+import ch.njol.skript.lang.Literal;
+import ch.njol.skript.lang.SkriptEvent;
+import ch.njol.skript.lang.SkriptParser.ParseResult;
+import org.bukkit.entity.Entity;
+import org.bukkit.event.Event;
+import org.bukkit.event.entity.EntityBreedEvent;
+import org.jetbrains.annotations.Nullable;
+
+public class EvtBreed extends SkriptEvent {
+
+	static {
+		Skript.registerEvent("Entity Breed", EvtBreed.class, EntityBreedEvent.class,
+				"[entity] breed[ing] [of %-entitytypes%]")
+			.description("Called whenever two animals begin to conceive a child. The type can be specified.")
+			.examples(
+				"on breeding of llamas:",
+					"\tsend \"When a %breeding mother% and %breeding father% love each " +
+						"other very much they make %offspring%\" to breeder"
+			)
+			.since("2.10");
+	}
+
+	private @Nullable Literal<EntityType> entitiesLiteral;
+	private EntityType @Nullable [] entities;
+
+	@Override
+	public boolean init(Literal<?>[] args, int matchedPattern, ParseResult parseResult) {
+		if (args[0] != null) {
+			//noinspection unchecked
+			entitiesLiteral = ((Literal<EntityType>) args[0]);
+			entities = entitiesLiteral.getAll();
+		}
+		return true;
+	}
+
+	@Override
+	public boolean check(Event event) {
+		return event instanceof EntityBreedEvent breedEvent && checkEntity(breedEvent.getEntity());
+	}
+
+	private boolean checkEntity(Entity entity) {
+		if (entities != null) {
+			for (EntityType entityType : entities) {
+				if (entityType.isInstance(entity))
+					return true;
+			}
+			return false;
+		}
+		return true;
+	}
+
+	@Override
+	public String toString(@Nullable Event event, boolean debug) {
+		return "on breeding" + (entitiesLiteral == null ? "" : " of " + entitiesLiteral);
+	}
+	
+}
diff --git a/src/main/java/org/skriptlang/skript/bukkit/breeding/elements/ExprBreedingFamily.java b/src/main/java/org/skriptlang/skript/bukkit/breeding/elements/ExprBreedingFamily.java
new file mode 100644
index 00000000000..6f2331ac9d4
--- /dev/null
+++ b/src/main/java/org/skriptlang/skript/bukkit/breeding/elements/ExprBreedingFamily.java
@@ -0,0 +1,79 @@
+package org.skriptlang.skript.bukkit.breeding.elements;
+
+import ch.njol.skript.Skript;
+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.SkriptParser.ParseResult;
+import ch.njol.skript.lang.util.SimpleExpression;
+import ch.njol.util.Kleenean;
+import org.bukkit.entity.LivingEntity;
+import org.bukkit.event.Event;
+import org.bukkit.event.entity.EntityBreedEvent;
+import org.jetbrains.annotations.Nullable;
+
+@Name("Breeding Family")
+@Description("Represents family members within a breeding event.")
+@Examples({
+	"on breeding:",
+		"\tsend \"When a %breeding mother% and %breeding father% love each other very much, " +
+		"they make a %bred offspring%\" to breeder"
+})
+@Since("2.10")
+public class ExprBreedingFamily extends SimpleExpression<LivingEntity> {
+
+	static {
+		Skript.registerExpression(ExprBreedingFamily.class, LivingEntity.class, ExpressionType.SIMPLE,
+			"[the] breeding mother",
+			"[the] breeding father",
+			"[the] [bred] (offspring|child)",
+			"[the] breeder");
+	}
+
+	private int pattern;
+
+	@Override
+	public boolean init(Expression<?>[] expressions, int matchedPattern,
+						Kleenean isDelayed, ParseResult parseResult) {
+		if (!getParser().isCurrentEvent(EntityBreedEvent.class)) {
+			Skript.error("The 'breeding family' expression can only be used in an breed event.");
+			return false;
+		}
+
+		pattern = matchedPattern;
+		return true;
+	}
+
+	@Override
+	protected @Nullable LivingEntity [] get(Event event) {
+		if (!(event instanceof EntityBreedEvent breedEvent))
+			return new LivingEntity[0];
+
+		return switch (pattern) {
+			case 0 -> new LivingEntity[]{breedEvent.getMother()};
+			case 1 -> new LivingEntity[]{breedEvent.getFather()};
+			case 2 -> new LivingEntity[]{breedEvent.getEntity()};
+			case 3 -> new LivingEntity[]{breedEvent.getBreeder()};
+			default -> new LivingEntity[0];
+		};
+	}
+
+	@Override
+	public boolean isSingle() {
+		return true;
+	}
+
+	@Override
+	public Class<? extends LivingEntity> getReturnType() {
+		return LivingEntity.class;
+	}
+
+	@Override
+	public String toString(@Nullable Event event, boolean debug) {
+		return "breeding family";
+	}
+
+}
diff --git a/src/main/java/org/skriptlang/skript/bukkit/breeding/elements/ExprLoveTime.java b/src/main/java/org/skriptlang/skript/bukkit/breeding/elements/ExprLoveTime.java
new file mode 100644
index 00000000000..265b959cf43
--- /dev/null
+++ b/src/main/java/org/skriptlang/skript/bukkit/breeding/elements/ExprLoveTime.java
@@ -0,0 +1,86 @@
+package org.skriptlang.skript.bukkit.breeding.elements;
+
+import ch.njol.skript.classes.Changer.ChangeMode;
+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.expressions.base.SimplePropertyExpression;
+import ch.njol.skript.util.Timespan;
+import ch.njol.util.coll.CollectionUtils;
+import org.bukkit.entity.Animals;
+import org.bukkit.entity.LivingEntity;
+import org.bukkit.event.Event;
+import org.jetbrains.annotations.Nullable;
+
+@Name("Love Time")
+@Description({
+	"The amount of time the animals have been in love for. " +
+	"Using a value of 30 seconds is equivalent to using an item to breed them.",
+	"Only works on animals that can be bred and returns '0 seconds' for animals that can't be bred."
+})
+@Examples({
+	"on right click:",
+		"\tsend \"%event-entity% has been in love for %love time of event-entity% more than you!\" to player"
+})
+@Since("2.10")
+public class ExprLoveTime extends SimplePropertyExpression<LivingEntity, Timespan> {
+
+	static {
+		register(ExprLoveTime.class, Timespan.class, "love[d] time", "livingentities");
+	}
+
+	@Override
+	public @Nullable Timespan convert(LivingEntity entity) {
+		if (entity instanceof Animals animal)
+			return new Timespan(Timespan.TimePeriod.TICK, animal.getLoveModeTicks());
+		
+		return new Timespan(0);
+	}
+
+	@Override
+	public @Nullable Class<?>[] acceptChange(ChangeMode mode) {
+		return switch (mode) {
+			case SET -> CollectionUtils.array(Timespan.class);
+			case ADD, REMOVE -> CollectionUtils.array(Timespan[].class);
+			case RESET -> CollectionUtils.array();
+			default -> null;
+		};
+	}
+
+	@Override
+	public void change(Event event, Object @Nullable [] delta, ChangeMode mode) {
+		int changeTicks = 0;
+
+		if (delta != null) {
+			for (Object object : delta) {
+				changeTicks += (int) ((Timespan) object).getAs(Timespan.TimePeriod.TICK);
+			}
+		}
+
+		for (LivingEntity livingEntity : getExpr().getArray(event)) {
+			if (!(livingEntity instanceof Animals animal))
+				continue;
+
+			int loveTicks = animal.getLoveModeTicks();
+			switch (mode) {
+				case ADD -> loveTicks += changeTicks;
+				case REMOVE -> loveTicks -= changeTicks;
+				case SET -> loveTicks = changeTicks;
+				case RESET -> loveTicks = 0;
+			}
+			animal.setLoveModeTicks(Math.max(loveTicks, 0));
+		}
+	}
+
+	@Override
+	public Class<? extends Timespan> getReturnType() {
+		return Timespan.class;
+	}
+
+	@Override
+	protected String getPropertyName() {
+		return "love time";
+	}
+
+}
diff --git a/src/main/java/org/skriptlang/skript/bukkit/displays/DisplayData.java b/src/main/java/org/skriptlang/skript/bukkit/displays/DisplayData.java
new file mode 100644
index 00000000000..dda662cf256
--- /dev/null
+++ b/src/main/java/org/skriptlang/skript/bukkit/displays/DisplayData.java
@@ -0,0 +1,217 @@
+package org.skriptlang.skript.bukkit.displays;
+
+import ch.njol.skript.Skript;
+import ch.njol.skript.aliases.ItemType;
+import ch.njol.skript.entity.EntityData;
+import ch.njol.skript.lang.Literal;
+import ch.njol.skript.lang.SkriptParser.ParseResult;
+import ch.njol.skript.registrations.Classes;
+import ch.njol.skript.util.ColorRGB;
+import ch.njol.skript.variables.Variables;
+import org.bukkit.Bukkit;
+import org.bukkit.Color;
+import org.bukkit.block.data.BlockData;
+import org.bukkit.entity.BlockDisplay;
+import org.bukkit.entity.Display;
+import org.bukkit.entity.ItemDisplay;
+import org.bukkit.entity.TextDisplay;
+import org.bukkit.inventory.ItemStack;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class DisplayData extends EntityData<Display> {
+
+	public static final Color DEFAULT_BACKGROUND_COLOR = ColorRGB.fromRGBA(0, 0, 0, 64).asBukkitColor();
+
+	static {
+		EntityData.register(DisplayData.class, "display", Display.class, 0, DisplayType.codeNames);
+		Variables.yggdrasil.registerSingleClass(DisplayType.class, "DisplayType");
+	}
+
+	private enum DisplayType {
+
+		ANY("org.bukkit.entity.Display", "display"),
+		BLOCK("org.bukkit.entity.BlockDisplay", "block display"),
+		ITEM("org.bukkit.entity.ItemDisplay", "item display"),
+		TEXT("org.bukkit.entity.TextDisplay", "text display");
+
+		@Nullable
+		private Class<? extends Display> displaySubClass;
+		private final String codeName;
+		
+		@SuppressWarnings("unchecked")
+		DisplayType(String className, String codeName) {
+			try {
+				this.displaySubClass = (Class<? extends Display>) Class.forName(className);
+			} catch (ClassNotFoundException ignored) {}
+			this.codeName = codeName;
+		}
+
+		@Override
+		public String toString() {
+			return codeName;
+		}
+
+		private static final String[] codeNames;
+		static {
+			List<String> codeNamesList = new ArrayList<>();
+			for (DisplayType type : values()) {
+				if (type.displaySubClass != null)
+					codeNamesList.add(type.codeName);
+			}
+			codeNames = codeNamesList.toArray(new String[0]);
+		}
+	}
+
+	private DisplayType type = DisplayType.ANY;
+
+	@Nullable
+	private BlockData blockData;
+
+	@Nullable
+	private ItemStack item;
+
+	@Nullable
+	private String text;
+
+	public DisplayData() {}
+
+	public DisplayData(DisplayType type) {
+		this.type = type;
+		this.matchedPattern = type.ordinal();
+	}
+
+	@Override
+	@SuppressWarnings("unchecked")
+	protected boolean init(Literal<?>[] exprs, int matchedPattern, ParseResult parseResult) {
+		type = DisplayType.values()[matchedPattern];
+		// default to 0, use 1 for alternate pattern: %x% display instead of display of %x%
+		int exprIndex = parseResult.hasTag("alt") ? 1 : 0;
+		if (exprs.length == 0 || exprs[exprIndex] == null)
+			return true;
+
+		if (type == DisplayType.BLOCK) {
+			Object object = ((Literal<Object>) exprs[exprIndex]).getSingle();
+			if (object instanceof ItemType itemType) {
+				if (!itemType.hasBlock()) {
+					Skript.error("A block display must be of a block item. " + Classes.toString(itemType.getMaterial()) + " is not a block. If you want to display an item, use an 'item display'.");
+					return false;
+				}
+				blockData = Bukkit.createBlockData(itemType.getBlockMaterial());
+			} else {
+				blockData = (BlockData) object;
+			}
+		} else if (type == DisplayType.ITEM) {
+			ItemType itemType = ((Literal<ItemType>) exprs[exprIndex]).getSingle();
+			if (!itemType.hasItem()) {
+				Skript.error("An item display must be of a valid item. " + Classes.toString(itemType.getMaterial()) + " is not a valid item. If you want to display a block, use a 'block display'.");
+				return false;
+			}
+			item = itemType.getRandom();
+		}
+		return true;
+	}
+
+	@Override
+	protected boolean init(@Nullable Class<? extends Display> displayClass, @Nullable Display entity) {
+		DisplayType[] types = DisplayType.values();
+		for (int i = types.length - 1; i >= 0; i--) {
+			Class<?> display = types[i].displaySubClass;
+			if (display == null)
+				continue;
+			//noinspection ConstantConditions
+			if (entity == null ? displayClass.isAssignableFrom(display) : display.isInstance(entity)) {
+				type = types[i];
+				if (entity != null) {
+					switch (type) {
+						case BLOCK -> blockData = ((BlockDisplay) entity).getBlock();
+						case ITEM -> item = ((ItemDisplay) entity).getItemStack();
+						case TEXT -> text = ((TextDisplay) entity).getText();
+					}
+				}
+				return true;
+			}
+		}
+		assert false;
+		return false;
+	}
+
+	@Override
+	public void set(Display entity) {
+		switch (type) {
+			case BLOCK -> {
+				if (blockData != null && entity instanceof BlockDisplay blockDisplay)
+					blockDisplay.setBlock(blockData);
+			}
+			case ITEM -> {
+				if (item != null && entity instanceof ItemDisplay itemDisplay)
+					itemDisplay.setItemStack(item);
+			}
+			case TEXT -> {
+				if (text != null && entity instanceof TextDisplay textDisplay)
+					textDisplay.setText(text);
+			}
+		}
+	}
+
+	@Override
+	public boolean match(Display entity) {
+		switch (type) {
+			case BLOCK -> {
+				if (!(entity instanceof BlockDisplay blockDisplay))
+					return false;
+				if (blockData != null && !blockDisplay.getBlock().equals(blockData))
+					return false;
+			}
+			case ITEM -> {
+				if (!(entity instanceof ItemDisplay itemDisplay))
+					return false;
+				if (item != null && !itemDisplay.getItemStack().isSimilar(item))
+					return false;
+			}
+			case TEXT -> {
+				if (!(entity instanceof TextDisplay textDisplay))
+					return false;
+				if (text == null) // all text displays should match a blank one.
+					return true;
+				String displayText = textDisplay.getText();
+				if (displayText == null)
+					return false;
+				return displayText.equals(text);
+			}
+		}
+		return type.displaySubClass != null && type.displaySubClass.isInstance(entity);
+	}
+
+	@Override
+	public Class<? extends Display> getType() {
+		return type.displaySubClass != null ? type.displaySubClass : Display.class;
+	}
+
+	@Override
+	protected int hashCode_i() {
+		return type.hashCode();
+	}
+
+	@Override
+	protected boolean equals_i(EntityData<?> obj) {
+		if (obj instanceof DisplayData other)
+			return type == other.type;
+		return false;
+	}
+
+	@Override
+	public boolean isSupertypeOf(EntityData<?> entityData) {
+		if (entityData instanceof DisplayData displayData)
+			return type == DisplayType.ANY || displayData.type == type;
+		return Display.class.isAssignableFrom(entityData.getType());
+	}
+
+	@Override
+	public EntityData<?> getSuperType() {
+		return new DisplayData(DisplayType.ANY);
+	}
+
+}
diff --git a/src/main/java/org/skriptlang/skript/bukkit/displays/DisplayModule.java b/src/main/java/org/skriptlang/skript/bukkit/displays/DisplayModule.java
new file mode 100644
index 00000000000..e333809af87
--- /dev/null
+++ b/src/main/java/org/skriptlang/skript/bukkit/displays/DisplayModule.java
@@ -0,0 +1,61 @@
+package org.skriptlang.skript.bukkit.displays;
+
+import ch.njol.skript.Skript;
+import ch.njol.skript.classes.ClassInfo;
+import ch.njol.skript.classes.EnumClassInfo;
+import ch.njol.skript.classes.data.DefaultChangers;
+import ch.njol.skript.expressions.base.EventValueExpression;
+import ch.njol.skript.registrations.Classes;
+import org.bukkit.entity.Display;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.ItemDisplay;
+import org.bukkit.entity.TextDisplay;
+import org.skriptlang.skript.lang.converter.Converter;
+import org.skriptlang.skript.lang.converter.Converters;
+
+import java.io.IOException;
+
+public class DisplayModule {
+
+	public static void load() throws IOException {
+		// abort if no class exists
+		if (!Skript.classExists("org.bukkit.entity.Display"))
+			return;
+
+		// load classes (todo: replace with registering methods after regitration api
+		Skript.getAddonInstance().loadClasses("org.skriptlang.skript.bukkit", "displays");
+
+		// Classes
+
+		Classes.registerClass(new ClassInfo<>(Display.class, "display")
+			.user("displays?")
+			.name("Display Entity")
+			.description("A text, block or item display entity.")
+			.since("2.10")
+			.defaultExpression(new EventValueExpression<>(Display.class))
+			.changer(DefaultChangers.nonLivingEntityChanger));
+
+		Classes.registerClass(new EnumClassInfo<>(Display.Billboard.class, "billboard", "billboards")
+			.user("billboards?")
+			.name("Display Billboard")
+			.description("Represents the billboard setting of a display.")
+			.since("2.10"));
+
+		Classes.registerClass(new EnumClassInfo<>(TextDisplay.TextAlignment.class, "textalignment", "text alignments")
+			.user("text ?alignments?")
+			.name("Display Text Alignment")
+			.description("Represents the text alignment setting of a text display.")
+			.since("2.10"));
+
+		Classes.registerClass(new EnumClassInfo<>(ItemDisplay.ItemDisplayTransform.class, "itemdisplaytransform", "item display transforms")
+			.user("item ?display ?transforms?")
+			.name("Item Display Transforms")
+			.description("Represents the transform setting of an item display.")
+			.since("2.10"));
+
+		Converters.registerConverter(Entity.class, Display.class,
+				entity -> entity instanceof Display display ? display : null,
+				Converter.NO_RIGHT_CHAINING);
+	}
+
+}
diff --git a/src/main/java/org/skriptlang/skript/bukkit/displays/generic/ExprDisplayBillboard.java b/src/main/java/org/skriptlang/skript/bukkit/displays/generic/ExprDisplayBillboard.java
new file mode 100644
index 00000000000..e21ccfe89b5
--- /dev/null
+++ b/src/main/java/org/skriptlang/skript/bukkit/displays/generic/ExprDisplayBillboard.java
@@ -0,0 +1,60 @@
+package org.skriptlang.skript.bukkit.displays.generic;
+
+import ch.njol.skript.classes.Changer.ChangeMode;
+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.expressions.base.SimplePropertyExpression;
+import ch.njol.util.coll.CollectionUtils;
+import org.bukkit.entity.Display;
+import org.bukkit.entity.Display.Billboard;
+import org.bukkit.event.Event;
+import org.jetbrains.annotations.Nullable;
+
+@Name("Display Billboard")
+@Description({
+	"Returns or changes the <a href='classes.html#billboard'>billboard</a> setting of <a href='classes.html#display'>displays</a>.",
+	"This describes the axes/points around which the display can pivot.",
+	"Displays spawn with the 'fixed' billboard by default. Resetting this expression will also set it to 'fixed'."
+})
+@Examples("set billboard of the last spawned text display to center")
+@Since("2.10")
+public class ExprDisplayBillboard extends SimplePropertyExpression<Display, Billboard> {
+
+	static {
+		registerDefault(ExprDisplayBillboard.class, Billboard.class, "bill[ |-]board[ing] [setting]", "displays");
+	}
+
+	@Override
+	@Nullable
+	public Billboard convert(Display display) {
+		return display.getBillboard();
+	}
+
+	public Class<?> @Nullable [] acceptChange(ChangeMode mode) {
+		return switch (mode) {
+			case RESET -> CollectionUtils.array();
+			case SET -> CollectionUtils.array(Billboard.class);
+			default -> null;
+		};
+	}
+
+	@Override
+	public void change(Event event, Object @Nullable [] delta, ChangeMode mode) {
+		Billboard billboard = delta != null ? (Billboard) delta[0] : Billboard.FIXED;
+		for (Display display : getExpr().getArray(event))
+			display.setBillboard(billboard);
+	}
+
+	@Override
+	public Class<? extends Billboard> getReturnType() {
+		return Billboard.class;
+	}
+
+	@Override
+	protected String getPropertyName() {
+		return "billboard";
+	}
+
+}
diff --git a/src/main/java/org/skriptlang/skript/bukkit/displays/generic/ExprDisplayBrightness.java b/src/main/java/org/skriptlang/skript/bukkit/displays/generic/ExprDisplayBrightness.java
new file mode 100644
index 00000000000..7df15064050
--- /dev/null
+++ b/src/main/java/org/skriptlang/skript/bukkit/displays/generic/ExprDisplayBrightness.java
@@ -0,0 +1,174 @@
+package org.skriptlang.skript.bukkit.displays.generic;
+
+import ch.njol.skript.Skript;
+import ch.njol.skript.classes.Changer.ChangeMode;
+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.SkriptParser.ParseResult;
+import ch.njol.skript.lang.util.SimpleExpression;
+import ch.njol.util.Kleenean;
+import ch.njol.util.Math2;
+import ch.njol.util.coll.CollectionUtils;
+import org.bukkit.entity.Display;
+import org.bukkit.entity.Display.Brightness;
+import org.bukkit.event.Event;
+import org.jetbrains.annotations.Nullable;
+import org.jetbrains.annotations.UnknownNullability;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Name("Display Brightness")
+@Description({
+	"Returns or changes the brightness override of <a href='classes.html#display'>displays</a>.",
+	"Unmodified displays will not have a brightness override value set. Resetting or deleting this value will remove the override.",
+	"Use the 'block' or 'sky' options to get/change specific values or get both values as a list by using neither option.",
+	"NOTE: setting only one of the sky/block light overrides of a display without an existing override will set both sky and block light to the given value. " +
+	"Make sure to set both block and sky levels to your desired values for the best results. " +
+	"Likewise, you can only clear the brightness override, you cannot clear/reset the sky/block values individually."
+})
+@Examples({
+	"set sky light override of the last spawned text display to 7",
+	"subtract 3 from the block light level override of the last spawned text display",
+	"if sky light level override of {_display} is 5:",
+		"\tclear brightness override of {_display}"
+})
+@Since("2.10")
+public class ExprDisplayBrightness extends SimpleExpression<Integer> {
+
+	static {
+		Skript.registerExpression(ExprDisplayBrightness.class, Integer.class, ExpressionType.PROPERTY,
+				"[the] [:block|:sky] (light [level]|brightness) override[s] of %displays%",
+				"%displays%'[s] [:block|:sky] (light [level]|brightness) override[s]");
+	}
+
+	private @UnknownNullability Expression<Display> displays;
+	private boolean blockLight;
+	private boolean skyLight;
+
+	@Override
+	public boolean init(Expression<?>[] expressions, int matchedPattern, Kleenean isDelayed, ParseResult parseResult) {
+		blockLight = parseResult.hasTag("block");
+		skyLight = parseResult.hasTag("sky");
+		//noinspection unchecked
+		displays = (Expression<Display>) expressions[0];
+		return true;
+	}
+
+	@Override
+	protected Integer @Nullable [] get(Event event) {
+		List<Integer> values = new ArrayList<>();
+		if (skyLight) {
+			for (Display display : displays.getArray(event)) {
+				Brightness brightness = display.getBrightness();
+				if (brightness == null)
+					continue;
+				values.add(brightness.getSkyLight());
+			}
+		} else if (blockLight) {
+			for (Display display : displays.getArray(event)) {
+				Brightness brightness = display.getBrightness();
+				if (brightness == null)
+					continue;
+				values.add(brightness.getBlockLight());
+			}
+		} else {
+			for (Display display : displays.getArray(event)) {
+				Brightness brightness = display.getBrightness();
+				if (brightness == null)
+					continue;
+				values.add(brightness.getBlockLight());
+				values.add(brightness.getSkyLight());
+			}
+		}
+		return values.toArray(new Integer[0]);
+	}
+
+	public Class<?> @Nullable [] acceptChange(ChangeMode mode) {
+		if (skyLight || blockLight) {
+			return switch (mode) {
+				case ADD, REMOVE, SET -> CollectionUtils.array(Number.class);
+				default -> null;
+			};
+		} else {
+			return switch (mode) {
+				case SET, RESET, DELETE -> CollectionUtils.array(Number.class);
+				default -> null;
+			};
+		}
+	}
+
+	@Override
+	public void change(Event event, Object @Nullable [] delta, ChangeMode mode) {
+		if (skyLight || blockLight) {
+			int level = delta == null ? 0 : ((Number) delta[0]).intValue();
+			switch (mode) {
+				case REMOVE:
+					level = -level;
+					// $FALL-THROUGH$
+				case ADD:
+					for (Display display : displays.getArray(event)) {
+						Brightness brightness = display.getBrightness();
+						if (brightness == null) {
+							int clamped = Math2.fit(0, level, 15);
+							display.setBrightness(new Brightness(clamped, clamped));
+						} else if (skyLight) {
+							int clamped = Math2.fit(0, level + brightness.getSkyLight(), 15);
+							display.setBrightness(new Brightness(brightness.getBlockLight(), clamped));
+						} else {
+							int clamped = Math2.fit(0, level + brightness.getBlockLight(), 15);
+							display.setBrightness(new Brightness(clamped, brightness.getSkyLight()));
+						}
+					}
+					break;
+				case SET:
+					for (Display display : displays.getArray(event)) {
+						Brightness brightness = display.getBrightness();
+						int clamped = Math2.fit(0, level, 15);
+						if (brightness == null) {
+							display.setBrightness(new Brightness(clamped, clamped));
+						} else if (skyLight) {
+							display.setBrightness(new Brightness(brightness.getBlockLight(), clamped));
+						} else {
+							display.setBrightness(new Brightness(clamped, brightness.getSkyLight()));
+						}
+					}
+					break;
+			}
+		} else {
+			Brightness change = null;
+			if (delta != null) {
+				int value = Math2.fit(0, ((Number) delta[0]).intValue(), 15);
+				change = new Brightness(value, value);
+			}
+			for (Display display : displays.getArray(event))
+				display.setBrightness(change);
+		}
+	}
+
+	@Override
+	public boolean isSingle() {
+		return (skyLight || blockLight) && displays.isSingle();
+	}
+
+	@Override
+	public Class<? extends Integer> getReturnType() {
+		return Integer.class;
+	}
+
+	@Override
+	public String toString(@Nullable Event event, boolean debug) {
+		if (skyLight) {
+			return "sky light override of " + displays.toString(event, debug);
+		} else if (blockLight) {
+			return "block light override of " + displays.toString(event, debug);
+		} else {
+			return "brightness override of " + displays.toString(event, debug);
+		}
+	}
+
+}
diff --git a/src/main/java/org/skriptlang/skript/bukkit/displays/generic/ExprDisplayGlowOverride.java b/src/main/java/org/skriptlang/skript/bukkit/displays/generic/ExprDisplayGlowOverride.java
new file mode 100644
index 00000000000..a36b95559e4
--- /dev/null
+++ b/src/main/java/org/skriptlang/skript/bukkit/displays/generic/ExprDisplayGlowOverride.java
@@ -0,0 +1,60 @@
+package org.skriptlang.skript.bukkit.displays.generic;
+
+import ch.njol.skript.classes.Changer.ChangeMode;
+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.expressions.base.SimplePropertyExpression;
+import ch.njol.skript.util.Color;
+import ch.njol.skript.util.ColorRGB;
+import ch.njol.util.coll.CollectionUtils;
+import org.bukkit.entity.Display;
+import org.bukkit.event.Event;
+import org.jetbrains.annotations.Nullable;
+
+@Name("Display Glow Color Override")
+@Description({
+	"Returns or changes the glowing color override of <a href='classes.html#display'>displays</a>.",
+	"This overrides whatever color is already set for the scoreboard team of the displays."
+})
+@Examples("set glow color override of the last spawned text display to blue")
+@Since("2.10")
+public class ExprDisplayGlowOverride extends SimplePropertyExpression<Display, Color> {
+
+	static {
+		registerDefault(ExprDisplayGlowOverride.class, Color.class, "glow[ing] colo[u]r[s] override[s]", "displays");
+	}
+
+	@Override
+	@Nullable
+	public Color convert(Display display) {
+		org.bukkit.Color color = display.getGlowColorOverride();
+		return color != null ? ColorRGB.fromBukkitColor(color) : null;
+	}
+
+	public Class<?> @Nullable [] acceptChange(ChangeMode mode) {
+		return switch (mode) {
+			case SET, RESET, DELETE -> CollectionUtils.array(Color.class);
+			default -> null;
+		};
+	}
+
+	@Override
+	public void change(Event event, Object @Nullable [] delta, ChangeMode mode) {
+		org.bukkit.Color color = delta != null ? ((Color) delta[0]).asBukkitColor() : null;
+		for (Display display : getExpr().getArray(event))
+			display.setGlowColorOverride(color);
+	}
+
+	@Override
+	public Class<? extends Color> getReturnType() {
+		return Color.class;
+	}
+
+	@Override
+	protected String getPropertyName() {
+		return "glow color override";
+	}
+
+}
diff --git a/src/main/java/org/skriptlang/skript/bukkit/displays/generic/ExprDisplayHeightWidth.java b/src/main/java/org/skriptlang/skript/bukkit/displays/generic/ExprDisplayHeightWidth.java
new file mode 100644
index 00000000000..de0c6121e28
--- /dev/null
+++ b/src/main/java/org/skriptlang/skript/bukkit/displays/generic/ExprDisplayHeightWidth.java
@@ -0,0 +1,105 @@
+package org.skriptlang.skript.bukkit.displays.generic;
+
+import ch.njol.skript.classes.Changer.ChangeMode;
+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.expressions.base.SimplePropertyExpression;
+import ch.njol.skript.lang.Expression;
+import ch.njol.skript.lang.SkriptParser.ParseResult;
+import ch.njol.util.Kleenean;
+import ch.njol.util.coll.CollectionUtils;
+import org.bukkit.entity.Display;
+import org.bukkit.event.Event;
+import org.jetbrains.annotations.Nullable;
+
+@Name("Display Height/Width")
+@Description({
+	"Returns or changes the height or width of <a href='classes.html#display'>displays</a>.",
+	"The rendering culling bounding box spans horizontally width/2 from entity position, " +
+	"which determines the point at which the display will be frustum culled (no longer rendered because the game " +
+	"determines you are no longer able to see it).",
+	"If set to 0, no culling will occur on both the vertical and horizontal directions. Default is 0.0."
+})
+@Examples("set display height of the last spawned text display to 2.5")
+@Since("2.10")
+public class ExprDisplayHeightWidth extends SimplePropertyExpression<Display, Float> {
+
+	static {
+		registerDefault(ExprDisplayHeightWidth.class, Float.class, "display (:height|width)", "displays");
+	}
+
+	private boolean height;
+
+	@Override
+	public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelayed, ParseResult parseResult) {
+		height = parseResult.hasTag("height");
+		return super.init(exprs, matchedPattern, isDelayed, parseResult);
+	}
+
+	@Override
+	@Nullable
+	public Float convert(Display display) {
+		return height ? display.getDisplayHeight() : display.getDisplayWidth();
+	}
+
+	public Class<?> @Nullable [] acceptChange(ChangeMode mode) {
+		return switch (mode) {
+			case ADD, REMOVE, RESET, SET -> CollectionUtils.array(Number.class);
+			default -> null;
+		};
+	}
+
+	@Override
+	public void change(Event event, Object @Nullable [] delta, ChangeMode mode) {
+		Display[] displays = getExpr().getArray(event);
+
+		float change = delta == null ? 0F : ((Number) delta[0]).floatValue();
+		if (Float.isInfinite(change) || Float.isNaN(change))
+			return;
+
+		switch (mode) {
+			case REMOVE:
+				change = -change;
+				//$FALL-THROUGH$
+			case ADD:
+				for (Display display : displays) {
+					if (height) {
+						float value = Math.max(0F, display.getDisplayHeight() + change);
+						if (Float.isInfinite(value))
+							continue;
+						display.setDisplayHeight(value);
+					} else {
+						float value = Math.max(0F, display.getDisplayWidth() + change);
+						if (Float.isInfinite(value))
+							continue;
+						display.setDisplayWidth(value);
+					}
+				}
+				break;
+			case RESET:
+			case SET:
+				change = Math.max(0F, change);
+				for (Display display : displays) {
+					if (height) {
+						display.setDisplayHeight(change);
+					} else {
+						display.setDisplayWidth(change);
+					}
+				}
+				break;
+		}
+	}
+
+	@Override
+	public Class<? extends Float> getReturnType() {
+		return Float.class;
+	}
+
+	@Override
+	protected String getPropertyName() {
+		return height ? "height" : "width";
+	}
+
+}
diff --git a/src/main/java/org/skriptlang/skript/bukkit/displays/generic/ExprDisplayInterpolation.java b/src/main/java/org/skriptlang/skript/bukkit/displays/generic/ExprDisplayInterpolation.java
new file mode 100644
index 00000000000..430257634d9
--- /dev/null
+++ b/src/main/java/org/skriptlang/skript/bukkit/displays/generic/ExprDisplayInterpolation.java
@@ -0,0 +1,104 @@
+package org.skriptlang.skript.bukkit.displays.generic;
+
+import ch.njol.skript.classes.Changer.ChangeMode;
+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.expressions.base.SimplePropertyExpression;
+import ch.njol.skript.lang.Expression;
+import ch.njol.skript.lang.SkriptParser.ParseResult;
+import ch.njol.skript.util.Timespan;
+import ch.njol.skript.util.Timespan.TimePeriod;
+import ch.njol.util.Kleenean;
+import ch.njol.util.Math2;
+import ch.njol.util.coll.CollectionUtils;
+import org.bukkit.entity.Display;
+import org.bukkit.event.Event;
+import org.jetbrains.annotations.Nullable;
+
+@Name("Display Interpolation Delay/Duration")
+@Description({
+	"Returns or changes the interpolation delay/duration of <a href='classes.html#display'>displays</a>.",
+	"Interpolation duration is the amount of time a display will take to interpolate, or shift, between its current state and a new state.",
+	"Interpolation delay is the amount of ticks before client-side interpolation will commence." +
+	"Setting to 0 seconds will make it immediate.",
+	"Resetting either value will return that value to 0."
+})
+@Examples("set interpolation delay of the last spawned text display to 2 ticks")
+@Since("2.10")
+public class ExprDisplayInterpolation extends SimplePropertyExpression<Display, Timespan> {
+
+	static {
+		registerDefault(ExprDisplayInterpolation.class, Timespan.class, "interpolation (:delay|duration)[s]", "displays");
+	}
+
+	private boolean delay;
+
+	@Override
+	public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelayed, ParseResult parseResult) {
+		delay = parseResult.hasTag("delay");
+		return super.init(exprs, matchedPattern, isDelayed, parseResult);
+	}
+
+	@Override
+	@Nullable
+	public Timespan convert(Display display) {
+		return new Timespan(Timespan.TimePeriod.TICK, delay ? display.getInterpolationDelay() : display.getInterpolationDuration());
+	}
+
+	public Class<?> @Nullable [] acceptChange(ChangeMode mode) {
+		return switch (mode) {
+			case ADD, REMOVE, SET -> CollectionUtils.array(Timespan.class);
+			case RESET -> CollectionUtils.array();
+			default -> null;
+		};
+	}
+
+	@Override
+	public void change(Event event, Object @Nullable [] delta, ChangeMode mode) {
+		Display[] displays = getExpr().getArray(event);
+		long ticks = 0;
+		if (delta != null)
+			ticks = Math2.fit(Integer.MIN_VALUE, ((Timespan) delta[0]).getAs(TimePeriod.TICK), Integer.MAX_VALUE);
+
+		switch (mode) {
+			case REMOVE:
+				ticks = -ticks;
+				//$FALL-THROUGH$
+			case ADD:
+				for (Display display : displays) {
+					if (delay) {
+						int value = (int) Math2.fit(0, display.getInterpolationDelay() + ticks, Integer.MAX_VALUE);
+						display.setInterpolationDelay(value);
+					} else {
+						int value = (int) Math2.fit(0, display.getInterpolationDuration() + ticks, Integer.MAX_VALUE);
+						display.setInterpolationDuration(value);
+					}
+				}
+				break;
+			case RESET:
+			case SET:
+				ticks = Math2.fit(0, ticks, Integer.MAX_VALUE);
+				for (Display display : displays) {
+					if (delay) {
+						display.setInterpolationDelay((int) ticks);
+					} else {
+						display.setInterpolationDuration((int) ticks);
+					}
+				}
+				break;
+		}
+	}
+
+	@Override
+	public Class<? extends Timespan> getReturnType() {
+		return Timespan.class;
+	}
+
+	@Override
+	protected String getPropertyName() {
+		return "interpolation " + (delay ? "delay" : "duration");
+	}
+
+}
diff --git a/src/main/java/org/skriptlang/skript/bukkit/displays/generic/ExprDisplayShadow.java b/src/main/java/org/skriptlang/skript/bukkit/displays/generic/ExprDisplayShadow.java
new file mode 100644
index 00000000000..a241e061df4
--- /dev/null
+++ b/src/main/java/org/skriptlang/skript/bukkit/displays/generic/ExprDisplayShadow.java
@@ -0,0 +1,100 @@
+package org.skriptlang.skript.bukkit.displays.generic;
+
+import ch.njol.skript.classes.Changer.ChangeMode;
+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.expressions.base.SimplePropertyExpression;
+import ch.njol.skript.lang.Expression;
+import ch.njol.skript.lang.SkriptParser.ParseResult;
+import ch.njol.util.Kleenean;
+import ch.njol.util.coll.CollectionUtils;
+import org.bukkit.entity.Display;
+import org.bukkit.event.Event;
+import org.jetbrains.annotations.Nullable;
+
+@Name("Display Shadow Radius/Strength")
+@Description("Returns or changes the shadow radius/strength of <a href='classes.html#display'>displays</a>.")
+@Examples("set shadow radius of the last spawned text display to 1.75")
+@Since("2.10")
+public class ExprDisplayShadow extends SimplePropertyExpression<Display, Float> {
+
+	static {
+		registerDefault(ExprDisplayShadow.class, Float.class, "shadow (:radius|strength)", "displays");
+	}
+
+	private boolean radius;
+
+	@Override
+	public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelayed, ParseResult parseResult) {
+		radius = parseResult.hasTag("radius");
+		return super.init(exprs, matchedPattern, isDelayed, parseResult);
+	}
+
+	@Override
+	@Nullable
+	public Float convert(Display display) {
+		return radius ? display.getShadowRadius() : display.getShadowStrength();
+	}
+
+	public Class<?> @Nullable [] acceptChange(ChangeMode mode) {
+		return switch (mode) {
+			case ADD, SET, REMOVE -> CollectionUtils.array(Number.class);
+			case RESET -> CollectionUtils.array();
+			default -> null;
+		};
+	}
+
+	@Override
+	public void change(Event event, Object @Nullable [] delta, ChangeMode mode) {
+		Display[] displays = getExpr().getArray(event);
+		float change = delta == null ? 0F : ((Number) delta[0]).floatValue();
+		if (Float.isInfinite(change) || Float.isNaN(change))
+			return;
+		switch (mode) {
+			case REMOVE:
+				change = -change;
+				//$FALL-THROUGH$
+			case ADD:
+				for (Display display : displays) {
+					if (radius) {
+						float value = Math.max(0F, display.getShadowRadius() + change);
+						if (Float.isInfinite(value))
+							continue;
+						display.setShadowRadius(value);
+					} else {
+						float value = Math.max(0F, display.getShadowStrength() + change);
+						if (Float.isInfinite(value))
+							continue;
+						display.setShadowStrength(value);
+					}
+				}
+				break;
+			case RESET:
+				if (!radius)
+					change = 1; // default strength is 1
+			case SET:
+				change = Math.max(0F, change);
+				for (Display display : displays) {
+					if (radius) {
+						display.setShadowRadius(change);
+					} else {
+						display.setShadowStrength(change);
+					}
+				}
+				break;
+		}
+	}
+
+	@Override
+	public Class<? extends Float> getReturnType() {
+		return Float.class;
+	}
+
+	@Override
+	protected String getPropertyName() {
+		return radius ? "radius" : "strength";
+	}
+
+}
diff --git a/src/main/java/org/skriptlang/skript/bukkit/displays/generic/ExprDisplayTeleportDuration.java b/src/main/java/org/skriptlang/skript/bukkit/displays/generic/ExprDisplayTeleportDuration.java
new file mode 100644
index 00000000000..91d9a37e7e9
--- /dev/null
+++ b/src/main/java/org/skriptlang/skript/bukkit/displays/generic/ExprDisplayTeleportDuration.java
@@ -0,0 +1,88 @@
+package org.skriptlang.skript.bukkit.displays.generic;
+
+import ch.njol.skript.Skript;
+import ch.njol.skript.classes.Changer.ChangeMode;
+import ch.njol.skript.doc.Description;
+import ch.njol.skript.doc.Examples;
+import ch.njol.skript.doc.Name;
+import ch.njol.skript.doc.RequiredPlugins;
+import ch.njol.skript.doc.Since;
+import ch.njol.skript.expressions.base.SimplePropertyExpression;
+import ch.njol.skript.util.Timespan;
+import ch.njol.skript.util.Timespan.TimePeriod;
+import ch.njol.util.Math2;
+import ch.njol.util.coll.CollectionUtils;
+import org.bukkit.entity.Display;
+import org.bukkit.event.Event;
+import org.jetbrains.annotations.Nullable;
+
+@Name("Display Teleport Delay/Duration")
+@Description({
+	"The teleport duration of displays is the amount of time it takes to get between locations.",
+	"0 means that updates are applied immediately.",
+	"1 means that the display entity will move from current position to the updated one over one tick.",
+	"Higher values spread the movement over multiple ticks. Max of 59 ticks."
+})
+@Examples({
+	"set teleport delay of the last spawned text display to 2 ticks",
+	"teleport last spawned text display to {_location}",
+	"wait 2 ticks",
+	"message \"display entity has arrived at %{_location}%\""
+})
+@RequiredPlugins("Spigot 1.20.4+")
+@Since("2.10")
+public class ExprDisplayTeleportDuration extends SimplePropertyExpression<Display, Timespan> {
+
+	static {
+		if (Skript.isRunningMinecraft(1, 20, 4))
+			registerDefault(ExprDisplayTeleportDuration.class, Timespan.class, "teleport[ation] duration[s]", "displays");
+	}
+
+	@Override
+	@Nullable
+	public Timespan convert(Display display) {
+		return new Timespan(TimePeriod.TICK, display.getTeleportDuration());
+	}
+
+	public Class<?> @Nullable [] acceptChange(ChangeMode mode) {
+		return switch (mode) {
+			case ADD, REMOVE, SET -> CollectionUtils.array(Timespan.class);
+			case RESET -> CollectionUtils.array();
+			default -> null;
+		};
+	}
+
+	@Override
+	public void change(Event event, Object @Nullable [] delta, ChangeMode mode) {
+		Display[] displays = getExpr().getArray(event);
+		long ticks = (delta == null ? 0 : ((Timespan) delta[0]).getAs(TimePeriod.TICK));
+		switch (mode) {
+			case REMOVE:
+				ticks = -ticks;
+				//$FALL-THROUGH$
+			case ADD:
+				for (Display display : displays) {
+					int value = (int) Math2.fit(0, display.getTeleportDuration() + ticks, 59);
+					display.setTeleportDuration(value);
+				}
+				break;
+			case RESET:
+			case SET:
+				ticks = Math2.fit(0, ticks, 59);
+				for (Display display : displays)
+					display.setTeleportDuration((int) ticks);
+				break;
+		}
+	}
+
+	@Override
+	public Class<? extends Timespan> getReturnType() {
+		return Timespan.class;
+	}
+
+	@Override
+	protected String getPropertyName() {
+		return "teleport duration";
+	}
+
+}
diff --git a/src/main/java/org/skriptlang/skript/bukkit/displays/generic/ExprDisplayTransformationRotation.java b/src/main/java/org/skriptlang/skript/bukkit/displays/generic/ExprDisplayTransformationRotation.java
new file mode 100644
index 00000000000..4ebb6da7857
--- /dev/null
+++ b/src/main/java/org/skriptlang/skript/bukkit/displays/generic/ExprDisplayTransformationRotation.java
@@ -0,0 +1,85 @@
+package org.skriptlang.skript.bukkit.displays.generic;
+
+import ch.njol.skript.classes.Changer.ChangeMode;
+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.expressions.base.SimplePropertyExpression;
+import ch.njol.skript.lang.Expression;
+import ch.njol.skript.lang.SkriptParser.ParseResult;
+import ch.njol.util.Kleenean;
+import ch.njol.util.coll.CollectionUtils;
+import org.bukkit.entity.Display;
+import org.bukkit.event.Event;
+import org.bukkit.util.Transformation;
+import org.jetbrains.annotations.Nullable;
+import org.joml.Quaternionf;
+
+@Name("Display Transformation Rotation")
+@Description({
+        "Returns or changes the transformation rotation of <a href='classes.html#display'>displays</a>.",
+        "The left rotation is applied first, with the right rotation then being applied based on the rotated axis."
+})
+@Examples("set left transformation rotation of last spawned block display to quaternion(1, 0, 0, 0) # reset block display")
+@Since("2.10")
+public class ExprDisplayTransformationRotation extends SimplePropertyExpression<Display, Quaternionf> {
+
+	static {
+		registerDefault(ExprDisplayTransformationRotation.class, Quaternionf.class, "(:left|right) [transformation] rotation", "displays");
+	}
+
+	private boolean left;
+
+	@Override
+	public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelayed, ParseResult parseResult) {
+		left = parseResult.hasTag("left");
+		return super.init(exprs, matchedPattern, isDelayed, parseResult);
+	}
+
+	@Override
+	public @Nullable Quaternionf convert(Display display) {
+		Transformation transformation = display.getTransformation();
+		return left ? transformation.getLeftRotation() : transformation.getRightRotation();
+	}
+
+	public Class<?> @Nullable [] acceptChange(ChangeMode mode) {
+		return switch (mode) {
+			case SET, RESET -> CollectionUtils.array(Quaternionf.class);
+			default -> null;
+		};
+	}
+
+	@Override
+	public void change(Event event, Object @Nullable [] delta, ChangeMode mode) {
+		Quaternionf quaternion = null;
+		if (mode == ChangeMode.RESET)
+			quaternion = new Quaternionf(0, 0, 0, 1);
+		if (delta != null) {
+			quaternion = (Quaternionf) delta[0];
+		}
+		if (quaternion == null || !quaternion.isFinite())
+			return;
+		for (Display display : getExpr().getArray(event)) {
+			Transformation transformation = display.getTransformation();
+			Transformation change;
+			if (left) {
+				change = new Transformation(transformation.getTranslation(), quaternion, transformation.getScale(), transformation.getRightRotation());
+			} else {
+				change = new Transformation(transformation.getTranslation(), transformation.getLeftRotation(), transformation.getScale(), quaternion);
+			}
+			display.setTransformation(change);
+		}
+	}
+
+	@Override
+	public Class<? extends Quaternionf> getReturnType() {
+		return Quaternionf.class;
+	}
+
+	@Override
+	protected String getPropertyName() {
+		return (left ? "left" : "right") + " transformation rotation";
+	}
+
+}
diff --git a/src/main/java/org/skriptlang/skript/bukkit/displays/generic/ExprDisplayTransformationScaleTranslation.java b/src/main/java/org/skriptlang/skript/bukkit/displays/generic/ExprDisplayTransformationScaleTranslation.java
new file mode 100644
index 00000000000..2f28bbca976
--- /dev/null
+++ b/src/main/java/org/skriptlang/skript/bukkit/displays/generic/ExprDisplayTransformationScaleTranslation.java
@@ -0,0 +1,82 @@
+package org.skriptlang.skript.bukkit.displays.generic;
+
+import ch.njol.skript.classes.Changer.ChangeMode;
+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.expressions.base.SimplePropertyExpression;
+import ch.njol.skript.lang.Expression;
+import ch.njol.skript.lang.SkriptParser.ParseResult;
+import ch.njol.util.Kleenean;
+import ch.njol.util.coll.CollectionUtils;
+import org.bukkit.entity.Display;
+import org.bukkit.event.Event;
+import org.bukkit.util.Transformation;
+import org.bukkit.util.Vector;
+import org.jetbrains.annotations.Nullable;
+import org.joml.Vector3f;
+
+@Name("Display Transformation Scale/Translation")
+@Description("Returns or changes the transformation scale or translation of <a href='classes.html#display'>displays</a>.")
+@Examples("set transformation translation of display to vector from -0.5, -0.5, -0.5 # Center the display in the same position as a block")
+@Since("2.10")
+public class ExprDisplayTransformationScaleTranslation extends SimplePropertyExpression<Display, Vector> {
+
+	static {
+		register(ExprDisplayTransformationScaleTranslation.class, Vector.class, "(display|[display] transformation) (:scale|translation)", "displays");
+	}
+
+	private boolean scale;
+
+	@Override
+	public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelayed, ParseResult parseResult) {
+		scale = parseResult.hasTag("scale");
+		return super.init(exprs, matchedPattern, isDelayed, parseResult);
+	}
+
+	@Override
+	public @Nullable Vector convert(Display display) {
+		Transformation transformation = display.getTransformation();
+		return Vector.fromJOML(scale ? transformation.getScale() : transformation.getTranslation());
+	}
+
+	public Class<?> @Nullable [] acceptChange(ChangeMode mode) {
+		return switch (mode) {
+			case SET, RESET -> CollectionUtils.array(Vector.class);
+			default -> null;
+		};
+	}
+
+	@Override
+	public void change(Event event, Object @Nullable [] delta, ChangeMode mode) {
+		Vector3f vector = null;
+		if (mode == ChangeMode.RESET)
+			vector = scale ? new Vector3f(1F, 1F, 1F) : new Vector3f(0F, 0F, 0F);
+		if (delta != null)
+			vector = ((Vector) delta[0]).toVector3f();
+		if (vector == null || !vector.isFinite())
+			return;
+		for (Display display : getExpr().getArray(event)) {
+			Transformation transformation = display.getTransformation();
+			Transformation change;
+			if (scale) {
+				change = new Transformation(transformation.getTranslation(), transformation.getLeftRotation(), vector, transformation.getRightRotation());
+			} else {
+				change = new Transformation(vector, transformation.getLeftRotation(), transformation.getScale(), transformation.getRightRotation());
+			}
+			display.setTransformation(change);
+		}
+	}
+
+	@Override
+	public Class<? extends Vector> getReturnType() {
+		return Vector.class;
+	}
+
+	@Override
+	protected String getPropertyName() {
+		return "transformation " + (scale ? "scale" : "translation");
+	}
+
+}
diff --git a/src/main/java/org/skriptlang/skript/bukkit/displays/generic/ExprDisplayViewRange.java b/src/main/java/org/skriptlang/skript/bukkit/displays/generic/ExprDisplayViewRange.java
new file mode 100644
index 00000000000..95054da4898
--- /dev/null
+++ b/src/main/java/org/skriptlang/skript/bukkit/displays/generic/ExprDisplayViewRange.java
@@ -0,0 +1,78 @@
+package org.skriptlang.skript.bukkit.displays.generic;
+
+import ch.njol.skript.classes.Changer.ChangeMode;
+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.expressions.base.SimplePropertyExpression;
+import ch.njol.util.coll.CollectionUtils;
+import org.bukkit.entity.Display;
+import org.bukkit.event.Event;
+import org.jetbrains.annotations.Nullable;
+
+@Name("Display View Range")
+@Description({
+	"Returns or changes the view range of <a href='classes.html#display'>displays</a>.",
+	"Default value is 1.0. This value is then multiplied by 64 and the player's entity view distance setting to determine the actual range.",
+	"For example, a player with 150% entity view distance will see a block display with a view range of 1.2 at 1.2 * 64 * 150% = 115.2 blocks away."
+})
+@Examples("set view range of the last spawned text display to 2.9")
+@Since("2.10")
+public class ExprDisplayViewRange extends SimplePropertyExpression<Display, Float> {
+
+	static {
+		registerDefault(ExprDisplayViewRange.class, Float.class, "[display] view (range|radius)", "displays");
+	}
+
+	@Override
+	public @Nullable Float convert(Display display) {
+		return display.getViewRange();
+	}
+
+	public Class<?> @Nullable [] acceptChange(ChangeMode mode) {
+		return switch (mode) {
+			case ADD, SET, REMOVE -> CollectionUtils.array(Number.class);
+			case RESET -> CollectionUtils.array();
+			default -> null;
+		};
+	}
+
+	@Override
+	public void change(Event event, Object @Nullable [] delta, ChangeMode mode) {
+		Display[] displays = getExpr().getArray(event);
+		float change = delta == null ? 1F : ((Number) delta[0]).floatValue();
+		if (Float.isNaN(change) || Float.isInfinite(change))
+			return;
+		switch (mode) {
+			case REMOVE:
+				change = -change;
+				//$FALL-THROUGH$
+			case ADD:
+				for (Display display : displays) {
+					float value = Math.max(0F, display.getViewRange() + change);
+					if (Float.isInfinite(value))
+						continue;
+					display.setViewRange(value);
+				}
+				break;
+			case RESET:
+			case SET:
+				change = Math.max(0F, change);
+				for (Display display : displays)
+					display.setViewRange(change);
+				break;
+		}
+	}
+
+	@Override
+	public Class<? extends Float> getReturnType() {
+		return Float.class;
+	}
+
+	@Override
+	protected String getPropertyName() {
+		return "view range";
+	}
+
+}
diff --git a/src/main/java/org/skriptlang/skript/bukkit/displays/item/ExprItemDisplayTransform.java b/src/main/java/org/skriptlang/skript/bukkit/displays/item/ExprItemDisplayTransform.java
new file mode 100644
index 00000000000..7105d996915
--- /dev/null
+++ b/src/main/java/org/skriptlang/skript/bukkit/displays/item/ExprItemDisplayTransform.java
@@ -0,0 +1,64 @@
+package org.skriptlang.skript.bukkit.displays.item;
+
+import ch.njol.skript.classes.Changer.ChangeMode;
+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.expressions.base.SimplePropertyExpression;
+import ch.njol.util.coll.CollectionUtils;
+import org.bukkit.entity.Display;
+import org.bukkit.entity.ItemDisplay;
+import org.bukkit.entity.ItemDisplay.ItemDisplayTransform;
+import org.bukkit.event.Event;
+import org.jetbrains.annotations.Nullable;
+
+@Name("Item Display Transform")
+@Description("Returns or changes the <a href='classes.html#itemdisplaytransform'>item display transform</a> of <a href='classes.html#display'>item displays</a>.")
+@Examples({
+	"set the item transform of the last spawned item display to first person left handed",
+	"set the item transform of the last spawned item display to no transform # Reset to default"
+})
+@Since("2.10")
+public class ExprItemDisplayTransform extends SimplePropertyExpression<Display, ItemDisplayTransform> {
+
+	static {
+		registerDefault(ExprItemDisplayTransform.class, ItemDisplayTransform.class, "item [display] transform", "displays");
+	}
+
+	@Override
+	public @Nullable ItemDisplayTransform convert(Display display) {
+		if (display instanceof ItemDisplay itemDisplay)
+			return itemDisplay.getItemDisplayTransform();
+		return null;
+	}
+
+	public Class<?> @Nullable [] acceptChange(ChangeMode mode) {
+		return switch (mode) {
+			case RESET -> CollectionUtils.array();
+			case SET -> CollectionUtils.array(ItemDisplayTransform.class);
+			default -> null;
+		};
+	}
+
+	@Override
+	public void change(Event event, Object @Nullable [] delta, ChangeMode mode) {
+		//noinspection ConstantConditions
+		ItemDisplayTransform transform = mode == ChangeMode.SET ? (ItemDisplayTransform) delta[0] : ItemDisplayTransform.NONE;
+		for (Display display : getExpr().getArray(event)) {
+			if (display instanceof ItemDisplay itemDisplay)
+				itemDisplay.setItemDisplayTransform(transform);
+		}
+	}
+
+	@Override
+	public Class<? extends ItemDisplayTransform> getReturnType() {
+		return ItemDisplayTransform.class;
+	}
+
+	@Override
+	protected String getPropertyName() {
+		return "item display transform";
+	}
+
+}
diff --git a/src/main/java/org/skriptlang/skript/bukkit/displays/text/CondTextDisplayHasDropShadow.java b/src/main/java/org/skriptlang/skript/bukkit/displays/text/CondTextDisplayHasDropShadow.java
new file mode 100644
index 00000000000..fa84f99c891
--- /dev/null
+++ b/src/main/java/org/skriptlang/skript/bukkit/displays/text/CondTextDisplayHasDropShadow.java
@@ -0,0 +1,56 @@
+package org.skriptlang.skript.bukkit.displays.text;
+
+import ch.njol.skript.Skript;
+import ch.njol.skript.conditions.base.PropertyCondition;
+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.SkriptParser.ParseResult;
+import ch.njol.util.Kleenean;
+import org.bukkit.entity.Display;
+import org.bukkit.entity.TextDisplay;
+
+@Name("Text Display Has Drop Shadow")
+@Description("Returns whether the text of a display has drop shadow applied.")
+@Examples({
+	"if {_display} has drop shadow:",
+		"\tremove drop shadow from the text of {_display}"
+})
+@Since("2.10")
+public class CondTextDisplayHasDropShadow extends PropertyCondition<Display> {
+
+	static {
+		Skript.registerCondition(CondTextDisplayHasDropShadow.class,
+				"[[the] text of] %displays% (has|have) [a] (drop|text) shadow",
+				"%displays%'[s] text (has|have) [a] (drop|text) shadow",
+				"[[the] text of] %displays% (doesn't|does not|do not|don't) have [a] (drop|text) shadow",
+				"%displays%'[s] text (doesn't|does not|do not|don't) have [a] (drop|text) shadow"
+			);
+	}
+
+	@Override
+	public boolean init(Expression<?>[] expressions, int matchedPattern, Kleenean isDelayed, ParseResult parseResult) {
+		if (!super.init(expressions, matchedPattern, isDelayed, parseResult))
+			return false;
+		setNegated(matchedPattern > 1);
+		return true;
+	}
+
+	@Override
+	public boolean check(Display value) {
+		return value instanceof TextDisplay textDisplay && textDisplay.isShadowed();
+	}
+
+	@Override
+	protected PropertyType getPropertyType() {
+		return PropertyType.HAVE;
+	}
+
+	@Override
+	protected String getPropertyName() {
+		return "drop shadow";
+	}
+
+}
diff --git a/src/main/java/org/skriptlang/skript/bukkit/displays/text/CondTextDisplaySeeThroughBlocks.java b/src/main/java/org/skriptlang/skript/bukkit/displays/text/CondTextDisplaySeeThroughBlocks.java
new file mode 100644
index 00000000000..ef11ffc779b
--- /dev/null
+++ b/src/main/java/org/skriptlang/skript/bukkit/displays/text/CondTextDisplaySeeThroughBlocks.java
@@ -0,0 +1,34 @@
+package org.skriptlang.skript.bukkit.displays.text;
+
+import ch.njol.skript.conditions.base.PropertyCondition;
+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 org.bukkit.entity.Display;
+import org.bukkit.entity.TextDisplay;
+
+@Name("Text Display Visible Through Blocks")
+@Description("Returns whether text displays can be seen through blocks or not.")
+@Examples({
+	"if last spawned text display is visible through walls:",
+		"\tprevent last spawned text display from being visible through walls"
+})
+@Since("2.10")
+public class CondTextDisplaySeeThroughBlocks extends PropertyCondition<Display> {
+
+	static {
+		register(CondTextDisplaySeeThroughBlocks.class, "visible through (blocks|walls)", "displays");
+	}
+
+	@Override
+	public boolean check(Display value) {
+		return value instanceof TextDisplay textDisplay && textDisplay.isSeeThrough();
+	}
+
+	@Override
+	protected String getPropertyName() {
+		return "visible through blocks";
+	}
+
+}
diff --git a/src/main/java/org/skriptlang/skript/bukkit/displays/text/EffTextDisplayDropShadow.java b/src/main/java/org/skriptlang/skript/bukkit/displays/text/EffTextDisplayDropShadow.java
new file mode 100644
index 00000000000..ef6082b6dbe
--- /dev/null
+++ b/src/main/java/org/skriptlang/skript/bukkit/displays/text/EffTextDisplayDropShadow.java
@@ -0,0 +1,62 @@
+package org.skriptlang.skript.bukkit.displays.text;
+
+import ch.njol.skript.Skript;
+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.Effect;
+import ch.njol.skript.lang.Expression;
+import ch.njol.skript.lang.SkriptParser.ParseResult;
+import ch.njol.util.Kleenean;
+import org.bukkit.entity.Display;
+import org.bukkit.entity.TextDisplay;
+import org.bukkit.event.Event;
+import org.jetbrains.annotations.Nullable;
+
+@Name("Text Display Drop Shadow")
+@Description("Applies or removes drop shadow from the displayed text on a text display.")
+@Examples({
+	"apply drop shadow to last spawned text display",
+	"if {_display} has drop shadow:",
+		"\tremove drop shadow from the text of {_display}"
+})
+@Since("2.10")
+public class EffTextDisplayDropShadow extends Effect {
+
+	static {
+		Skript.registerEffect(EffTextDisplayDropShadow.class,
+				"(apply|add) (drop|text) shadow to [[the] text of] %displays%",
+				"(apply|add) (drop|text) shadow to %displays%'[s] text",
+				"(remove|clear) (drop|text) shadow from [[the] text of] %displays%",
+				"(remove|clear) (drop|text) shadow from %displays%'[s] text"
+			);
+	}
+
+	private Expression<Display> displays;
+	private boolean addShadow;
+
+	@Override
+	public boolean init(Expression<?>[] expressions, int matchedPattern, Kleenean isDelayed, ParseResult parseResult) {
+		//noinspection unchecked
+		displays = (Expression<Display>) expressions[0];
+		addShadow = matchedPattern <= 1;
+		return true;
+	}
+
+	@Override
+	protected void execute(Event event) {
+		for (Display display : displays.getArray(event)) {
+			if (display instanceof TextDisplay textDisplay)
+				textDisplay.setShadowed(addShadow);
+		}
+	}
+
+	@Override
+	public String toString(@Nullable Event event, boolean debug) {
+		if (addShadow)
+			return "add drop shadow to " + displays.toString(event, debug);
+		return "remove drop shadow from " + displays.toString(event, debug);
+	}
+
+}
diff --git a/src/main/java/org/skriptlang/skript/bukkit/displays/text/EffTextDisplaySeeThroughBlocks.java b/src/main/java/org/skriptlang/skript/bukkit/displays/text/EffTextDisplaySeeThroughBlocks.java
new file mode 100644
index 00000000000..4753e6791ae
--- /dev/null
+++ b/src/main/java/org/skriptlang/skript/bukkit/displays/text/EffTextDisplaySeeThroughBlocks.java
@@ -0,0 +1,60 @@
+package org.skriptlang.skript.bukkit.displays.text;
+
+import ch.njol.skript.Skript;
+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.Effect;
+import ch.njol.skript.lang.Expression;
+import ch.njol.skript.lang.SkriptParser.ParseResult;
+import ch.njol.util.Kleenean;
+import org.bukkit.entity.Display;
+import org.bukkit.entity.TextDisplay;
+import org.bukkit.event.Event;
+import org.jetbrains.annotations.Nullable;
+
+@Name("Text Display See Through Blocks")
+@Description("Forces a text display to either be or not be visible through blocks.")
+@Examples({
+	"force last spawned text display to be visible through walls",
+	"prevent all text displays from being visible through walls"
+})
+@Since("2.10")
+public class EffTextDisplaySeeThroughBlocks extends Effect {
+
+	static {
+		Skript.registerEffect(EffTextDisplaySeeThroughBlocks.class,
+				"make %displays% visible through (blocks|walls)",
+				"force %displays% to be visible through (blocks|walls)",
+				"(prevent|block) %displays% from being (visible|seen) through (blocks|walls)"
+			);
+	}
+
+	Expression<Display> displays;
+	boolean canSee;
+
+	@Override
+	public boolean init(Expression<?>[] expressions, int matchedPattern, Kleenean isDelayed, ParseResult parseResult) {
+		//noinspection unchecked
+		displays = (Expression<Display>) expressions[0];
+		canSee = matchedPattern != 2;
+		return true;
+	}
+
+	@Override
+	protected void execute(Event event) {
+		for (Display display : displays.getArray(event)) {
+			if (display instanceof TextDisplay textDisplay)
+				textDisplay.setSeeThrough(canSee);
+		}
+	}
+
+	@Override
+	public String toString(@Nullable Event event, boolean debug) {
+		if (canSee)
+			return "force " + displays.toString(event, debug) + " to be visible through blocks";
+		return "prevent " + displays.toString(event, debug) + " from being visible through blocks";
+	}
+
+}
diff --git a/src/main/java/org/skriptlang/skript/bukkit/displays/text/ExprTextDisplayAlignment.java b/src/main/java/org/skriptlang/skript/bukkit/displays/text/ExprTextDisplayAlignment.java
new file mode 100644
index 00000000000..64cd0786d07
--- /dev/null
+++ b/src/main/java/org/skriptlang/skript/bukkit/displays/text/ExprTextDisplayAlignment.java
@@ -0,0 +1,61 @@
+package org.skriptlang.skript.bukkit.displays.text;
+
+import ch.njol.skript.classes.Changer.ChangeMode;
+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.expressions.base.SimplePropertyExpression;
+import ch.njol.util.coll.CollectionUtils;
+import org.bukkit.entity.Display;
+import org.bukkit.entity.TextDisplay;
+import org.bukkit.entity.TextDisplay.TextAlignment;
+import org.bukkit.event.Event;
+import org.jetbrains.annotations.Nullable;
+
+@Name("Text Display Alignment")
+@Description("Returns or changes the <a href='classes.html#textalignment'>alignment</a> setting of <a href='classes.html#display'>text displays</a>.")
+@Examples("set text alignment of the last spawned text display to left")
+@Since("2.10")
+public class ExprTextDisplayAlignment extends SimplePropertyExpression<Display, TextAlignment> {
+
+	static {
+		registerDefault(ExprTextDisplayAlignment.class, TextAlignment.class, "text alignment[s]", "displays");
+	}
+
+	@Override
+	public @Nullable TextAlignment convert(Display display) {
+		if (display instanceof TextDisplay textDisplay)
+			return textDisplay.getAlignment();
+		return null;
+	}
+
+	public Class<?> @Nullable [] acceptChange(ChangeMode mode) {
+		return switch (mode) {
+			case RESET -> CollectionUtils.array();
+			case SET -> CollectionUtils.array(TextAlignment.class);
+			default -> null;
+		};
+	}
+
+	@Override
+	public void change(Event event, Object @Nullable [] delta, ChangeMode mode) {
+		//noinspection ConstantConditions
+		TextAlignment alignment = mode == ChangeMode.RESET ? TextAlignment.CENTER : (TextAlignment) delta[0];
+		for (Display display : getExpr().getArray(event)) {
+			if (display instanceof TextDisplay textDisplay)
+				textDisplay.setAlignment(alignment);
+		}
+	}
+
+	@Override
+	public Class<? extends TextAlignment> getReturnType() {
+		return TextAlignment.class;
+	}
+
+	@Override
+	protected String getPropertyName() {
+		return "text alignment";
+	}
+
+}
diff --git a/src/main/java/org/skriptlang/skript/bukkit/displays/text/ExprTextDisplayLineWidth.java b/src/main/java/org/skriptlang/skript/bukkit/displays/text/ExprTextDisplayLineWidth.java
new file mode 100644
index 00000000000..3c5baa45ce8
--- /dev/null
+++ b/src/main/java/org/skriptlang/skript/bukkit/displays/text/ExprTextDisplayLineWidth.java
@@ -0,0 +1,77 @@
+package org.skriptlang.skript.bukkit.displays.text;
+
+import ch.njol.skript.classes.Changer.ChangeMode;
+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.expressions.base.SimplePropertyExpression;
+import ch.njol.util.coll.CollectionUtils;
+import org.bukkit.entity.Display;
+import org.bukkit.entity.TextDisplay;
+import org.bukkit.event.Event;
+import org.jetbrains.annotations.Nullable;
+
+@Name("Text Display Line Width")
+@Description("Returns or changes the line width of <a href='classes.html#display'>text displays</a>. Default is 200.")
+@Examples("set the line width of the last spawned text display to 300")
+@Since("2.10")
+public class ExprTextDisplayLineWidth extends SimplePropertyExpression<Display, Integer> {
+
+	static {
+		registerDefault(ExprTextDisplayLineWidth.class, Integer.class, "line width", "displays");
+	}
+
+	@Override
+	public @Nullable Integer convert(Display display) {
+		if (display instanceof TextDisplay textDisplay)
+			return textDisplay.getLineWidth();
+		return null;
+	}
+
+	public Class<?> @Nullable [] acceptChange(ChangeMode mode) {
+		return switch (mode) {
+			case ADD, REMOVE, SET -> CollectionUtils.array(Number.class);
+			case RESET -> CollectionUtils.array();
+			default -> null;
+		};
+	}
+
+	@Override
+	public void change(Event event, Object @Nullable [] delta, ChangeMode mode) {
+		Display[] displays = getExpr().getArray(event);
+		int change = delta == null ? 200 : ((Number) delta[0]).intValue();
+		switch (mode) {
+			case REMOVE:
+				change = -change;
+				//$FALL-THROUGH$
+			case ADD:
+				for (Display display : displays) {
+					if (display instanceof TextDisplay textDisplay) {
+						int value = Math.max(0, textDisplay.getLineWidth() + change);
+						textDisplay.setLineWidth(value);
+					}
+				}
+				break;
+			case RESET:
+			case SET:
+				change = Math.max(0, change);
+				for (Display display : displays) {
+					if (display instanceof TextDisplay textDisplay)
+						textDisplay.setLineWidth(change);
+				}
+				break;
+		}
+	}
+
+	@Override
+	public Class<? extends Integer> getReturnType() {
+		return Integer.class;
+	}
+
+	@Override
+	protected String getPropertyName() {
+		return "line width";
+	}
+
+}
diff --git a/src/main/java/org/skriptlang/skript/bukkit/displays/text/ExprTextDisplayOpacity.java b/src/main/java/org/skriptlang/skript/bukkit/displays/text/ExprTextDisplayOpacity.java
new file mode 100644
index 00000000000..ebd0a313eea
--- /dev/null
+++ b/src/main/java/org/skriptlang/skript/bukkit/displays/text/ExprTextDisplayOpacity.java
@@ -0,0 +1,82 @@
+package org.skriptlang.skript.bukkit.displays.text;
+
+import ch.njol.skript.classes.Changer.ChangeMode;
+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.expressions.base.SimplePropertyExpression;
+import ch.njol.util.Math2;
+import ch.njol.util.coll.CollectionUtils;
+import org.bukkit.entity.Display;
+import org.bukkit.entity.TextDisplay;
+import org.bukkit.event.Event;
+import org.jetbrains.annotations.Nullable;
+
+@Name("Text Display Opacity")
+@Description({
+	"Returns or changes the opacity of <a href='classes.html#display'>text displays</a>.",
+	"Values are between -127 and 127. The value of 127 represents it being completely opaque."
+})
+@Examples("set the opacity of the last spawned text display to -1 # Reset")
+@Since("2.10")
+public class ExprTextDisplayOpacity extends SimplePropertyExpression<Display, Byte> {
+
+	static {
+		registerDefault(ExprTextDisplayOpacity.class, Byte.class, "[display] opacity", "displays");
+	}
+
+	@Override
+	public @Nullable Byte convert(Display display) {
+		if (display instanceof TextDisplay textDisplay)
+			return textDisplay.getTextOpacity();
+		return null;
+	}
+
+	public Class<?> @Nullable [] acceptChange(ChangeMode mode) {
+		return switch (mode) {
+			case ADD, REMOVE, RESET, SET -> CollectionUtils.array(Number.class);
+			default -> null;
+		};
+	}
+
+	@Override
+	public void change(Event event, Object @Nullable [] delta, ChangeMode mode) {
+		Display[] displays = getExpr().getArray(event);
+		int change = delta == null ? -1 : ((Number) delta[0]).intValue();
+		switch (mode) {
+			case REMOVE_ALL:
+			case REMOVE:
+				change = -change;
+				//$FALL-THROUGH$
+			case ADD:
+				for (Display display : displays) {
+					if (display instanceof TextDisplay textDisplay) {
+						byte value = (byte) Math2.fit(-127, textDisplay.getTextOpacity() + change, 127);
+						textDisplay.setTextOpacity(value);
+					}
+				}
+				break;
+			case DELETE:
+			case RESET:
+			case SET:
+				change = Math2.fit(-127, change, 127);
+				for (Display display : displays) {
+					if (display instanceof TextDisplay textDisplay)
+						textDisplay.setTextOpacity((byte) change);
+				}
+				break;
+		}
+	}
+
+	@Override
+	public Class<? extends Byte> getReturnType() {
+		return Byte.class;
+	}
+
+	@Override
+	protected String getPropertyName() {
+		return "opacity";
+	}
+
+}
diff --git a/src/main/java/org/skriptlang/skript/bukkit/fishing/FishingModule.java b/src/main/java/org/skriptlang/skript/bukkit/fishing/FishingModule.java
new file mode 100644
index 00000000000..ae56eba499f
--- /dev/null
+++ b/src/main/java/org/skriptlang/skript/bukkit/fishing/FishingModule.java
@@ -0,0 +1,13 @@
+package org.skriptlang.skript.bukkit.fishing;
+
+import ch.njol.skript.Skript;
+
+import java.io.IOException;
+
+public class FishingModule {
+
+	public static void load() throws IOException {
+		Skript.getAddonInstance().loadClasses("org.skriptlang.skript.bukkit.fishing", "elements");
+	}
+
+}
diff --git a/src/main/java/org/skriptlang/skript/bukkit/fishing/elements/CondFishingLure.java b/src/main/java/org/skriptlang/skript/bukkit/fishing/elements/CondFishingLure.java
new file mode 100644
index 00000000000..6a0ebf0b418
--- /dev/null
+++ b/src/main/java/org/skriptlang/skript/bukkit/fishing/elements/CondFishingLure.java
@@ -0,0 +1,55 @@
+package org.skriptlang.skript.bukkit.fishing.elements;
+
+import ch.njol.skript.Skript;
+import ch.njol.skript.doc.*;
+import ch.njol.skript.lang.Condition;
+import ch.njol.skript.lang.Expression;
+import ch.njol.skript.lang.SkriptParser.ParseResult;
+import ch.njol.util.Kleenean;
+import org.bukkit.event.Event;
+import org.bukkit.event.player.PlayerFishEvent;
+import org.jetbrains.annotations.Nullable;
+
+@Name("Fishing Lure Applied")
+@Description("Checks if the lure enchantment is applied to the current fishing event.")
+@Examples({
+	"on fishing line cast:",
+		"\tif lure enchantment is applied:",
+			"\t\tcancel event"
+})
+@Events("Fishing")
+@Since("2.10")
+public class CondFishingLure extends Condition {
+
+	static  {
+		Skript.registerCondition(CondFishingLure.class,
+			"lure enchantment bonus is (applied|active)",
+			"lure enchantment bonus is(n't| not) (applied|active)");
+	}
+
+	@Override
+	public boolean init(Expression<?>[] expressions, int matchedPattern,
+						Kleenean isDelayed, ParseResult parseResult) {
+		if (!getParser().isCurrentEvent(PlayerFishEvent.class)) {
+			Skript.error("The 'lure enchantment' condition can only be used in a fishing event.");
+			return false;
+		}
+
+		setNegated(matchedPattern == 1);
+		return true;
+	}
+
+	@Override
+	public boolean check(Event event) {
+		if (!(event instanceof PlayerFishEvent fishEvent))
+			return false;
+
+		return fishEvent.getHook().getApplyLure() ^ isNegated();
+	}
+
+	@Override
+	public String toString(@Nullable Event event, boolean debug) {
+		return "lure enchantment " + (isNegated() ? "is" : "isn't") + " applied";
+	}
+
+}
diff --git a/src/main/java/org/skriptlang/skript/bukkit/fishing/elements/CondIsInOpenWater.java b/src/main/java/org/skriptlang/skript/bukkit/fishing/elements/CondIsInOpenWater.java
new file mode 100644
index 00000000000..f3ec6701b2f
--- /dev/null
+++ b/src/main/java/org/skriptlang/skript/bukkit/fishing/elements/CondIsInOpenWater.java
@@ -0,0 +1,41 @@
+package org.skriptlang.skript.bukkit.fishing.elements;
+
+import ch.njol.skript.conditions.base.PropertyCondition;
+import ch.njol.skript.doc.*;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.FishHook;
+
+@Name("Is Fish Hook in Open Water")
+@Description({
+	"Checks whether the fish hook is in open water.",
+	"Open water is defined by a 5x4x5 area of water, air and lily pads. " +
+	"If in open water, treasure items may be caught."
+})
+@Examples({
+	"on fish catch:",
+		"\tif fish hook is in open water:",
+			"\t\tsend \"You will catch a shark soon!\""
+})
+@Events("Fishing")
+@Since("2.10")
+public class CondIsInOpenWater extends PropertyCondition<Entity> {
+	
+	static {
+		register(CondIsInOpenWater.class, PropertyType.BE,
+			"in open water[s]", "entities");
+	}
+
+	@Override
+	public boolean check(Entity entity) {
+		if (!(entity instanceof FishHook hook))
+			return false;
+
+		return hook.isInOpenWater();
+	}
+
+	@Override
+	protected String getPropertyName() {
+		return "in open water";
+	}
+	
+}
diff --git a/src/main/java/org/skriptlang/skript/bukkit/fishing/elements/EffFishingLure.java b/src/main/java/org/skriptlang/skript/bukkit/fishing/elements/EffFishingLure.java
new file mode 100644
index 00000000000..5efa6dcc7a6
--- /dev/null
+++ b/src/main/java/org/skriptlang/skript/bukkit/fishing/elements/EffFishingLure.java
@@ -0,0 +1,55 @@
+package org.skriptlang.skript.bukkit.fishing.elements;
+
+import ch.njol.skript.Skript;
+import ch.njol.skript.doc.*;
+import ch.njol.skript.lang.Effect;
+import ch.njol.skript.lang.Expression;
+import ch.njol.skript.lang.SkriptParser.ParseResult;
+import ch.njol.util.Kleenean;
+import org.bukkit.event.Event;
+import org.bukkit.event.player.PlayerFishEvent;
+import org.jetbrains.annotations.Nullable;
+
+@Name("Apply Fishing Lure")
+@Description("Sets whether the lure enchantment should be applied, which reduces the wait time.")
+@Examples({
+	"on fishing line cast:",
+		"\tapply lure enchantment bonus"
+})
+@Events("Fishing")
+@Since("2.10")
+public class EffFishingLure extends Effect {
+
+	static {
+		Skript.registerEffect(EffFishingLure.class,
+			"apply [the] lure enchantment bonus",
+			"remove [the] lure enchantment bonus");
+	}
+
+	private boolean remove;
+
+	@Override
+	public boolean init(Expression<?>[] expressions, int matchedPattern,
+						Kleenean isDelayed, ParseResult parseResult) {
+		if (!getParser().isCurrentEvent(PlayerFishEvent.class)) {
+			Skript.error("The 'fishing hook lure' effect can only be used in a fishing event.");
+			return false;
+		}
+		remove = matchedPattern == 1;
+		return true;
+	}
+
+	@Override
+	protected void execute(Event event) {
+		if (!(event instanceof PlayerFishEvent fishEvent))
+			return;
+
+		fishEvent.getHook().setApplyLure(!remove);
+	}
+
+	@Override
+	public String toString(@Nullable Event event, boolean debug) {
+		return (remove ? "remove" : "apply") + " the lure enchantment bonus";
+	}
+
+}
diff --git a/src/main/java/org/skriptlang/skript/bukkit/fishing/elements/EffPullHookedEntity.java b/src/main/java/org/skriptlang/skript/bukkit/fishing/elements/EffPullHookedEntity.java
new file mode 100644
index 00000000000..c3845057cf8
--- /dev/null
+++ b/src/main/java/org/skriptlang/skript/bukkit/fishing/elements/EffPullHookedEntity.java
@@ -0,0 +1,50 @@
+package org.skriptlang.skript.bukkit.fishing.elements;
+
+import ch.njol.skript.Skript;
+import ch.njol.skript.doc.*;
+import ch.njol.skript.lang.Effect;
+import ch.njol.skript.lang.Expression;
+import ch.njol.skript.lang.SkriptParser.ParseResult;
+import ch.njol.util.Kleenean;
+import org.bukkit.event.Event;
+import org.bukkit.event.player.PlayerFishEvent;
+import org.jetbrains.annotations.Nullable;
+
+@Name("Pull In Hooked Entity")
+@Description("Pull the hooked entity to the player.")
+@Examples({
+	"on fishing state of caught entity:",
+		"\tpull in hooked entity"
+})
+@Events("Fishing")
+@Since("2.10")
+public class EffPullHookedEntity extends Effect {
+
+	static {
+		Skript.registerEffect(EffPullHookedEntity.class, "(reel|pull) in hook[ed] entity");
+	}
+
+	@Override
+	public boolean init(Expression<?>[] expressions, int matchedPattern,
+						Kleenean isDelayed, ParseResult parseResult) {
+		if (!getParser().isCurrentEvent(PlayerFishEvent.class)) {
+			Skript.error("The 'pull in hooked entity' effect can only be used in the fishing event.");
+			return false;
+		}
+		return true;
+	}
+
+	@Override
+	protected void execute(Event event) {
+		if (!(event instanceof PlayerFishEvent fishEvent))
+			return;
+
+		fishEvent.getHook().pullHookedEntity();
+	}
+
+	@Override
+	public String toString(@Nullable Event event, boolean debug) {
+		return "pull in hooked entity";
+	}
+
+}
diff --git a/src/main/java/org/skriptlang/skript/bukkit/fishing/elements/EvtBucketEntity.java b/src/main/java/org/skriptlang/skript/bukkit/fishing/elements/EvtBucketEntity.java
new file mode 100644
index 00000000000..b0a3ba6c188
--- /dev/null
+++ b/src/main/java/org/skriptlang/skript/bukkit/fishing/elements/EvtBucketEntity.java
@@ -0,0 +1,71 @@
+package org.skriptlang.skript.bukkit.fishing.elements;
+
+import ch.njol.skript.Skript;
+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.entity.EntityData;
+import ch.njol.skript.lang.Literal;
+import ch.njol.skript.lang.SkriptEvent;
+import ch.njol.skript.lang.SkriptParser.ParseResult;
+import ch.njol.skript.registrations.EventValues;
+import ch.njol.util.StringUtils;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.Player;
+import org.bukkit.event.Event;
+import org.bukkit.event.player.PlayerBucketEntityEvent;
+import org.bukkit.event.player.PlayerEvent;
+import org.bukkit.inventory.ItemStack;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.Arrays;
+import java.util.List;
+
+@Name("Bucket Catch Entity")
+@Description("Called when a player catches an entity in a bucket.")
+@Examples({
+	"on bucket catch of a puffer fish:",
+		"\tsend \"You caught a fish with a %future event-item%!\" to player"
+})
+@Since("2.10")
+public class EvtBucketEntity extends SkriptEvent {
+
+	static {
+		Skript.registerEvent("Bucket Catch Entity", EvtBucketEntity.class, PlayerBucketEntityEvent.class,
+			"bucket (catch[ing]|captur(e|ing)) [[of] %-entitydatas%]");
+
+		EventValues.registerEventValue(PlayerBucketEntityEvent.class, ItemStack.class, PlayerBucketEntityEvent::getOriginalBucket);
+		EventValues.registerEventValue(PlayerBucketEntityEvent.class, ItemStack.class, PlayerBucketEntityEvent::getEntityBucket, EventValues.TIME_FUTURE);
+		EventValues.registerEventValue(PlayerBucketEntityEvent.class, Player.class, PlayerEvent::getPlayer);
+		EventValues.registerEventValue(PlayerBucketEntityEvent.class, Entity.class, PlayerBucketEntityEvent::getEntity);
+	}
+
+	private EntityData<?>[] entities;
+
+	@Override
+	public boolean init(Literal<?>[] args, int matchedPattern, ParseResult parseResult) {
+		if (args[0] != null)
+			//noinspection unchecked
+			entities = ((Literal<EntityData<?>>) args[0]).getAll();
+
+		return true;
+	}
+
+	@Override
+	public boolean check(Event event) {
+		if (!(event instanceof PlayerBucketEntityEvent bucketEvent))
+			return false;
+
+		return entities == null || entities.length == 0 || Arrays.stream(entities)
+			.map(EntityData::getType)
+			.anyMatch(it -> it.isInstance(bucketEvent.getEntity()));
+	}
+
+	@Override
+	public String toString(@Nullable Event event, boolean debug) {
+		return "bucket catch" + (entities.length == 0 ? "" :
+				" of " + StringUtils.join(List.of(entities), ", ", " and "));
+	}
+
+}
diff --git a/src/main/java/org/skriptlang/skript/bukkit/fishing/elements/EvtFish.java b/src/main/java/org/skriptlang/skript/bukkit/fishing/elements/EvtFish.java
new file mode 100644
index 00000000000..8e1bdf3e520
--- /dev/null
+++ b/src/main/java/org/skriptlang/skript/bukkit/fishing/elements/EvtFish.java
@@ -0,0 +1,98 @@
+package org.skriptlang.skript.bukkit.fishing.elements;
+
+import ch.njol.skript.Skript;
+import ch.njol.skript.lang.Literal;
+import ch.njol.skript.lang.SkriptEvent;
+import ch.njol.skript.lang.SkriptParser.ParseResult;
+import ch.njol.skript.registrations.EventValues;
+import org.bukkit.entity.Entity;
+import org.bukkit.event.Event;
+import org.bukkit.event.player.PlayerFishEvent;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class EvtFish extends SkriptEvent {
+
+	private enum State {
+
+		FISHING(PlayerFishEvent.State.FISHING, "[fishing] (line|rod) cast", "fishing line cast"),
+		CAUGHT_FISH(PlayerFishEvent.State.CAUGHT_FISH, "fish (caught|catch)", "fish caught"),
+		CAUGHT_ENTITY(PlayerFishEvent.State.CAUGHT_ENTITY, "entity (hook[ed]|caught|catch)", "entity hooked"),
+		IN_GROUND(PlayerFishEvent.State.IN_GROUND, "(bobber|hook) (in|hit) ground", "bobber hit ground"),
+		FISH_ESCAPE(PlayerFishEvent.State.FAILED_ATTEMPT, "fish (escape|get away)", "fish escape"),
+		REEL_IN(PlayerFishEvent.State.REEL_IN, "[fishing] (rod|line) reel in", "fishing rod reel in"),
+		BITE(PlayerFishEvent.State.BITE, "fish bit(e|ing)", "fish bite"),
+		LURED(getOptional("LURED"), "(fish approach[ing]|(bobber|hook) lure[d])", "fish approaching");
+
+		private final @Nullable PlayerFishEvent.State state;
+		private final String pattern;
+		private final String toString;
+
+		State(@Nullable PlayerFishEvent.State state, @NotNull String pattern, @NotNull String toString) {
+			this.state = state;
+			this.pattern = pattern;
+			this.toString = toString;
+		}
+
+		private static PlayerFishEvent.State getOptional(String name) {
+			try {
+				return PlayerFishEvent.State.valueOf(name);
+			} catch (IllegalArgumentException ex) {
+				return null;
+			}
+		}
+	}
+
+	static {
+		List<String> patterns = new ArrayList<>();
+		for (State state : State.values()) {
+			if (state.state == null)
+				continue;
+
+			patterns.add(state.pattern);
+		}
+
+		Skript.registerEvent("Fishing", EvtFish.class, PlayerFishEvent.class, patterns.toArray(new String[0]))
+			.description(
+				"Called when a player triggers a fishing event.",
+				"An entity hooked event is triggered when an entity gets caught by a fishing rod.",
+				"A fish escape event is called when the player fails to click on time, and the fish escapes.",
+				"A fish approaching event is when the bobber is waiting to be hooked, and a fish is approaching."
+			)
+			.examples(
+				"on fishing line cast:",
+					"\tsend \"You caught a fish!\" to player",
+				"on fishing state of caught entity:",
+					"\tpush event-entity vector from entity to player"
+			)
+			.requiredPlugins("Paper (bobber lured)")
+			.since("2.10");
+
+		EventValues.registerEventValue(PlayerFishEvent.class, Entity.class, PlayerFishEvent::getCaught);
+	}
+
+	private State state;
+
+	@Override
+	public boolean init(Literal<?>[] args, int matchedPattern, ParseResult parseResult) {
+		state = State.values()[matchedPattern];
+		return true;
+	}
+
+	@Override
+	public boolean check(Event event) {
+		if (!(event instanceof PlayerFishEvent fishEvent))
+			return false;
+
+		return state.state == fishEvent.getState();
+	}
+
+	@Override
+	public String toString(@Nullable Event event, boolean debug) {
+		return state.toString;
+	}
+
+}
diff --git a/src/main/java/org/skriptlang/skript/bukkit/fishing/elements/ExprFishingApproachAngle.java b/src/main/java/org/skriptlang/skript/bukkit/fishing/elements/ExprFishingApproachAngle.java
new file mode 100644
index 00000000000..1d7b920b596
--- /dev/null
+++ b/src/main/java/org/skriptlang/skript/bukkit/fishing/elements/ExprFishingApproachAngle.java
@@ -0,0 +1,128 @@
+package org.skriptlang.skript.bukkit.fishing.elements;
+
+import ch.njol.skript.Skript;
+import ch.njol.skript.classes.Changer.ChangeMode;
+import ch.njol.skript.doc.*;
+import ch.njol.skript.lang.Expression;
+import ch.njol.skript.lang.ExpressionType;
+import ch.njol.skript.lang.SkriptParser.ParseResult;
+import ch.njol.skript.lang.util.SimpleExpression;
+import ch.njol.util.Kleenean;
+import org.bukkit.entity.FishHook;
+import org.bukkit.event.Event;
+import org.bukkit.event.player.PlayerFishEvent;
+import org.jetbrains.annotations.Nullable;
+
+@Name("Fishing Approach Angle")
+@Description({
+	"Returns the angle at which the fish will approach the fishing hook, after the wait time.",
+	"The angle is in degrees, with 0 being positive Z, 90 being negative X, 180 being negative Z, and 270 being positive X.",
+	"By default, returns a value between 0 and 360 degrees."
+})
+@Examples({
+	"on fish approach:",
+		"\tif fishing approach angle is bigger than 300.5 degrees or fishing approach angle is smaller than 59.5 degrees:",
+			"\t\tcancel event"
+})
+@Events("Fishing")
+@Since("2.10")
+public class ExprFishingApproachAngle extends SimpleExpression<Float> {
+
+	private static final float DEFAULT_MINIMUM_DEGREES = 0;
+	private static final float DEFAULT_MAXIMUM_DEGREES = 360;
+
+	static {
+		Skript.registerExpression(ExprFishingApproachAngle.class, Float.class, ExpressionType.EVENT,
+			"(min:min[imum]|max[imum]) fish[ing] approach[ing] angle");
+	}
+
+	private boolean isMin;
+
+	@Override
+	public boolean init(Expression<?>[] expressions, int matchedPattern,
+						Kleenean isDelayed, ParseResult parseResult) {
+		if (!getParser().isCurrentEvent(PlayerFishEvent.class)) {
+			Skript.error("The 'fishing approach angle' expression can only be used in a fishing event.");
+			return false;
+		}
+
+		isMin = parseResult.hasTag("min");
+		return true;
+	}
+
+	@Override
+	protected Float @Nullable [] get(Event event) {
+		if (!(event instanceof PlayerFishEvent fishEvent))
+			return null;
+
+		if (isMin) {
+			return new Float[]{fishEvent.getHook().getMinLureAngle()};
+		} else {
+			return new Float[]{fishEvent.getHook().getMaxLureAngle()};
+		}
+	}
+
+	@Override
+	public Class<?> @Nullable [] acceptChange(ChangeMode mode) {
+		return switch (mode) {
+			case SET, RESET, ADD, REMOVE -> new Class[]{Float.class};
+			default -> null;
+		};
+	}
+
+	@Override
+	public void change(Event event, Object @Nullable [] delta, ChangeMode mode) {
+		if (!(event instanceof PlayerFishEvent fishEvent))
+			return;
+
+		FishHook hook = fishEvent.getHook();
+
+		float angle = mode == ChangeMode.RESET ?
+			(isMin ? DEFAULT_MINIMUM_DEGREES : DEFAULT_MAXIMUM_DEGREES) :
+			(Float) delta[0];
+
+		switch (mode) {
+			case SET, RESET -> {
+				if (isMin) {
+					hook.setMinLureAngle(clamp(angle));
+				} else {
+					hook.setMaxLureAngle(clamp(angle));
+				}
+			}
+			case ADD -> {
+				if (isMin) {
+					hook.setMinLureAngle(clamp(hook.getMinLureAngle() + angle));
+				} else {
+					hook.setMaxLureAngle(clamp(hook.getMaxLureAngle() + angle));
+				}
+			}
+			case REMOVE -> {
+				if (isMin) {
+					hook.setMinLureAngle(clamp(hook.getMinLureAngle() - angle));
+				} else {
+					hook.setMaxLureAngle(clamp(hook.getMaxLureAngle() - angle));
+				}
+			}
+		}
+	}
+
+	private float clamp(float value) {
+		return Math.min(Math.max(value, 0f), 360f);
+	}
+
+	@Override
+	public boolean isSingle() {
+		return true;
+	}
+
+	@Override
+	public Class<? extends Float> getReturnType() {
+		return Float.class;
+	}
+
+	@Override
+	public String toString(@Nullable Event event, boolean debug) {
+		return (isMin ? "minimum" : "maximum") + " fishing approach angle";
+	}
+
+}
diff --git a/src/main/java/org/skriptlang/skript/bukkit/fishing/elements/ExprFishingBiteTime.java b/src/main/java/org/skriptlang/skript/bukkit/fishing/elements/ExprFishingBiteTime.java
new file mode 100644
index 00000000000..77738e9d743
--- /dev/null
+++ b/src/main/java/org/skriptlang/skript/bukkit/fishing/elements/ExprFishingBiteTime.java
@@ -0,0 +1,94 @@
+package org.skriptlang.skript.bukkit.fishing.elements;
+
+import ch.njol.skript.Skript;
+import ch.njol.skript.classes.Changer.ChangeMode;
+import ch.njol.skript.doc.*;
+import ch.njol.skript.lang.Expression;
+import ch.njol.skript.lang.ExpressionType;
+import ch.njol.skript.lang.SkriptParser.ParseResult;
+import ch.njol.skript.lang.util.SimpleExpression;
+import ch.njol.skript.util.Timespan;
+import ch.njol.util.Kleenean;
+import org.bukkit.entity.FishHook;
+import org.bukkit.event.Event;
+import org.bukkit.event.player.PlayerFishEvent;
+import org.jetbrains.annotations.Nullable;
+
+@Name("Fishing Bite Time")
+@Description({
+	"Returns the time it takes a fish to bite the fishing hook, after it started approaching the hook.",
+	"May return a timespan of 0 seconds. If modifying the value, it should be at least 1 tick.",
+})
+@Examples({
+	"on fish approach:",
+	"\tset fishing bite time to 5 seconds",
+})
+@RequiredPlugins("Paper 1.20.6")
+@Events("Fishing")
+@Since("2.10")
+public class ExprFishingBiteTime extends SimpleExpression<Timespan> {
+
+	static {
+		if (Skript.methodExists(FishHook.class, "getTimeUntilBite"))
+			Skript.registerExpression(ExprFishingBiteTime.class, Timespan.class, ExpressionType.EVENT,
+				"fish[ing] bit(e|ing) [wait] time");
+	}
+
+	@Override
+	public boolean init(Expression<?>[] expressions, int matchedPattern,
+						Kleenean isDelayed, ParseResult parseResult) {
+		if (!getParser().isCurrentEvent(PlayerFishEvent.class)) {
+			Skript.error("The 'fishing bite time' expression can only be used in a fishing event.");
+			return false;
+		}
+		return true;
+	}
+
+	@Override
+	protected Timespan @Nullable [] get(Event event) {
+		if (!(event instanceof PlayerFishEvent fishEvent))
+			return null;
+
+		return new Timespan[]{new Timespan(Timespan.TimePeriod.TICK, fishEvent.getHook().getTimeUntilBite())};
+	}
+
+	@Override
+	public @Nullable Class<?>[] acceptChange(ChangeMode mode) {
+		return switch (mode) {
+			case ADD, REMOVE, SET -> new Class[]{Timespan.class};
+			default -> null;
+		};
+	}
+
+	@Override
+	public void change(Event event, Object @Nullable [] delta, ChangeMode mode) {
+		if (!(event instanceof PlayerFishEvent fishEvent))
+			return;
+
+		FishHook hook = fishEvent.getHook();
+
+		int ticks = (int) ((Timespan) delta[0]).getAs(Timespan.TimePeriod.TICK);
+
+		switch (mode) {
+			case SET -> hook.setTimeUntilBite(Math.max(1, ticks));
+			case ADD -> hook.setTimeUntilBite(Math.max(1, hook.getTimeUntilBite() + ticks));
+			case REMOVE -> hook.setTimeUntilBite(Math.max(1, hook.getTimeUntilBite() - ticks));
+		}
+	}
+
+	@Override
+	public boolean isSingle() {
+		return true;
+	}
+
+	@Override
+	public Class<? extends Timespan> getReturnType() {
+		return Timespan.class;
+	}
+
+	@Override
+	public String toString(@Nullable Event event, boolean debug) {
+		return "fishing bite time";
+	}
+
+}
diff --git a/src/main/java/org/skriptlang/skript/bukkit/fishing/elements/ExprFishingHook.java b/src/main/java/org/skriptlang/skript/bukkit/fishing/elements/ExprFishingHook.java
new file mode 100644
index 00000000000..765f678bd5b
--- /dev/null
+++ b/src/main/java/org/skriptlang/skript/bukkit/fishing/elements/ExprFishingHook.java
@@ -0,0 +1,34 @@
+package org.skriptlang.skript.bukkit.fishing.elements;
+
+import ch.njol.skript.doc.*;
+import ch.njol.skript.expressions.base.EventValueExpression;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.FishHook;
+import org.bukkit.event.Event;
+import org.jetbrains.annotations.Nullable;
+
+@Name("Fishing Hook")
+@Description("The <a href='classes.html#entity'>fishing hook</a> in a fishing event.")
+@Examples({
+	"on fish line cast:",
+		"\twait a second",
+		"\tteleport player to fishing hook"
+})
+@Events("Fishing")
+@Since("2.10")
+public class ExprFishingHook extends EventValueExpression<Entity> {
+
+	static {
+		register(ExprFishingHook.class, Entity.class, "fish[ing] (hook|bobber)");
+	}
+
+	public ExprFishingHook() {
+		super(FishHook.class);
+	}
+
+	@Override
+	public String toString(@Nullable Event event, boolean debug) {
+		return "the fishing hook";
+	}
+
+}
diff --git a/src/main/java/org/skriptlang/skript/bukkit/fishing/elements/ExprFishingHookEntity.java b/src/main/java/org/skriptlang/skript/bukkit/fishing/elements/ExprFishingHookEntity.java
new file mode 100644
index 00000000000..fd4bf00d129
--- /dev/null
+++ b/src/main/java/org/skriptlang/skript/bukkit/fishing/elements/ExprFishingHookEntity.java
@@ -0,0 +1,94 @@
+package org.skriptlang.skript.bukkit.fishing.elements;
+
+import ch.njol.skript.Skript;
+import ch.njol.skript.classes.Changer.ChangeMode;
+import ch.njol.skript.doc.*;
+import ch.njol.skript.lang.Expression;
+import ch.njol.skript.lang.ExpressionType;
+import ch.njol.skript.lang.SkriptParser.ParseResult;
+import ch.njol.skript.lang.util.SimpleExpression;
+import ch.njol.util.Kleenean;
+import ch.njol.util.coll.CollectionUtils;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.FishHook;
+import org.bukkit.entity.Player;
+import org.bukkit.event.Event;
+import org.bukkit.event.player.PlayerFishEvent;
+import org.jetbrains.annotations.Nullable;
+
+@Name("Fishing Hooked Entity")
+@Description("Returns the hooked entity in the hooked event.")
+@Examples({
+	"on entity hooked:",
+		"\tif hooked entity is a player:",
+			"\t\tteleport hooked entity to player",
+})
+@Events("Fishing")
+@Since("2.10")
+public class ExprFishingHookEntity extends SimpleExpression<Entity> {
+
+	static {
+		Skript.registerExpression(ExprFishingHookEntity.class, Entity.class, ExpressionType.EVENT,
+			"hook[ed] entity");
+	}
+
+	@Override
+	public boolean init(Expression<?>[] expressions, int matchedPattern,
+						Kleenean isDelayed, ParseResult parseResult) {
+		if (!getParser().isCurrentEvent(PlayerFishEvent.class)) {
+			Skript.error("The 'hooked entity' expression can only be used in the fishing event.");
+			return false;
+		}
+
+		return true;
+	}
+
+	@Override
+	protected Entity @Nullable [] get(Event event) {
+		if (!(event instanceof PlayerFishEvent fishEvent))
+			return null;
+
+		return new Entity[] {fishEvent.getHook().getHookedEntity()};
+	}
+
+	@Override
+	public Class<?> @Nullable [] acceptChange(ChangeMode mode) {
+		return switch (mode) {
+			case SET, DELETE -> CollectionUtils.array(Entity.class);
+			default -> null;
+		};
+	}
+
+	@Override
+	public void change(Event event, @Nullable Object[] delta, ChangeMode mode) {
+		if (!(event instanceof PlayerFishEvent fishEvent))
+			return;
+
+		FishHook hook = fishEvent.getHook();
+
+		switch (mode) {
+			case SET -> hook.setHookedEntity((Entity) delta[0]);
+			case DELETE -> {
+				if (hook.getHookedEntity() != null && !(hook.getHookedEntity() instanceof Player))
+					hook.getHookedEntity().remove();
+			}
+			default -> throw new IllegalStateException("Unexpected value: " + mode);
+		}
+	}
+
+	@Override
+	public boolean isSingle() {
+		return true;
+	}
+
+	@Override
+	public Class<? extends Entity> getReturnType() {
+		return Entity.class;
+	}
+
+	@Override
+	public String toString(@Nullable Event event, boolean debug) {
+		return "hooked entity";
+	}
+
+}
diff --git a/src/main/java/org/skriptlang/skript/bukkit/fishing/elements/ExprFishingWaitTime.java b/src/main/java/org/skriptlang/skript/bukkit/fishing/elements/ExprFishingWaitTime.java
new file mode 100644
index 00000000000..b71552571f5
--- /dev/null
+++ b/src/main/java/org/skriptlang/skript/bukkit/fishing/elements/ExprFishingWaitTime.java
@@ -0,0 +1,123 @@
+package org.skriptlang.skript.bukkit.fishing.elements;
+
+import ch.njol.skript.Skript;
+import ch.njol.skript.classes.Changer.ChangeMode;
+import ch.njol.skript.doc.*;
+import ch.njol.skript.lang.Expression;
+import ch.njol.skript.lang.ExpressionType;
+import ch.njol.skript.lang.SkriptParser.ParseResult;
+import ch.njol.skript.lang.util.SimpleExpression;
+import ch.njol.skript.util.Timespan;
+import ch.njol.util.Kleenean;
+import org.bukkit.entity.FishHook;
+import org.bukkit.event.Event;
+import org.bukkit.event.player.PlayerFishEvent;
+import org.jetbrains.annotations.Nullable;
+
+@Name("Fishing Wait Time")
+@Description({
+	"Returns the minimum and/or maximum waiting time of the fishing hook. ",
+	"Default minimum value is 5 seconds and maximum is 30 seconds, before lure is applied."
+})
+@Examples({
+	"on fishing line cast:",
+		"\tset min waiting time to 10 seconds",
+		"\tset max waiting time to 20 seconds",
+})
+@Events("Fishing")
+@Since("2.10")
+public class ExprFishingWaitTime extends SimpleExpression<Timespan> {
+
+	private static final int DEFAULT_MINIMUM_TICKS = 5 * 20;
+	private static final int DEFAULT_MAXIMUM_TICKS = 30 * 20;
+
+	static {
+		Skript.registerExpression(ExprFishingWaitTime.class, Timespan.class, ExpressionType.EVENT,
+			"(min:min[imum]|max[imum]) fish[ing] wait[ing] time");
+	}
+
+	private boolean isMin;
+
+	@Override
+	public boolean init(Expression<?>[] expressions, int matchedPattern,
+						Kleenean isDelayed, ParseResult parseResult) {
+		if (!getParser().isCurrentEvent(PlayerFishEvent.class)) {
+			Skript.error("The 'fishing wait time' expression can only be used in a fishing event.");
+			return false;
+		}
+
+		isMin = parseResult.hasTag("min");
+		return true;
+	}
+
+	@Override
+	protected Timespan @Nullable [] get(Event event) {
+		if (!(event instanceof PlayerFishEvent fishEvent))
+			return null;
+
+		if (isMin) {
+			return new Timespan[]{new Timespan(Timespan.TimePeriod.TICK, fishEvent.getHook().getMinWaitTime())};
+		}
+		return new Timespan[]{new Timespan(Timespan.TimePeriod.TICK, fishEvent.getHook().getMaxWaitTime())};
+	}
+
+	@Override
+	public @Nullable Class<?>[] acceptChange(ChangeMode mode) {
+		return switch (mode) {
+			case ADD, REMOVE, SET, RESET -> new Class[]{Timespan.class};
+			default -> null;
+		};
+	}
+
+	@Override
+	public void change(Event event, Object @Nullable [] delta, ChangeMode mode) {
+		if (!(event instanceof PlayerFishEvent fishEvent))
+			return;
+
+		FishHook hook = fishEvent.getHook();
+
+		int ticks = mode == ChangeMode.RESET ?
+			(isMin ? DEFAULT_MINIMUM_TICKS : DEFAULT_MAXIMUM_TICKS) :
+			(int) ((Timespan) delta[0]).getAs(Timespan.TimePeriod.TICK);
+
+		switch (mode) {
+			case SET, RESET -> {
+				if (isMin) {
+					hook.setMinWaitTime(Math.max(0, ticks));
+				} else {
+					hook.setMaxWaitTime(Math.max(0, ticks));
+				}
+			}
+			case ADD -> {
+				if (isMin) {
+					hook.setMinWaitTime(Math.max(0, hook.getMinWaitTime() + ticks));
+				} else {
+					hook.setMaxWaitTime(Math.max(0, hook.getMaxWaitTime() + ticks));
+				}
+			}
+			case REMOVE -> {
+				if (isMin) {
+					hook.setMinWaitTime(Math.max(0, hook.getMinWaitTime() - ticks));
+				} else {
+					hook.setMaxWaitTime(Math.max(0, hook.getMaxWaitTime() - ticks));
+				}
+			}
+		}
+	}
+
+	@Override
+	public boolean isSingle() {
+		return true;
+	}
+
+	@Override
+	public Class<? extends Timespan> getReturnType() {
+		return Timespan.class;
+	}
+
+	@Override
+	public String toString(@Nullable Event event, boolean debug) {
+		return (isMin ? "minimum" : "maximum") + " fishing waiting time";
+	}
+
+}
diff --git a/src/main/java/org/skriptlang/skript/bukkit/furnace/FurnaceModule.java b/src/main/java/org/skriptlang/skript/bukkit/furnace/FurnaceModule.java
new file mode 100644
index 00000000000..0a1f50286ff
--- /dev/null
+++ b/src/main/java/org/skriptlang/skript/bukkit/furnace/FurnaceModule.java
@@ -0,0 +1,12 @@
+package org.skriptlang.skript.bukkit.furnace;
+
+import ch.njol.skript.Skript;
+import java.io.IOException;
+
+public class FurnaceModule {
+
+	public static void load() throws IOException{
+		Skript.getAddonInstance().loadClasses("org.skriptlang.skript.bukkit.furnace", "elements");
+	}
+
+}
diff --git a/src/main/java/org/skriptlang/skript/bukkit/furnace/elements/EvtFurnace.java b/src/main/java/org/skriptlang/skript/bukkit/furnace/elements/EvtFurnace.java
new file mode 100644
index 00000000000..90b93168e6e
--- /dev/null
+++ b/src/main/java/org/skriptlang/skript/bukkit/furnace/elements/EvtFurnace.java
@@ -0,0 +1,115 @@
+package org.skriptlang.skript.bukkit.furnace.elements;
+
+import ch.njol.skript.Skript;
+import ch.njol.skript.aliases.ItemType;
+import ch.njol.skript.lang.Literal;
+import ch.njol.skript.lang.SkriptEvent;
+import ch.njol.skript.lang.SkriptParser.ParseResult;
+import ch.njol.skript.registrations.Classes;
+import org.bukkit.event.Event;
+import org.bukkit.event.inventory.FurnaceBurnEvent;
+import org.bukkit.event.inventory.FurnaceExtractEvent;
+import org.bukkit.event.inventory.FurnaceSmeltEvent;
+import org.bukkit.event.inventory.FurnaceStartSmeltEvent;
+import org.jetbrains.annotations.Nullable;
+
+public class EvtFurnace extends SkriptEvent {
+
+	static {
+		Skript.registerEvent("Smelt", EvtFurnace.class, FurnaceSmeltEvent.class,
+				"[furnace] [ore] smelt[ed|ing] [of %-itemtypes%]",
+				"[furnace] smelt[ed|ing] of ore")
+			.description("Called when a furnace smelts an item in its <a href='expressions.html#ExprFurnaceSlot'>input slot</a>.")
+			.examples(
+				"on smelt:",
+					"\tclear the smelted item",
+				"on smelt of raw iron:",
+					"\tbroadcast smelted item",
+					"\tset the smelted item to iron block"
+			)
+			.since("1.0, 2.10 (specific item)");
+
+		Skript.registerEvent("Fuel Burn", EvtFurnace.class, FurnaceBurnEvent.class, "[furnace] fuel burn[ing] [of %-itemtypes%]")
+			.description("Called when a furnace burns an item from its <a href='expressions.html#ExprFurnaceSlot'>fuel slot</a>.")
+			.examples(
+				"on fuel burning:",
+					"\tbroadcast fuel burned",
+					"\tif burned fuel is coal:",
+						"\t\tadd 20 seconds to burn time"
+			)
+			.since("1.0, 2.10 (specific item)");
+
+		Skript.registerEvent("Furnace Item Extract", EvtFurnace.class, FurnaceExtractEvent.class, "furnace [item] extract[ion] [of %-itemtypes%]")
+			.description("Called when a player takes any item out of the furnace.")
+			.examples(
+				"on furnace extract:",
+					"\tif event-items is an iron ingot:",
+						"\t\tremove event-items from event-player's inventory"
+			)
+			.since("2.10");
+
+		Skript.registerEvent("Start Smelt", EvtFurnace.class, FurnaceStartSmeltEvent.class,
+			"[furnace] start [of] smelt[ing] [[of] %-itemtypes%]",
+			"[furnace] smelt[ing] start [of %-itemtypes%]")
+			.description("Called when a furnace starts smelting an item in its ore slot.")
+			.examples(
+				"on smelting start:",
+					"\tif the smelting item is raw iron:",
+						"\t\tset total cook time to 1 second",
+				"on smelting start of raw iron:",
+					"\tadd 20 seconds to total cook time"
+			)
+			.since("2.10");
+	}
+
+	private @Nullable Literal<ItemType> types;
+
+	@Override
+	@SuppressWarnings("unchecked")
+	public boolean init(Literal<?>[] exprs, int matchedPattern, ParseResult parseResult) {
+		if (exprs[0] != null)
+			types = (Literal<ItemType>) exprs[0];
+		return true;
+	}
+
+	@Override
+	public boolean check(Event event) {
+		if (types == null)
+			return true;
+
+		ItemType item;
+
+		if (event instanceof FurnaceSmeltEvent smeltEvent) {
+			item = new ItemType(smeltEvent.getSource());
+		} else if (event instanceof FurnaceBurnEvent burnEvent) {
+			item = new ItemType(burnEvent.getFuel());
+		} else if (event instanceof FurnaceExtractEvent extractEvent) {
+			item = new ItemType(extractEvent.getItemType());
+		} else if (event instanceof FurnaceStartSmeltEvent startEvent) {
+			item = new ItemType(startEvent.getSource());
+		} else {
+			assert false;
+			return false;
+		}
+
+		return types.check(event, itemType -> itemType.isSupertypeOf(item));
+	}
+
+	@Override
+	public String toString(@Nullable Event event, boolean debug) {
+		String result = "";
+		if (event instanceof FurnaceSmeltEvent) {
+			result = "smelt";
+		} else if (event instanceof FurnaceBurnEvent) {
+			result = "burn";
+		} else if (event instanceof FurnaceExtractEvent) {
+			result = "extract";
+		} else if (event instanceof FurnaceStartSmeltEvent) {
+			result = "start smelt";
+		} else {
+			throw new IllegalStateException("Unexpected event: " + event);
+		}
+		return result + " of " + Classes.toString(types);
+	}
+
+}
diff --git a/src/main/java/org/skriptlang/skript/bukkit/furnace/elements/ExprFurnaceEventItems.java b/src/main/java/org/skriptlang/skript/bukkit/furnace/elements/ExprFurnaceEventItems.java
new file mode 100644
index 00000000000..78091a550ca
--- /dev/null
+++ b/src/main/java/org/skriptlang/skript/bukkit/furnace/elements/ExprFurnaceEventItems.java
@@ -0,0 +1,137 @@
+package org.skriptlang.skript.bukkit.furnace.elements;
+
+import ch.njol.skript.Skript;
+import ch.njol.skript.classes.Changer.ChangeMode;
+import ch.njol.skript.doc.*;
+import ch.njol.skript.expressions.base.EventValueExpression;
+import ch.njol.skript.expressions.base.PropertyExpression;
+import ch.njol.skript.lang.Expression;
+import ch.njol.skript.lang.ExpressionType;
+import ch.njol.skript.lang.SkriptParser.ParseResult;
+import ch.njol.util.Kleenean;
+import ch.njol.util.coll.CollectionUtils;
+import org.bukkit.Material;
+import org.bukkit.block.Block;
+import org.bukkit.event.Event;
+import org.bukkit.event.inventory.FurnaceBurnEvent;
+import org.bukkit.event.inventory.FurnaceExtractEvent;
+import org.bukkit.event.inventory.FurnaceSmeltEvent;
+import org.bukkit.event.inventory.FurnaceStartSmeltEvent;
+import org.bukkit.inventory.ItemStack;
+import org.jetbrains.annotations.Nullable;
+
+@Name("Furnace Event Items")
+@Description({
+	"Represents the different items in furnace events.",
+	"Only 'smelting item' can be changed."
+})
+@Examples({
+	"on furnace smelt:",
+		"\tbroadcast smelted item",
+		"\t# Or 'result'",
+	"on furnace extract:",
+		"\tbroadcast extracted item",
+	"on fuel burn:",
+		"\tbroadcast burned fuel",
+	"on smelting start:",
+		"\tbroadcast smelting item",
+		"\tclear smelting item"
+})
+@Events({"smelt", "fuel burn", "smelting start", "furnace extract"})
+@Since("2.10")
+public class ExprFurnaceEventItems extends PropertyExpression<Block, ItemStack> {
+
+	enum FurnaceValues {
+		SMELTED("(smelted item|result[ item])", "smelted item", FurnaceSmeltEvent.class, "'smelted item' can only be used in a smelting event."),
+		EXTRACTED("extracted item[s]", "extracted item", FurnaceExtractEvent.class, "'extracted item' can only be used in a furnace extract event."),
+		SMELTING("smelting item", "smelting item", FurnaceStartSmeltEvent.class, "'smelting item' can only be used in a start smelting event"),
+		BURNED("burned (fuel|item)", "burned fuel item", FurnaceBurnEvent.class, "'burned fuel' can only be used in a fuel burning event.");
+
+		private String pattern, error, toString;
+		private Class<? extends Event> clazz;
+
+		FurnaceValues(String pattern, String toString, Class<? extends Event> clazz, String error) {
+			this.pattern = "[the] " + pattern;
+			this.clazz = clazz;
+			this.error = error;
+			this.toString = toString;
+		}
+
+	}
+
+	private static final FurnaceValues[] FURNACE_VALUES = FurnaceValues.values();
+
+	static {
+		int size = FURNACE_VALUES.length;
+		String[] patterns  = new String[size];
+		for (FurnaceValues value : FURNACE_VALUES) {
+			patterns[value.ordinal()] = value.pattern;
+		}
+
+		Skript.registerExpression(ExprFurnaceEventItems.class, ItemStack.class, ExpressionType.PROPERTY, patterns);
+	}
+
+	private FurnaceValues type;
+
+	@Override
+	public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelayed, ParseResult parseResult) {
+		type = FURNACE_VALUES[matchedPattern];
+		if (!getParser().isCurrentEvent(type.clazz)) {
+			Skript.error(type.error);
+			return false;
+		}
+		setExpr(new EventValueExpression<>(Block.class));
+		return true;
+	}
+
+	@Override
+	protected ItemStack @Nullable [] get(Event event, Block[] source) {
+		return new ItemStack[]{switch (type) {
+			case SMELTING -> ((FurnaceStartSmeltEvent) event).getSource();
+			case BURNED -> ((FurnaceBurnEvent) event).getFuel();
+			case SMELTED -> ((FurnaceSmeltEvent) event).getResult();
+			case EXTRACTED -> {
+				FurnaceExtractEvent extractEvent = (FurnaceExtractEvent) event;
+				yield new ItemStack(extractEvent.getItemType(), extractEvent.getItemAmount());
+			}
+		}};
+	}
+
+	@Override
+	public Class<?> @Nullable [] acceptChange(ChangeMode mode) {
+		if (type != FurnaceValues.SMELTED)
+			return null;
+		if (mode != ChangeMode.SET && mode != ChangeMode.DELETE)
+			return null;
+		return CollectionUtils.array(ItemStack.class);
+	}
+
+	@Override
+	public void change(Event event, Object @Nullable [] delta, ChangeMode mode) {
+		if (!(event instanceof FurnaceSmeltEvent smeltEvent))
+			return;
+
+		if (mode == ChangeMode.SET) {
+			smeltEvent.setResult((ItemStack) delta[0]);
+		} else if (mode == ChangeMode.DELETE) {
+			smeltEvent.setResult(ItemStack.of(Material.AIR));
+		}
+
+	}
+
+	@Override
+	public boolean isSingle() {
+		return true;
+	}
+
+	@Override
+	public Class<ItemStack> getReturnType() {
+		return ItemStack.class;
+	}
+
+	@Override
+	public String toString(@Nullable Event event, boolean debug) {
+		return type.toString;
+	}
+
+}
diff --git a/src/main/java/org/skriptlang/skript/bukkit/furnace/elements/ExprFurnaceSlot.java b/src/main/java/org/skriptlang/skript/bukkit/furnace/elements/ExprFurnaceSlot.java
new file mode 100644
index 00000000000..8fd42c23d0c
--- /dev/null
+++ b/src/main/java/org/skriptlang/skript/bukkit/furnace/elements/ExprFurnaceSlot.java
@@ -0,0 +1,229 @@
+package org.skriptlang.skript.bukkit.furnace.elements;
+
+import ch.njol.skript.Skript;
+import ch.njol.skript.doc.Description;
+import ch.njol.skript.doc.Events;
+import ch.njol.skript.doc.Examples;
+import ch.njol.skript.doc.Name;
+import ch.njol.skript.doc.Since;
+import ch.njol.skript.effects.Delay;
+import ch.njol.skript.lang.Expression;
+import ch.njol.skript.lang.ExpressionType;
+import ch.njol.skript.lang.SkriptParser.ParseResult;
+import ch.njol.skript.lang.util.SimpleExpression;
+import ch.njol.skript.registrations.EventValues;
+import ch.njol.skript.util.slot.InventorySlot;
+import ch.njol.skript.util.slot.Slot;
+import ch.njol.util.Kleenean;
+import ch.njol.util.Math2;
+import org.bukkit.Bukkit;
+import org.bukkit.Material;
+import org.bukkit.block.Block;
+import org.bukkit.block.BlockState;
+import org.bukkit.block.Furnace;
+import org.bukkit.event.Event;
+import org.bukkit.event.block.BlockEvent;
+import org.bukkit.event.inventory.FurnaceBurnEvent;
+import org.bukkit.event.inventory.FurnaceExtractEvent;
+import org.bukkit.event.inventory.FurnaceSmeltEvent;
+import org.bukkit.event.inventory.FurnaceStartSmeltEvent;
+import org.bukkit.inventory.FurnaceInventory;
+import org.bukkit.inventory.ItemStack;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Name("Furnace Slot")
+@Description({
+	"A slot of a furnace, i.e. either the ore, fuel or result slot."
+})
+@Examples({
+	"set the fuel slot of the clicked block to a lava bucket",
+	"set the block's ore slot to 64 iron ore",
+	"clear the result slot of the block",
+	"on smelt:",
+		"\tif the fuel slot is charcoal:",
+			"\t\tadd 5 seconds to the burn time"
+})
+@Events({"smelt", "fuel burn"})
+@Since("1.0, 2.8.0 (syntax rework)")
+public class ExprFurnaceSlot extends SimpleExpression<Slot> {
+
+	private enum FurnaceSlot {
+		INPUT("(ore|input)", "input"),
+		FUEL("fuel", "fuel"),
+		OUTPUT("(result|output)", "output");
+
+		private String pattern, toString;
+
+		FurnaceSlot(String pattern, String toString) {
+			this.pattern = pattern;
+			this.toString = toString;
+		}
+	}
+
+	private static final FurnaceSlot[] furnaceSlots = FurnaceSlot.values();
+
+	static {
+		String[] patterns = new String[furnaceSlots.length * 2];
+		for (FurnaceSlot slot : furnaceSlots) {
+			patterns[2 * slot.ordinal()] = "[the] " + slot.pattern + " slot[s] [of %blocks%]";
+			patterns[2 * slot.ordinal() + 1] = "%blocks%'[s] " + slot.pattern + " slot[s]";
+		}
+		Skript.registerExpression(ExprFurnaceSlot.class, Slot.class, ExpressionType.PROPERTY, patterns);
+	}
+
+
+	private @Nullable Expression<Block> blocks;
+	private FurnaceSlot selectedSlot;
+	private boolean isEvent;
+
+	@Override
+	public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelayed, ParseResult parseResult) {
+		selectedSlot = furnaceSlots[(int) Math2.floor(matchedPattern / 2)];
+		if (exprs[0] != null) {
+			//noinspection unchecked
+			blocks = (Expression<Block>) exprs[0];
+		} else {
+			if (!getParser().isCurrentEvent(FurnaceBurnEvent.class, FurnaceStartSmeltEvent.class, FurnaceExtractEvent.class, FurnaceSmeltEvent.class)) {
+				Skript.error("There's no furnace in a " + getParser().getCurrentEventName() + " event.");
+				return false;
+			}
+			isEvent = true;
+		}
+		return true;
+	}
+
+	@Override
+	protected Slot @Nullable [] get(Event event) {
+		Block[] blocks;
+		if (isEvent) {
+			blocks = new Block[1];
+			if (event instanceof BlockEvent blockEvent) {
+				blocks[0] = blockEvent.getBlock();
+			} else {
+				return new Slot[0];
+			}
+		} else {
+			assert this.blocks != null;
+			blocks = this.blocks.getArray(event);
+		}
+
+		List<Slot> slots = new ArrayList<>();
+		for (Block block : blocks) {
+			BlockState state = block.getState();
+			if (!(state instanceof Furnace))
+				continue;
+			FurnaceInventory furnaceInventory = ((Furnace) state).getInventory();
+			if (isEvent && !Delay.isDelayed(event)) {
+				slots.add(new FurnaceEventSlot(event, furnaceInventory));
+			} else {
+				slots.add(new InventorySlot(furnaceInventory, selectedSlot.ordinal()));
+			}
+		}
+		return slots.toArray(new Slot[0]);
+	}
+
+	@Override
+	public boolean isSingle() {
+		if (isEvent)
+			return true;
+		assert blocks != null;
+		return blocks.isSingle();
+	}
+
+	@Override
+	public Class<? extends Slot> getReturnType() {
+		return InventorySlot.class;
+	}
+
+	@Override
+	public String toString(@Nullable Event event, boolean debug) {
+		return selectedSlot.toString + " slot of " + (isEvent ? event.getEventName() : blocks.toString(event, debug));
+	}
+
+	@Override
+	public boolean setTime(int time) {
+		if (isEvent) { // getExpr will be null
+			if (selectedSlot == FurnaceSlot.FUEL)
+				return setTime(time, FurnaceBurnEvent.class);
+			return setTime(time, FurnaceSmeltEvent.class);
+		}
+		return false;
+	}
+
+	private final class FurnaceEventSlot extends InventorySlot {
+
+		private final Event event;
+
+		public FurnaceEventSlot(Event event, FurnaceInventory furnaceInventory) {
+			super(furnaceInventory, selectedSlot.ordinal());
+			this.event = event;
+		}
+
+		@Override
+		public @Nullable ItemStack getItem() {
+			return switch (selectedSlot) {
+				case INPUT -> {
+					if (event instanceof FurnaceSmeltEvent furnaceSmeltEvent) {
+						ItemStack source = furnaceSmeltEvent.getSource().clone();
+						if (getTime() != EventValues.TIME_FUTURE)
+							yield source;
+						source.setAmount(source.getAmount() - 1);
+						yield source;
+					}
+					yield super.getItem();
+				}
+				case FUEL -> {
+					if (event instanceof FurnaceBurnEvent furnaceBurnEvent) {
+						ItemStack fuel = furnaceBurnEvent.getFuel().clone();
+						if (getTime() != EventValues.TIME_FUTURE)
+							yield fuel;
+						// a single lava bucket becomes an empty bucket
+						// see https://minecraft.wiki/w/Smelting#Fuel
+						// this is declared here because setting the amount to 0 may cause the ItemStack to become AIR
+						Material newMaterial = fuel.getType() == Material.LAVA_BUCKET ? Material.BUCKET : Material.AIR;
+						fuel.setAmount(fuel.getAmount() - 1);
+						if (fuel.getAmount() == 0)
+							fuel = new ItemStack(newMaterial);
+						yield fuel;
+					}
+					yield super.getItem();
+				}
+				case OUTPUT -> {
+					if (event instanceof FurnaceSmeltEvent furnaceSmeltEvent) {
+						ItemStack result = furnaceSmeltEvent.getResult().clone();
+						ItemStack currentResult = ((FurnaceInventory) getInventory()).getResult();
+						if (currentResult != null)
+							currentResult = currentResult.clone();
+						if (getTime() != EventValues.TIME_FUTURE) { // 'past result slot' and 'result slot'
+							yield currentResult;
+						} else if (currentResult != null && currentResult.isSimilar(result)) { // 'future result slot'
+							currentResult.setAmount(currentResult.getAmount() + result.getAmount());
+							yield currentResult;
+						} else {
+							yield result; // 'the result'
+						}
+					}
+					yield super.getItem();
+				}
+			};
+		}
+
+		@Override
+		public void setItem(@Nullable ItemStack item) {
+			if (selectedSlot == FurnaceSlot.OUTPUT && event instanceof FurnaceSmeltEvent furnaceSmeltEvent) {
+				furnaceSmeltEvent.setResult(item != null ? item : new ItemStack(Material.AIR));
+			} else {
+				if (getTime() == EventValues.TIME_FUTURE) { // Since this is a future expression, run it AFTER the event
+					Bukkit.getScheduler().scheduleSyncDelayedTask(Skript.getInstance(), () -> FurnaceEventSlot.super.setItem(item));
+				} else {
+					super.setItem(item);
+				}
+			}
+		}
+
+	}
+
+}
diff --git a/src/main/java/org/skriptlang/skript/bukkit/furnace/elements/ExprFurnaceTime.java b/src/main/java/org/skriptlang/skript/bukkit/furnace/elements/ExprFurnaceTime.java
new file mode 100644
index 00000000000..29987f8f8f2
--- /dev/null
+++ b/src/main/java/org/skriptlang/skript/bukkit/furnace/elements/ExprFurnaceTime.java
@@ -0,0 +1,207 @@
+package org.skriptlang.skript.bukkit.furnace.elements;
+
+import ch.njol.skript.Skript;
+import ch.njol.skript.classes.Changer.ChangeMode;
+import ch.njol.skript.doc.*;
+import ch.njol.skript.expressions.base.EventValueExpression;
+import ch.njol.skript.expressions.base.PropertyExpression;
+import ch.njol.skript.lang.Expression;
+import ch.njol.skript.lang.ExpressionType;
+import ch.njol.skript.lang.SkriptParser.ParseResult;
+import ch.njol.skript.util.Timespan;
+import ch.njol.util.Kleenean;
+import ch.njol.util.Math2;
+import ch.njol.util.coll.CollectionUtils;
+import org.bukkit.block.Block;
+import org.bukkit.block.Furnace;
+import org.bukkit.event.Event;
+import org.bukkit.event.inventory.FurnaceBurnEvent;
+import org.bukkit.event.inventory.FurnaceExtractEvent;
+import org.bukkit.event.inventory.FurnaceSmeltEvent;
+import org.bukkit.event.inventory.FurnaceStartSmeltEvent;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.function.Consumer;
+import java.util.function.Function;
+import java.util.function.Supplier;
+
+@Name("Furnace Times")
+@Description({
+	"The cook time, total cook time, and burn time of a furnace. Can be changed.",
+	"<ul>",
+	"<li>cook time: The amount of time an item has been smelting for.</li>",
+	"<li>total cook time: The amount of time required to finish smelting an item.</li>",
+	"<li>burn time: The amount of time left for the current fuel until consumption of another fuel item.</li>",
+	"</ul>"
+})
+@Examples({
+	"set the cooking time of {_block} to 10",
+	"set the total cooking time of {_block} to 50",
+	"set the fuel burning time of {_block} to 100",
+	"on smelt:",
+		"\tif the fuel slot is charcoal:",
+			"\t\tadd 5 seconds to the fuel burn time"
+})
+@Since("2.10")
+public class ExprFurnaceTime extends PropertyExpression<Block, Timespan> {
+
+	enum FurnaceExpressions {
+		COOKTIME("cook[ing] time", "cook time"),
+		TOTALCOOKTIME("total cook[ing] time", "total cook time"),
+		BURNTIME("fuel burn[ing] time", "fuel burn time");
+
+		private String pattern, toString;
+
+		FurnaceExpressions(String pattern, String toString) {
+			this.pattern = pattern;
+			this.toString = toString;
+		}
+
+	}
+
+	private static final FurnaceExpressions[] furnaceExprs = FurnaceExpressions.values();
+	
+	static {
+
+		int size = furnaceExprs.length;
+		String[] patterns = new String[size * 2];
+		for (FurnaceExpressions value : furnaceExprs) {
+			patterns[2 * value.ordinal()] = "[the] [furnace] " + value.pattern + " [of %blocks%]";
+			patterns[2 * value.ordinal() + 1] = "%blocks%'[s]" + value.pattern;
+		}
+
+		Skript.registerExpression(ExprFurnaceTime.class, Timespan.class, ExpressionType.PROPERTY, patterns);
+	}
+
+	private FurnaceExpressions type;
+	private boolean explicitlyBlock = false;
+
+	@Override
+	public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelayed, ParseResult parseResult) {
+		type = furnaceExprs[matchedPattern / 2];
+		if (exprs[0] != null) {
+			explicitlyBlock = true;
+			//noinspection unchecked
+			setExpr((Expression<Block>) exprs[0]);
+		} else {
+			if (!getParser().isCurrentEvent(FurnaceBurnEvent.class, FurnaceStartSmeltEvent.class, FurnaceExtractEvent.class, FurnaceSmeltEvent.class)) {
+				Skript.error("There's no furnace in a '" + getParser().getCurrentEventName() + "' event.");
+				return false;
+			}
+			explicitlyBlock = false;
+			setExpr(new EventValueExpression<>(Block.class));
+		}
+		return true;
+	}
+
+	@Override
+	protected Timespan @Nullable [] get(Event event, Block[] source) {
+		return get(source, block -> {
+			if (block == null || !(block.getState() instanceof Furnace furnace))
+				return null;
+			switch (type) {
+				case COOKTIME -> {
+					return new Timespan(Timespan.TimePeriod.TICK, (int) furnace.getCookTime());
+				}
+				case TOTALCOOKTIME -> {
+					if (event instanceof FurnaceStartSmeltEvent startEvent && block.equals(startEvent.getBlock())) {
+						return new Timespan(Timespan.TimePeriod.TICK, startEvent.getTotalCookTime());
+					} else {
+						return new Timespan(Timespan.TimePeriod.TICK, furnace.getCookTimeTotal());
+					}
+				}
+				case BURNTIME -> {
+					if (event instanceof FurnaceBurnEvent burnEvent && block.equals(burnEvent.getBlock())) {
+						return new Timespan(Timespan.TimePeriod.TICK, burnEvent.getBurnTime());
+					} else {
+						return new Timespan(Timespan.TimePeriod.TICK, (int) furnace.getBurnTime());
+					}
+				}
+			}
+			return null;
+		});
+	}
+
+	@Override
+	public Class<?> @Nullable [] acceptChange(ChangeMode mode) {
+		if (mode == ChangeMode.REMOVE_ALL || mode == ChangeMode.RESET)
+			return null;
+
+		return CollectionUtils.array(Timespan.class);
+	}
+
+	@Override
+	public void change(Event event, Object @Nullable [] delta, ChangeMode mode) {
+		int providedTime = 0;
+		if (delta != null && delta[0] instanceof Timespan span)
+			providedTime = (int) span.get(Timespan.TimePeriod.TICK);
+		int finalTime = providedTime;
+
+		Function<Integer, Integer> calculateTime = switch (mode) {
+			case SET -> time -> finalTime;
+			case ADD -> time -> Math2.fit(0, time + finalTime, Integer.MAX_VALUE);
+			case REMOVE -> time -> Math2.fit(0, time - finalTime, Integer.MAX_VALUE);
+			case DELETE -> time -> 0;
+			default -> throw new IllegalStateException("Unexpected value: " + mode);
+		};
+		Function<Short, Short> calculateTimeShort = switch (mode) {
+			case SET -> time -> (short) finalTime;
+			case ADD -> time -> (short) Math2.fit(0, time + finalTime, Short.MAX_VALUE);
+			case REMOVE -> time -> (short) Math2.fit(0, time - finalTime, Short.MAX_VALUE);
+			case DELETE -> time -> (short) 0;
+			default -> throw new IllegalStateException("Unexpected value: " + mode);
+		};
+
+		switch (type) {
+			case COOKTIME -> changeFurnaces(event, furnace -> change(furnace::setCookTime, furnace::getCookTime, calculateTimeShort));
+			case TOTALCOOKTIME -> {
+				if (!explicitlyBlock && event instanceof FurnaceStartSmeltEvent smeltEvent) {
+					change(smeltEvent::setTotalCookTime, smeltEvent::getTotalCookTime, calculateTime);
+				} else {
+					changeFurnaces(event, furnace -> change(furnace::setCookTimeTotal, furnace::getCookTimeTotal, calculateTime));
+				}
+			}
+			case BURNTIME -> {
+				if (!explicitlyBlock && event instanceof FurnaceBurnEvent burnEvent) {
+					change(burnEvent::setBurnTime, burnEvent::getBurnTime, calculateTime);
+				} else {
+					changeFurnaces(event, furnace -> change(furnace::setBurnTime, furnace::getBurnTime, calculateTimeShort));
+				}
+			}
+		}
+	}
+
+	/**
+	 * Handler for setting data of furnace blocks
+	 * @param event Event
+	 * @param changer The consumer used to apply to the furnace blocks
+	 */
+	private void changeFurnaces(Event event, Consumer<Furnace> changer) {
+		for (Block block : getExpr().getArray(event)) {
+			Furnace furnace = (Furnace) block.getState();
+			changer.accept(furnace);
+			furnace.update(true);
+		}
+	}
+
+	private static <T extends Number> void change(@NotNull Consumer<T> set, @NotNull Supplier<T> get, @NotNull Function<T, T> calculateTime) {
+		set.accept(calculateTime.apply(get.get()));
+	}
+
+	@Override
+	public boolean isSingle() {
+		return getExpr().isSingle();
+	}
+
+	@Override
+	public Class<Timespan> getReturnType() {
+		return Timespan.class;
+	}
+
+	@Override
+	public String toString(@Nullable Event event, boolean debug) {
+		return type.toString + " of "  + getExpr().toString(event, debug);
+	}
+	
+}
diff --git a/src/main/java/org/skriptlang/skript/bukkit/input/InputKey.java b/src/main/java/org/skriptlang/skript/bukkit/input/InputKey.java
new file mode 100644
index 00000000000..eef0e870b50
--- /dev/null
+++ b/src/main/java/org/skriptlang/skript/bukkit/input/InputKey.java
@@ -0,0 +1,55 @@
+package org.skriptlang.skript.bukkit.input;
+
+import org.bukkit.Input;
+
+import java.util.EnumSet;
+import java.util.Set;
+
+/**
+ * Enum representing different movement input keys.
+ * @see Input
+ */
+public enum InputKey {
+
+	FORWARD,
+	BACKWARD,
+	RIGHT,
+	LEFT,
+	JUMP,
+	SNEAK,
+	SPRINT;
+
+	/**
+	 * Checks if the given {@link Input} is pressing this {@link InputKey}.
+	 *
+	 * @param input the input to check
+	 * @return true if the {@link Input} is pressing this {@link InputKey}, false otherwise
+	 */
+	public boolean check(Input input) {
+		return switch (this) {
+			case FORWARD -> input.isForward();
+			case BACKWARD -> input.isBackward();
+			case RIGHT -> input.isRight();
+			case LEFT -> input.isLeft();
+			case JUMP -> input.isJump();
+			case SNEAK -> input.isSneak();
+			case SPRINT -> input.isSprint();
+		};
+	}
+
+	/**
+	 * Returns a set of {@link InputKey}s that match the given {@link Input}.
+	 *
+	 * @param input the input to check
+	 * @return a set of {@link InputKey}s that match the given {@link Input}
+	 */
+	public static Set<InputKey> fromInput(Input input) {
+		Set<InputKey> keys = EnumSet.noneOf(InputKey.class);
+		for (InputKey key : values()) {
+			if (key.check(input))
+				keys.add(key);
+		}
+		return keys;
+	}
+
+}
diff --git a/src/main/java/org/skriptlang/skript/bukkit/input/InputModule.java b/src/main/java/org/skriptlang/skript/bukkit/input/InputModule.java
new file mode 100644
index 00000000000..9dfbd28550d
--- /dev/null
+++ b/src/main/java/org/skriptlang/skript/bukkit/input/InputModule.java
@@ -0,0 +1,33 @@
+package org.skriptlang.skript.bukkit.input;
+
+import ch.njol.skript.Skript;
+import ch.njol.skript.classes.EnumClassInfo;
+import ch.njol.skript.registrations.Classes;
+import ch.njol.skript.registrations.EventValues;
+import org.bukkit.event.player.PlayerInputEvent;
+
+import java.io.IOException;
+
+public class InputModule {
+
+	public static void load() throws IOException {
+		if (!Skript.classExists("org.bukkit.Input"))
+			return;
+
+		Skript.getAddonInstance().loadClasses("org.skriptlang.skript.bukkit.input.elements");
+
+		Classes.registerClass(new EnumClassInfo<>(InputKey.class, "inputkey", "input keys")
+			.user("input ?keys?")
+			.name("Input Key")
+			.description("Represents a movement input key that is pressed by a player.")
+			.since("2.10")
+			.requiredPlugins("Minecraft 1.21.3+"));
+
+		EventValues.registerEventValue(PlayerInputEvent.class, InputKey[].class,
+			event -> InputKey.fromInput(event.getInput()).toArray(new InputKey[0]));
+		EventValues.registerEventValue(PlayerInputEvent.class, InputKey[].class,
+			event -> InputKey.fromInput(event.getPlayer().getCurrentInput()).toArray(new InputKey[0]),
+			EventValues.TIME_PAST);
+	}
+
+}
diff --git a/src/main/java/org/skriptlang/skript/bukkit/input/elements/conditions/CondIsPressingKey.java b/src/main/java/org/skriptlang/skript/bukkit/input/elements/conditions/CondIsPressingKey.java
new file mode 100644
index 00000000000..98d3616df9d
--- /dev/null
+++ b/src/main/java/org/skriptlang/skript/bukkit/input/elements/conditions/CondIsPressingKey.java
@@ -0,0 +1,105 @@
+package org.skriptlang.skript.bukkit.input.elements.conditions;
+
+import ch.njol.skript.Skript;
+import ch.njol.skript.doc.*;
+import ch.njol.skript.effects.Delay;
+import ch.njol.skript.lang.Condition;
+import ch.njol.skript.lang.Expression;
+import ch.njol.skript.lang.SkriptParser.ParseResult;
+import ch.njol.skript.lang.SyntaxStringBuilder;
+import ch.njol.util.Kleenean;
+import ch.njol.util.coll.CollectionUtils;
+import org.bukkit.Input;
+import org.bukkit.entity.Player;
+import org.bukkit.event.Event;
+import org.bukkit.event.player.PlayerInputEvent;
+import org.jetbrains.annotations.Nullable;
+import org.skriptlang.skript.bukkit.input.InputKey;
+
+@Name("Is Pressing Key")
+@Description("Checks if a player is pressing a certain input key.")
+@Examples({
+	"on player input:",
+	"\tif player is pressing forward movement key:",
+		"\t\tsend \"You are moving forward!\""
+})
+@Since("2.10")
+@Keywords({"press", "input"})
+@RequiredPlugins("Minecraft 1.21.2+")
+public class CondIsPressingKey extends Condition {
+
+	static {
+		if (Skript.classExists("org.bukkit.event.player.PlayerInputEvent")) {
+			Skript.registerCondition(CondIsPressingKey.class,
+				"%players% (is|are) pressing %inputkeys%",
+				"%players% (isn't|is not|aren't|are not) pressing %inputkeys%",
+				"%players% (was|were) pressing %inputkeys%",
+				"%players% (wasn't|was not|weren't|were not) pressing %inputkeys%"
+			);
+		} else {
+			Skript.registerCondition(CondIsPressingKey.class,
+				"%players% (is|are) pressing %inputkeys%",
+				"%players% (isn't|is not|aren't|are not) pressing %inputkeys%"
+			);
+		}
+	}
+
+	private Expression<Player> players;
+	private Expression<InputKey> inputKeys;
+	private boolean past;
+	private boolean delayed;
+
+	@Override
+	public boolean init(Expression<?>[] expressions, int matchedPattern, Kleenean isDelayed, ParseResult parseResult) {
+		//noinspection unchecked
+		players = (Expression<Player>) expressions[0];
+		//noinspection unchecked
+		inputKeys = (Expression<InputKey>) expressions[1];
+		past = matchedPattern > 1;
+		delayed = !isDelayed.isFalse();
+		if (past) {
+			if (!getParser().isCurrentEvent(PlayerInputEvent.class)) {
+				Skript.warning("Checking the past state of a player's input outside the 'player input' event has no effect.");
+			} else if (delayed) {
+				Skript.warning("Checking the past state of a player's input after the event has passed has no effect.");
+			}
+		}
+		setNegated(matchedPattern == 1 || matchedPattern == 3);
+		return true;
+	}
+
+	@Override
+	public boolean check(Event event) {
+		Player eventPlayer = event instanceof PlayerInputEvent inputEvent ? inputEvent.getPlayer() : null;
+		InputKey[] inputKeys = this.inputKeys.getAll(event);
+		boolean and = this.inputKeys.getAnd();
+		boolean delayed = this.delayed || Delay.isDelayed(event);
+		return players.check(event, player -> {
+			Input input;
+			// If we want to get the new input of the event-player, we must get it from the event
+			if (!delayed && !past && player.equals(eventPlayer)) {
+				input = ((PlayerInputEvent) event).getInput();
+			} else { // Otherwise, we get the current (or past in case of an event-player) input
+				input = player.getCurrentInput();
+			}
+			return CollectionUtils.check(inputKeys, inputKey -> inputKey.check(input), and);
+		}, isNegated());
+	}
+
+	@Override
+	public String toString(@Nullable Event event, boolean debug) {
+		SyntaxStringBuilder builder = new SyntaxStringBuilder(event, debug);
+		builder.append(players);
+		if (past) {
+			builder.append(players.isSingle() ? "was" : "were");
+		} else {
+			builder.append(players.isSingle() ? "is" : "are");
+		}
+		if (isNegated())
+			builder.append("not");
+		builder.append("pressing");
+		builder.append(inputKeys);
+		return builder.toString();
+	}
+
+}
diff --git a/src/main/java/org/skriptlang/skript/bukkit/input/elements/events/EvtPlayerInput.java b/src/main/java/org/skriptlang/skript/bukkit/input/elements/events/EvtPlayerInput.java
new file mode 100644
index 00000000000..385f8882fa1
--- /dev/null
+++ b/src/main/java/org/skriptlang/skript/bukkit/input/elements/events/EvtPlayerInput.java
@@ -0,0 +1,124 @@
+package org.skriptlang.skript.bukkit.input.elements.events;
+
+import ch.njol.skript.Skript;
+import ch.njol.skript.lang.Literal;
+import ch.njol.skript.lang.SkriptEvent;
+import ch.njol.skript.lang.SkriptParser.ParseResult;
+import ch.njol.skript.lang.SyntaxStringBuilder;
+import org.bukkit.event.Event;
+import org.bukkit.event.player.PlayerInputEvent;
+import org.jetbrains.annotations.Nullable;
+import org.skriptlang.skript.bukkit.input.InputKey;
+
+import java.util.Set;
+
+public class EvtPlayerInput extends SkriptEvent {
+
+	static {
+		if (Skript.classExists("org.bukkit.event.player.PlayerInputEvent")) {
+			Skript.registerEvent("Player Input", EvtPlayerInput.class, PlayerInputEvent.class,
+					"[player] (toggle|toggling|1:press[ing]|2:release|2:releasing) of (%-inputkeys%|(an|any) input key)",
+					"([player] %-inputkeys%|[an|any [player]] input key) (toggle|toggling|1:press[ing]|2:release|2:releasing)")
+				.description("Called when a player sends an updated input to the server.",
+					"Note: The input keys event value is the set of keys the player is currently pressing, not the keys that were pressed or released.")
+				.examples("on any input key press:",
+					"\tsend \"You are pressing: %event-inputkeys%\" to player")
+				.since("2.10")
+				.requiredPlugins("Minecraft 1.21.3+");
+		}
+	}
+
+	private @Nullable Literal<InputKey> keysToCheck;
+	private InputType type;
+
+	@Override
+	public boolean init(Literal<?>[] args, int matchedPattern, ParseResult parseResult) {
+		//noinspection unchecked
+		keysToCheck = (Literal<InputKey>) args[0];
+		type = InputType.values()[parseResult.mark];
+		return true;
+	}
+
+	@Override
+	public boolean check(Event event) {
+		PlayerInputEvent inputEvent = (PlayerInputEvent) event;
+		Set<InputKey> previousKeys = InputKey.fromInput(inputEvent.getPlayer().getCurrentInput());
+		Set<InputKey> currentKeys = InputKey.fromInput(inputEvent.getInput());
+		Set<InputKey> keysToCheck = this.keysToCheck != null ? Set.of(this.keysToCheck.getAll()) : null;
+		boolean and = this.keysToCheck != null && this.keysToCheck.getAnd();
+		return type.checkInputKeys(previousKeys, currentKeys, keysToCheck, and);
+	}
+
+	@Override
+	public String toString(@Nullable Event event, boolean debug) {
+		SyntaxStringBuilder builder = new SyntaxStringBuilder(event, debug);
+		builder.append("player");
+		builder.append(type.name().toLowerCase());
+		builder.append(keysToCheck == null ? "any input key" : keysToCheck);
+		return builder.toString();
+	}
+
+	private enum InputType {
+
+		TOGGLE {
+			@Override
+			public boolean checkKeyState(boolean inPrevious, boolean inCurrent) {
+				return inPrevious != inCurrent;
+			}
+		},
+		PRESS {
+			@Override
+			public boolean checkKeyState(boolean inPrevious, boolean inCurrent) {
+				return !inPrevious && inCurrent;
+			}
+		},
+		RELEASE {
+			@Override
+			public boolean checkKeyState(boolean inPrevious, boolean inCurrent) {
+				return inPrevious && !inCurrent;
+			}
+		};
+
+		/**
+		 * Checks the state of a key based on its presence in the previous and current sets of keys.
+		 *
+		 * @param inPrevious true if the key was present in the previous set of keys, false otherwise
+		 * @param inCurrent true if the key is present in the current set of keys, false otherwise
+		 * @return true if the key state matches the condition defined by the input type, false otherwise
+		 */
+		public abstract boolean checkKeyState(boolean inPrevious, boolean inCurrent);
+
+		/**
+		 * Checks the input keys based on the previous and current sets of keys.
+		 * <br>
+		 * {@code previous} and {@code current} are never the same.
+		 *
+		 * @param previous the set of keys before the input change
+		 * @param current the set of keys after the input change
+		 * @param keysToCheck the set of keys to check against, can be null
+		 * @param and true if the keys to check must all be present, false if any key is enough
+		 * @return true if the condition is met based on the input type, false otherwise
+		 */
+		public boolean checkInputKeys(Set<InputKey> previous, Set<InputKey> current, @Nullable Set<InputKey> keysToCheck, boolean and) {
+			if (keysToCheck == null) {
+				return switch (this) {
+					case TOGGLE -> true;
+					case PRESS -> previous.size() <= current.size();
+					case RELEASE -> previous.size() >= current.size();
+				};
+			}
+			for (InputKey key : keysToCheck) {
+				boolean inPrevious = previous.contains(key);
+				boolean inCurrent = current.contains(key);
+				if (and && !checkKeyState(inPrevious, inCurrent)) {
+					return false;
+				} else if (!and && checkKeyState(inPrevious, inCurrent)) {
+					return true;
+				}
+			}
+			return and;
+		}
+
+	}
+
+}
diff --git a/src/main/java/org/skriptlang/skript/bukkit/input/elements/expressions/ExprCurrentInputKeys.java b/src/main/java/org/skriptlang/skript/bukkit/input/elements/expressions/ExprCurrentInputKeys.java
new file mode 100644
index 00000000000..5aaa079f769
--- /dev/null
+++ b/src/main/java/org/skriptlang/skript/bukkit/input/elements/expressions/ExprCurrentInputKeys.java
@@ -0,0 +1,83 @@
+package org.skriptlang.skript.bukkit.input.elements.expressions;
+
+import ch.njol.skript.Skript;
+import ch.njol.skript.doc.*;
+import ch.njol.skript.effects.Delay;
+import ch.njol.skript.expressions.base.PropertyExpression;
+import ch.njol.skript.lang.Expression;
+import ch.njol.skript.lang.SkriptParser.ParseResult;
+import ch.njol.skript.registrations.EventValues;
+import ch.njol.util.Kleenean;
+import org.bukkit.entity.Player;
+import org.bukkit.event.Event;
+import org.bukkit.event.player.PlayerInputEvent;
+import org.jetbrains.annotations.Nullable;
+import org.skriptlang.skript.bukkit.input.InputKey;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Name("Player Input Keys")
+@Description("Get the current input keys of a player.")
+@Examples("broadcast \"%player% is pressing %current input keys of player%\"")
+@Since("2.10")
+@RequiredPlugins("Minecraft 1.21.2+")
+public class ExprCurrentInputKeys extends PropertyExpression<Player, InputKey> {
+
+	private static final boolean SUPPORTS_TIME_STATES = Skript.classExists("org.bukkit.event.player.PlayerInputEvent");
+
+	static {
+		register(ExprCurrentInputKeys.class, InputKey.class, "[current] (inputs|input keys)", "players");
+	}
+
+	private boolean delayed;
+
+	@Override
+	public boolean init(Expression<?>[] expressions, int matchedPattern, Kleenean isDelayed, ParseResult parseResult) {
+		setExpr((Expression<? extends Player>) expressions[0]);
+		delayed = !isDelayed.isFalse();
+		return true;
+	}
+
+	@Override
+	protected InputKey[] get(Event event, Player[] source) {
+		Player eventPlayer = null;
+		if (SUPPORTS_TIME_STATES && getTime() == EventValues.TIME_NOW && event instanceof PlayerInputEvent inputEvent)
+			eventPlayer = inputEvent.getPlayer();
+
+		boolean delayed = this.delayed || Delay.isDelayed(event);
+
+		List<InputKey> inputKeys = new ArrayList<>();
+		for (Player player : source) {
+			if (!delayed && player.equals(eventPlayer)) {
+				inputKeys.addAll(InputKey.fromInput(((PlayerInputEvent) event).getInput()));
+			} else {
+				inputKeys.addAll(InputKey.fromInput(player.getCurrentInput()));
+			}
+		}
+		return inputKeys.toArray(new InputKey[0]);
+	}
+
+	@Override
+	public boolean isSingle() {
+		return false;
+	}
+
+	@Override
+	public Class<? extends InputKey> getReturnType() {
+		return InputKey.class;
+	}
+
+	@Override
+	public boolean setTime(int time) {
+		if (!SUPPORTS_TIME_STATES)
+			return super.setTime(time);
+		return time != EventValues.TIME_FUTURE && setTime(time, PlayerInputEvent.class);
+	}
+
+	@Override
+	public String toString(@Nullable Event event, boolean debug) {
+		return "the current input keys of " + getExpr().toString(event, debug);
+	}
+
+}
diff --git a/src/main/java/org/skriptlang/skript/bukkit/log/runtime/BukkitRuntimeErrorConsumer.java b/src/main/java/org/skriptlang/skript/bukkit/log/runtime/BukkitRuntimeErrorConsumer.java
new file mode 100644
index 00000000000..bd9b2201eb3
--- /dev/null
+++ b/src/main/java/org/skriptlang/skript/bukkit/log/runtime/BukkitRuntimeErrorConsumer.java
@@ -0,0 +1,137 @@
+package org.skriptlang.skript.bukkit.log.runtime;
+
+import ch.njol.skript.localization.ArgsMessage;
+import ch.njol.skript.log.SkriptLogger;
+import ch.njol.skript.util.Utils;
+import org.bukkit.Bukkit;
+import org.bukkit.entity.Player;
+import org.jetbrains.annotations.NotNull;
+import org.skriptlang.skript.log.runtime.ErrorSource;
+import org.skriptlang.skript.log.runtime.ErrorSource.Location;
+import org.skriptlang.skript.log.runtime.Frame.FrameOutput;
+import org.skriptlang.skript.log.runtime.RuntimeError;
+import org.skriptlang.skript.log.runtime.RuntimeErrorConsumer;
+
+import java.util.Set;
+import java.util.logging.Level;
+import java.util.stream.Collectors;
+
+/**
+ * An implementation for Bukkit based platforms.
+ * Sends errors to console with formatted colours and a notification chat message to
+ * users with the see_runtime_errors permission.
+ */
+public class BukkitRuntimeErrorConsumer implements RuntimeErrorConsumer {
+
+	public static final String ERROR_NOTIF_PERMISSION = "skript.see_runtime_errors";
+
+	public static final String CONFIG_NODE = "log.runtime";
+	public static final ArgsMessage WARNING_DETAILS = new ArgsMessage("skript command.reload.warning details");
+	public static final ArgsMessage ERROR_DETAILS = new ArgsMessage( "skript command.reload.error details");
+	public static final ArgsMessage OTHER_DETAILS = new ArgsMessage("skript command.reload.other details");
+
+	public static final ArgsMessage ERROR_INFO = new ArgsMessage(CONFIG_NODE + ".error");
+	public static final ArgsMessage WARNING_INFO = new ArgsMessage(CONFIG_NODE + ".warning");
+	public static final ArgsMessage LINE_INFO = new ArgsMessage(CONFIG_NODE + ".line info");
+
+	public static final ArgsMessage ERROR_SKIPPED = new ArgsMessage(CONFIG_NODE + ".errors skipped");
+	public static final ArgsMessage ERROR_TIMEOUT = new ArgsMessage(CONFIG_NODE + ".errors timed out");
+	public static final ArgsMessage ERROR_NOTIF = new ArgsMessage(CONFIG_NODE + ".error notification");
+	public static final ArgsMessage ERROR_NOTIF_PLURAL = new ArgsMessage(CONFIG_NODE + ".error notification plural");
+
+	public static final ArgsMessage WARNING_SKIPPED = new ArgsMessage(CONFIG_NODE + ".warnings skipped");
+	public static final ArgsMessage WARNING_TIMEOUT = new ArgsMessage(CONFIG_NODE + ".warnings timed out");
+	public static final ArgsMessage WARNING_NOTIF = new ArgsMessage(CONFIG_NODE + ".warning notification");
+	public static final ArgsMessage WARNING_NOTIF_PLURAL = new ArgsMessage(CONFIG_NODE + ".warning notification plural");
+
+	@Override
+	public void printError(@NotNull RuntimeError error) {
+		ArgsMessage details;
+		ArgsMessage info;
+		if (error.level().intValue() == Level.WARNING.intValue()) { // warnings
+			details = WARNING_DETAILS;
+			info = WARNING_INFO;
+		} else if (error.level().intValue() == Level.SEVERE.intValue()) { // errors
+			details = ERROR_DETAILS;
+			info = ERROR_INFO;
+		} else { // anything else
+			details = OTHER_DETAILS;
+			info = WARNING_INFO;
+		}
+
+		String skriptInfo = replaceNewline(Utils.replaceEnglishChatStyles(info.getValue() == null ? info.key : info.getValue()));
+		String errorInfo = replaceNewline(Utils.replaceEnglishChatStyles(details.getValue() == null ? details.key : details.getValue()));
+		String lineInfo = replaceNewline(Utils.replaceEnglishChatStyles(
+				LINE_INFO.getValue() == null ? LINE_INFO.key : LINE_INFO.getValue()));
+
+		ErrorSource source = error.source();
+		String code = source.lineText();
+		if (error.toHighlight() != null && !error.toHighlight().isEmpty())
+			code = code.replace("§", "&").replace(error.toHighlight(), "§f§n" + error.toHighlight() + "§7");
+
+		SkriptLogger.sendFormatted(Bukkit.getConsoleSender(),
+				String.format(skriptInfo, source.script(), source.syntaxName(), source.syntaxType()) +
+				String.format(errorInfo, error.error().replace("§", "&")) +
+				String.format(lineInfo, source.lineNumber(), code));
+	}
+
+	@Override
+	public void printFrameOutput(@NotNull FrameOutput output, Level level) {
+
+		if (!output.skippedErrors().isEmpty()) {
+			String linesNotDisplayed = output.skippedErrors().entrySet().stream()
+				.map(entry -> "'"+ entry.getKey().script() + "' line " + entry.getKey().lineNumber() + " (" + entry.getValue() + ")")
+				.collect(Collectors.joining(", "));
+
+			int skipped = output.skippedErrors().values().stream().reduce(0, Integer::sum);
+
+			ArgsMessage message = level == Level.SEVERE ? ERROR_SKIPPED : WARNING_SKIPPED;
+			String line = message.getValue() != null ? message.getValue() : message.key;
+
+			SkriptLogger.sendFormatted(Bukkit.getConsoleSender(),
+				Utils.replaceEnglishChatStyles(
+					String.format(line, skipped, linesNotDisplayed)
+				)
+			);
+		}
+
+		ArgsMessage message = level == Level.SEVERE ? ERROR_TIMEOUT : WARNING_TIMEOUT;
+		String timeoutLine = message.getValue() != null ? message.getValue() : message.key;
+		for (Location location : output.newTimeouts()) {
+			SkriptLogger.sendFormatted(Bukkit.getConsoleSender(),
+				Utils.replaceEnglishChatStyles(
+					String.format(timeoutLine, location.lineNumber(), location.script(),
+							output.frameLimits().lineTimeoutLimit(), output.frameLimits().timeoutDuration())
+				)
+			);
+		}
+
+		if (!output.totalErrors().isEmpty()) {
+			ArgsMessage notification;
+			// get various scripts from nodes
+			Set<String> scripts = output.totalErrors().keySet().stream()
+				.map(Location::script)
+				.collect(Collectors.toSet());
+			notification = level == Level.SEVERE ? ERROR_NOTIF : WARNING_NOTIF;
+			if (scripts.size() > 1) {
+				notification = level == Level.SEVERE ? ERROR_NOTIF_PLURAL : WARNING_NOTIF_PLURAL;
+			}
+
+			String notif = notification.getValue() != null ? notification.getValue() : notification.key;
+			for (Player player : Bukkit.getOnlinePlayers()) {
+				if (player.hasPermission(ERROR_NOTIF_PERMISSION)) {
+					SkriptLogger.sendFormatted(player,
+						Utils.replaceEnglishChatStyles(
+							String.format(notif, scripts.iterator().next(), scripts.size() - 1)
+						)
+					);
+				}
+			}
+		}
+	}
+
+	private static @NotNull String replaceNewline(@NotNull String s) {
+		return s.replaceAll("\\\\n", "\n");
+	}
+
+}
diff --git a/src/main/java/org/skriptlang/skript/bukkit/loottables/LootContextCreateEvent.java b/src/main/java/org/skriptlang/skript/bukkit/loottables/LootContextCreateEvent.java
new file mode 100644
index 00000000000..4f00c85ed74
--- /dev/null
+++ b/src/main/java/org/skriptlang/skript/bukkit/loottables/LootContextCreateEvent.java
@@ -0,0 +1,27 @@
+package org.skriptlang.skript.bukkit.loottables;
+
+import org.bukkit.event.Event;
+import org.bukkit.event.HandlerList;
+import org.skriptlang.skript.bukkit.loottables.elements.expressions.ExprSecCreateLootContext;
+
+/**
+ * The event used in the {@link ExprSecCreateLootContext} section.
+ */
+public class LootContextCreateEvent extends Event {
+
+	private final LootContextWrapper contextWrapper;
+
+	public LootContextCreateEvent(LootContextWrapper context) {
+		this.contextWrapper = context;
+	}
+
+	public LootContextWrapper getContextWrapper() {
+		return contextWrapper;
+	}
+
+	@Override
+	public HandlerList getHandlers() {
+		throw new UnsupportedOperationException();
+	}
+
+}
diff --git a/src/main/java/org/skriptlang/skript/bukkit/loottables/LootContextWrapper.java b/src/main/java/org/skriptlang/skript/bukkit/loottables/LootContextWrapper.java
new file mode 100644
index 00000000000..35aa234d49d
--- /dev/null
+++ b/src/main/java/org/skriptlang/skript/bukkit/loottables/LootContextWrapper.java
@@ -0,0 +1,112 @@
+package org.skriptlang.skript.bukkit.loottables;
+
+import org.bukkit.Location;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.Player;
+import org.bukkit.loot.LootContext;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * Wrapper for a LootContext.Builder to allow easier creation of LootContexts.
+ */
+public class LootContextWrapper {
+
+	private @NotNull Location location;
+	private transient @Nullable LootContext cachedLootContext;
+	private @Nullable Player killer;
+	private @Nullable Entity entity;
+	private float luck;
+
+	/**
+	 * Creates a new LootContextWrapper at the given location.
+	 * @param location the location of the LootContext.
+	 */
+	public LootContextWrapper(@NotNull Location location) {
+		this.location = location;
+	}
+
+	/**
+	 * Gets the LootContext from the wrapper.
+	 * @return the LootContext.
+	 */
+	public LootContext getContext() {
+		if (cachedLootContext == null)
+			cachedLootContext = new LootContext.Builder(location)
+				.killer(killer)
+				.lootedEntity(entity)
+				.luck(luck)
+				.build();
+
+		return cachedLootContext;
+	}
+
+	/**
+	 * Sets the location of the LootContext.
+	 * @param location the location.
+	 */
+	public void setLocation(@NotNull Location location) {
+		this.location = location;
+		cachedLootContext = null;
+	}
+
+	/**
+	 * Sets the killer of the LootContext.
+	 * @param killer the killer.
+	 */
+	public void setKiller(@Nullable Player killer) {
+		this.killer = killer;
+		cachedLootContext = null;
+	}
+
+	/**
+	 * Sets the entity of the LootContext.
+	 * @param entity the entity.
+	 */
+	public void setEntity(@Nullable Entity entity) {
+		this.entity = entity;
+		cachedLootContext = null;
+	}
+
+	/**
+	 * Sets the luck of the LootContext.
+	 * @param luck the luck value.
+	 */
+	public void setLuck(float luck) {
+		this.luck = luck;
+		cachedLootContext = null;
+	}
+
+	/**
+	 * Gets the location of the LootContext.
+	 * @return the location.
+	 */
+	public Location getLocation() {
+		return location;
+	}
+
+	/**
+	 * Gets the killer of the LootContext.
+	 * @return the killer.
+	 */
+	public @Nullable Player getKiller() {
+		return killer;
+	}
+
+	/**
+	 * Gets the entity of the LootContext.
+	 * @return the entity.
+	 */
+	public @Nullable Entity getEntity() {
+		return entity;
+	}
+
+	/**
+	 * Gets the luck of the LootContext.
+	 * @return the luck value.
+	 */
+	public float getLuck() {
+		return luck;
+	}
+
+}
diff --git a/src/main/java/org/skriptlang/skript/bukkit/loottables/LootTableModule.java b/src/main/java/org/skriptlang/skript/bukkit/loottables/LootTableModule.java
new file mode 100644
index 00000000000..25770b763cf
--- /dev/null
+++ b/src/main/java/org/skriptlang/skript/bukkit/loottables/LootTableModule.java
@@ -0,0 +1,127 @@
+package org.skriptlang.skript.bukkit.loottables;
+
+import ch.njol.skript.Skript;
+import ch.njol.skript.classes.ClassInfo;
+import ch.njol.skript.classes.Parser;
+import ch.njol.skript.expressions.base.EventValueExpression;
+import ch.njol.skript.lang.ParseContext;
+import ch.njol.skript.lang.util.SimpleEvent;
+import ch.njol.skript.registrations.Classes;
+import ch.njol.skript.registrations.EventValues;
+import org.bukkit.Bukkit;
+import org.bukkit.Location;
+import org.bukkit.NamespacedKey;
+import org.bukkit.entity.Entity;
+import org.bukkit.event.world.LootGenerateEvent;
+import org.bukkit.loot.LootContext;
+import org.bukkit.loot.LootTable;
+import org.jetbrains.annotations.Nullable;
+
+import java.io.IOException;
+
+public class LootTableModule {
+
+	public static void load() throws IOException {
+
+		// --- CLASSES --- //
+
+		Classes.registerClass(new ClassInfo<>(LootTable.class, "loottable")
+			.user("loot ?tables?")
+			.name("Loot Table")
+			.description(
+				"Loot tables represent what items should be in naturally generated containers, "
+					+ "what items should be dropped when killing a mob, or what items can be fished.",
+				"You can find more information about this in https://minecraft.wiki/w/Loot_table"
+			)
+			.since("2.10")
+			.parser(new Parser<>() {
+				@Override
+				public @Nullable LootTable parse(String key, ParseContext context) {
+					NamespacedKey namespacedKey = NamespacedKey.fromString(key);
+					if (namespacedKey == null)
+						return null;
+					return Bukkit.getLootTable(namespacedKey);
+				}
+
+				@Override
+				public String toString(LootTable o, int flags) {
+					return "loot table \"" + o.getKey() + '\"';
+				}
+
+				@Override
+				public String toVariableNameString(LootTable o) {
+					return "loot table:" + o.getKey();
+				}
+			})
+		);
+
+		Classes.registerClass(new ClassInfo<>(LootContext.class, "lootcontext")
+			.user("loot ?contexts?")
+			.name("Loot Context")
+			.description(
+				"Represents additional information a loot table can use to modify its generated loot.",
+				"",
+				"Some loot tables will require some values (i.e. looter, location, looted entity) "
+					+ "in a loot context when generating loot whereas others may not.",
+				"For example, the loot table of a simple dungeon chest will only require a location, "
+					+ "whereas the loot table of a cow will require a looting player, looted entity, and location.",
+				"You can find more information about this in https://minecraft.wiki/w/Loot_context"
+			)
+			.since("2.10")
+			.defaultExpression(new EventValueExpression<>(LootContext.class))
+			.parser(new Parser<>() {
+				@Override
+				public boolean canParse(ParseContext context) {
+					return false;
+				}
+
+				@Override
+				public String toString(LootContext context, int flags) {
+					StringBuilder builder = new StringBuilder("loot context at ")
+						.append(Classes.toString(context.getLocation()));
+
+					if (context.getLootedEntity() != null)
+						builder.append(" with entity ").append(Classes.toString(context.getLootedEntity()));
+					if (context.getKiller() != null)
+						builder.append(" with killer ").append(Classes.toString(context.getKiller()));
+					if (context.getLuck() != 0)
+						builder.append(" with luck ").append(context.getLuck());
+
+					return builder.toString();
+				}
+
+				@Override
+				public String toVariableNameString(LootContext context) {
+					return "loot context:" + context.hashCode();
+				}
+			})
+		);
+
+		Skript.getAddonInstance().loadClasses("org.skriptlang.skript.bukkit.loottables", "elements");
+
+		// --- SIMPLE EVENTS --- //
+
+		Skript.registerEvent("Loot Generate", SimpleEvent.class, LootGenerateEvent.class, "loot generat(e|ing)")
+			.description(
+				"Called when a loot table of an inventory is generated in the world.",
+				"For example, when opening a shipwreck chest."
+			)
+			.examples(
+				"on loot generate:",
+					"\tchance of 10%",
+					"\tadd 64 diamonds to the loot",
+					"\tsend \"You hit the jackpot at %event-location%!\""
+			)
+			.since("2.7")
+			.requiredPlugins("MC 1.16+");
+
+		// --- EVENT VALUES --- //
+
+		// LootGenerateEvent
+		EventValues.registerEventValue(LootGenerateEvent.class, Entity.class, LootGenerateEvent::getEntity);
+		EventValues.registerEventValue(LootGenerateEvent.class, Location.class, event -> event.getLootContext().getLocation());
+		EventValues.registerEventValue(LootGenerateEvent.class, LootTable.class, LootGenerateEvent::getLootTable);
+		EventValues.registerEventValue(LootGenerateEvent.class, LootContext.class, LootGenerateEvent::getLootContext);
+	}
+
+}
diff --git a/src/main/java/org/skriptlang/skript/bukkit/loottables/LootTableUtils.java b/src/main/java/org/skriptlang/skript/bukkit/loottables/LootTableUtils.java
new file mode 100644
index 00000000000..de998f8c6c0
--- /dev/null
+++ b/src/main/java/org/skriptlang/skript/bukkit/loottables/LootTableUtils.java
@@ -0,0 +1,55 @@
+package org.skriptlang.skript.bukkit.loottables;
+
+import org.bukkit.block.Block;
+import org.bukkit.block.BlockState;
+import org.bukkit.loot.LootTable;
+import org.bukkit.loot.Lootable;
+
+/**
+ * Utility class for loot tables.
+ */
+public class LootTableUtils {
+
+	/**
+	 * * Checks whether a block or entity is an instance of {@link Lootable}. This is done because a block is not an instance of Lootable, but a block state is.
+	 * @param object the object to check.
+	 * @return whether the object is lootable.
+	 */
+	public static boolean isLootable(Object object) {
+		if (object instanceof Block block)
+			object = block.getState();
+		return object instanceof Lootable;
+	}
+
+	/**
+	 * Gets the Lootable instance of an object. You should call {@link #isLootable(Object)} before calling this method.
+	 * @param object the object to get the Lootable instance of.
+	 * @return the Lootable instance of the object.
+	 */
+	public static Lootable getAsLootable(Object object) {
+		if (object instanceof Block block)
+			object = block.getState();
+		if (object instanceof Lootable lootable)
+			return lootable;
+		return null;
+	}
+
+	/**
+	 * Gets the loot table of an object. You should call {@link #isLootable(Object)} before calling this method.
+	 * @param object the object to get the loot table of.
+	 * @return returns the LootTable of the object.
+	 */
+	public static LootTable getLootTable(Object object) {
+		return getAsLootable(object).getLootTable();
+	}
+
+	/**
+	 * Updates the state of a Lootable. This is done because setting the LootTable or seed of a BlockState changes the NBT value, but is never updated.
+	 * @param lootable the Lootable to update the state of.
+	 */
+	public static void updateState(Lootable lootable) {
+		if (lootable instanceof BlockState blockState)
+			blockState.update(true, false);
+	}
+
+}
diff --git a/src/main/java/org/skriptlang/skript/bukkit/loottables/elements/conditions/CondHasLootTable.java b/src/main/java/org/skriptlang/skript/bukkit/loottables/elements/conditions/CondHasLootTable.java
new file mode 100644
index 00000000000..65347d2ea3b
--- /dev/null
+++ b/src/main/java/org/skriptlang/skript/bukkit/loottables/elements/conditions/CondHasLootTable.java
@@ -0,0 +1,42 @@
+package org.skriptlang.skript.bukkit.loottables.elements.conditions;
+
+import ch.njol.skript.conditions.base.PropertyCondition;
+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 org.skriptlang.skript.bukkit.loottables.LootTableUtils;
+
+@Name("Has Loot Table")
+@Description(
+	"Checks whether an entity or block has a loot table. "
+	+ "The loot tables of chests will be deleted when the chest is opened or broken."
+)
+@Examples({
+	"set event-block to chest",
+	"if event-block has a loot table:",
+		"\t# this will never happen, because it doesn't have a loot table.",
+	"",
+	"set loot table of event-block to \"minecraft:chests/simple_dungeon\"",
+	"",
+	"if event-block has a loot table:",
+		"\t# this will happen, because it now has a loot table."
+})
+@Since("2.10")
+public class CondHasLootTable extends PropertyCondition<Object> {
+
+	static {
+		register(CondHasLootTable.class, PropertyType.HAVE, "[a] loot[ ]table", "blocks/entities");
+	}
+
+	@Override
+	public boolean check(Object object) {
+		return LootTableUtils.isLootable(object) && LootTableUtils.getLootTable(object) != null;
+	}
+
+	@Override
+	protected String getPropertyName() {
+		return "a loot table";
+	}
+
+}
diff --git a/src/main/java/org/skriptlang/skript/bukkit/loottables/elements/conditions/CondIsLootable.java b/src/main/java/org/skriptlang/skript/bukkit/loottables/elements/conditions/CondIsLootable.java
new file mode 100644
index 00000000000..0ddf9803b18
--- /dev/null
+++ b/src/main/java/org/skriptlang/skript/bukkit/loottables/elements/conditions/CondIsLootable.java
@@ -0,0 +1,48 @@
+package org.skriptlang.skript.bukkit.loottables.elements.conditions;
+
+import ch.njol.skript.conditions.base.PropertyCondition;
+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 org.skriptlang.skript.bukkit.loottables.LootTableUtils;
+
+@Name("Is Lootable")
+@Description(
+	"Checks whether an entity or block is lootable. "
+	+ "Lootables are entities or blocks that can have a loot table."
+)
+@Examples({
+	"spawn a pig at event-location",
+	"set {_pig} to last spawned entity",
+	"if {_pig} is lootable:",
+		"\tset loot table of {_pig} to \"minecraft:entities/cow\"",
+		"\t# the pig will now drop the loot of a cow when killed, because it is indeed a lootable entity.",
+
+	"set block at event-location to chest",
+	"if block at event-location is lootable:",
+		"\tset loot table of block at event-location to \"minecraft:chests/simple_dungeon\"",
+		"\t# the chest will now generate the loot of a simple dungeon when opened, because it is indeed a lootable block.",
+
+	"set block at event-location to wool block",
+	"if block at event-location is lootable:",
+		"\t# uh oh, nothing will happen because a wool is not a lootable block."
+})
+@Since("2.10")
+public class CondIsLootable extends PropertyCondition<Object> {
+
+	static {
+		register(CondIsLootable.class, "lootable", "blocks/entities");
+	}
+
+	@Override
+	public boolean check(Object object) {
+		return LootTableUtils.isLootable(object);
+	}
+
+	@Override
+	protected String getPropertyName() {
+		return "lootable";
+	}
+
+}
diff --git a/src/main/java/org/skriptlang/skript/bukkit/loottables/elements/effects/EffGenerateLoot.java b/src/main/java/org/skriptlang/skript/bukkit/loottables/elements/effects/EffGenerateLoot.java
new file mode 100644
index 00000000000..bdcec21cfe4
--- /dev/null
+++ b/src/main/java/org/skriptlang/skript/bukkit/loottables/elements/effects/EffGenerateLoot.java
@@ -0,0 +1,93 @@
+package org.skriptlang.skript.bukkit.loottables.elements.effects;
+
+import ch.njol.skript.Skript;
+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.Effect;
+import ch.njol.skript.lang.Expression;
+import ch.njol.skript.lang.SkriptParser.ParseResult;
+import ch.njol.skript.lang.SyntaxStringBuilder;
+import ch.njol.util.Kleenean;
+import org.bukkit.Bukkit;
+import org.bukkit.event.Event;
+import org.bukkit.inventory.Inventory;
+import org.bukkit.loot.LootContext;
+import org.bukkit.loot.LootTable;
+import org.jetbrains.annotations.Nullable;
+import org.skriptlang.skript.bukkit.loottables.LootContextWrapper;
+
+import java.util.Random;
+import java.util.concurrent.ThreadLocalRandom;
+
+@Name("Generate Loot")
+@Description({
+	"Generates the loot in the specified inventories from a loot table using a loot context. "
+		+ "Not specifying a loot context will use a loot context with a location at the world's origin.",
+	"Note that if the inventory is full, it will cause warnings in the console due to over-filling the inventory."
+})
+@Examples({
+	"generate loot of loot table \"minecraft:chests/simple_dungeon\" using loot context at player in {_inventory}",
+	"generate loot using \"minecraft:chests/shipwreck_supply\" in {_inventory}"
+})
+@Since("2.10")
+public class EffGenerateLoot extends Effect {
+
+	static {
+		Skript.registerEffect(EffGenerateLoot.class,
+			"generate [the] loot (of|using) %loottable% [(with|using) %-lootcontext%] in %inventories%"
+		);
+	}
+
+	private Expression<LootTable> lootTable;
+	private Expression<LootContext> context;
+	private Expression<Inventory> inventories;
+
+	@Override
+	@SuppressWarnings("unchecked")
+	public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelayed, ParseResult parseResult) {
+		lootTable = (Expression<LootTable>) exprs[0];
+		context = (Expression<LootContext>) exprs[1];
+		inventories = (Expression<Inventory>) exprs[2];
+		return true;
+	}
+
+	@Override
+	protected void execute(Event event) {
+		Random random = ThreadLocalRandom.current();
+
+		LootContext context;
+		if (this.context != null) {
+			context = this.context.getSingle(event);
+			if (context == null)
+				return;
+		} else {
+			context = new LootContextWrapper(Bukkit.getWorlds().get(0).getSpawnLocation()).getContext();
+		}
+
+		LootTable table = lootTable.getSingle(event);
+		if (table == null)
+			return;
+
+		for (Inventory inventory : inventories.getArray(event)) {
+			try {
+				// todo: perhaps runtime error in the future
+				table.fillInventory(inventory, random, context);
+			} catch (IllegalArgumentException ignore) {}
+		}
+	}
+
+	@Override
+	public String toString(@Nullable Event event, boolean debug) {
+		SyntaxStringBuilder builder = new SyntaxStringBuilder(event, debug);
+
+		builder.append("generate loot using", lootTable);
+		if (context != null)
+			builder.append("with", context);
+		builder.append("in", inventories);
+
+		return builder.toString();
+	}
+
+}
diff --git a/src/main/java/ch/njol/skript/expressions/ExprLoot.java b/src/main/java/org/skriptlang/skript/bukkit/loottables/elements/expressions/ExprLoot.java
similarity index 50%
rename from src/main/java/ch/njol/skript/expressions/ExprLoot.java
rename to src/main/java/org/skriptlang/skript/bukkit/loottables/elements/expressions/ExprLoot.java
index 0e301cea422..fe01cd2c1d4 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprLoot.java
+++ b/src/main/java/org/skriptlang/skript/bukkit/loottables/elements/expressions/ExprLoot.java
@@ -1,22 +1,4 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
-package ch.njol.skript.expressions;
+package org.skriptlang.skript.bukkit.loottables.elements.expressions;
 
 import ch.njol.skript.Skript;
 import ch.njol.skript.classes.Changer.ChangeMode;
@@ -43,17 +25,16 @@
 @Description("The loot that will be generated in a 'loot generate' event.")
 @Examples({
 	"on loot generate:",
-	"\tchance of %10",
-	"\tadd 64 diamonds",
-	"\tsend \"You hit the jackpot!!\""
+		"\tchance of %10",
+		"\tadd 64 diamonds to loot",
+		"\tsend \"You hit the jackpot!!\""
 })
 @Since("2.7")
 @RequiredPlugins("MC 1.16+")
 public class ExprLoot extends SimpleExpression<ItemStack> {
 
 	static {
-		if (Skript.classExists("org.bukkit.event.world.LootGenerateEvent"))
-			Skript.registerExpression(ExprLoot.class, ItemStack.class, ExpressionType.SIMPLE, "[the] loot");
+		Skript.registerExpression(ExprLoot.class, ItemStack.class, ExpressionType.SIMPLE, "[the] loot");
 	}
 
 	@Override
@@ -67,31 +48,25 @@ public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelaye
 
 	@Override
 	@Nullable
-	protected ItemStack[] get(Event event) {
-		if (!(event instanceof LootGenerateEvent))
+	protected ItemStack @Nullable [] get(Event event) {
+		if (!(event instanceof LootGenerateEvent lootEvent))
 			return new ItemStack[0];
-		return ((LootGenerateEvent) event).getLoot().toArray(new ItemStack[0]);
+		return lootEvent.getLoot().toArray(new ItemStack[0]);
 	}
 
 	@Override
 	@Nullable
-	public Class<?>[] acceptChange(ChangeMode mode) {
-		switch (mode) {
-			case ADD:
-			case REMOVE:
-			case SET:
-			case DELETE:
-				return CollectionUtils.array(ItemStack[].class);
-			default:
-				return null;
-		}
+	public Class<?> @Nullable [] acceptChange(ChangeMode mode) {
+		return switch (mode) {
+			case DELETE, ADD, REMOVE, SET -> CollectionUtils.array(ItemStack[].class);
+			default -> null;
+		};
 	}
 
 	@Override
-	public void change(Event event, @Nullable Object[] delta, ChangeMode mode) {
-		if (!(event instanceof LootGenerateEvent))
+	public void change(Event event, Object @Nullable [] delta, ChangeMode mode) {
+		if (!(event instanceof LootGenerateEvent lootEvent))
 			return;
-		LootGenerateEvent lootEvent = (LootGenerateEvent) event;
 
 		List<ItemStack> items = null;
 		if (delta != null) {
@@ -101,18 +76,10 @@ public void change(Event event, @Nullable Object[] delta, ChangeMode mode) {
 		}
 
 		switch (mode) {
-			case ADD:
-				lootEvent.getLoot().addAll(items);
-				break;
-			case REMOVE:
-				lootEvent.getLoot().removeAll(items);
-				break;
-			case SET:
-				lootEvent.setLoot(items);
-				break;
-			case DELETE:
-				lootEvent.getLoot().clear();
-				break;
+			case ADD -> lootEvent.getLoot().addAll(items);
+			case REMOVE -> lootEvent.getLoot().removeAll(items);
+			case SET -> lootEvent.setLoot(items);
+			case DELETE -> lootEvent.getLoot().clear();
 		}
 	}
 
diff --git a/src/main/java/org/skriptlang/skript/bukkit/loottables/elements/expressions/ExprLootContext.java b/src/main/java/org/skriptlang/skript/bukkit/loottables/elements/expressions/ExprLootContext.java
new file mode 100644
index 00000000000..19fe1bea589
--- /dev/null
+++ b/src/main/java/org/skriptlang/skript/bukkit/loottables/elements/expressions/ExprLootContext.java
@@ -0,0 +1,32 @@
+package org.skriptlang.skript.bukkit.loottables.elements.expressions;
+
+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.expressions.base.EventValueExpression;
+import org.bukkit.loot.LootContext;
+
+@Name("Loot Context")
+@Description("The loot context involved in the context create section.")
+@Examples({
+	"set {_context} to a new loot context at {_location}:",
+		"\tbroadcast loot context"
+})
+@Since("2.10")
+public class ExprLootContext extends EventValueExpression<LootContext> {
+
+	static {
+		register(ExprLootContext.class, LootContext.class, "loot[ ]context");
+	}
+
+	public ExprLootContext() {
+		super(LootContext.class);
+	}
+
+	@Override
+	public String toString() {
+		return "the loot context";
+	}
+
+}
diff --git a/src/main/java/org/skriptlang/skript/bukkit/loottables/elements/expressions/ExprLootContextEntity.java b/src/main/java/org/skriptlang/skript/bukkit/loottables/elements/expressions/ExprLootContextEntity.java
new file mode 100644
index 00000000000..a46c5409e7f
--- /dev/null
+++ b/src/main/java/org/skriptlang/skript/bukkit/loottables/elements/expressions/ExprLootContextEntity.java
@@ -0,0 +1,71 @@
+package org.skriptlang.skript.bukkit.loottables.elements.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;
+import ch.njol.skript.doc.Name;
+import ch.njol.skript.doc.Since;
+import ch.njol.skript.expressions.base.SimplePropertyExpression;
+import ch.njol.util.coll.CollectionUtils;
+import org.bukkit.entity.Entity;
+import org.bukkit.event.Event;
+import org.bukkit.loot.LootContext;
+import org.jetbrains.annotations.Nullable;
+import org.skriptlang.skript.bukkit.loottables.LootContextCreateEvent;
+
+@Name("Looted Entity of Loot Context")
+@Description("Returns the looted entity of a loot context.")
+@Examples({
+	"set {_entity} to looted entity of {_context}",
+	"",
+	"set {_context} to a loot context at player:",
+		"\tset loot luck value to 10",
+		"\tset looter to player",
+		"\tset looted entity to last spawned pig"
+})
+@Since("2.10")
+public class ExprLootContextEntity extends SimplePropertyExpression<LootContext, Entity> {
+
+	static {
+		registerDefault(ExprLootContextEntity.class, Entity.class, "looted entity", "lootcontexts");
+	}
+
+	@Override
+	public @Nullable Entity convert(LootContext context) {
+		return context.getLootedEntity();
+	}
+
+	@Override
+	public Class<?> @Nullable [] acceptChange(ChangeMode mode) {
+		if (!getParser().isCurrentEvent(LootContextCreateEvent.class)) {
+			Skript.error("You cannot set the looted entity of an existing loot context.");
+			return null;
+		}
+
+		return switch (mode) {
+			case SET, DELETE, RESET -> CollectionUtils.array(Entity.class);
+			default -> null;
+		};
+	}
+
+	@Override
+	public void change(Event event, Object @Nullable [] delta, ChangeMode mode) {
+		if (!(event instanceof LootContextCreateEvent createEvent))
+			return;
+
+		Entity entity = delta != null ? (Entity) delta[0] : null;
+		createEvent.getContextWrapper().setEntity(entity);
+	}
+
+	@Override
+	public Class<? extends Entity> getReturnType() {
+		return Entity.class;
+	}
+
+	@Override
+	protected String getPropertyName() {
+		return "looted entity";
+	}
+
+}
diff --git a/src/main/java/org/skriptlang/skript/bukkit/loottables/elements/expressions/ExprLootContextLocation.java b/src/main/java/org/skriptlang/skript/bukkit/loottables/elements/expressions/ExprLootContextLocation.java
new file mode 100644
index 00000000000..ee7244cb41f
--- /dev/null
+++ b/src/main/java/org/skriptlang/skript/bukkit/loottables/elements/expressions/ExprLootContextLocation.java
@@ -0,0 +1,69 @@
+package org.skriptlang.skript.bukkit.loottables.elements.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;
+import ch.njol.skript.doc.Name;
+import ch.njol.skript.doc.Since;
+import ch.njol.skript.expressions.base.SimplePropertyExpression;
+import ch.njol.util.coll.CollectionUtils;
+import org.bukkit.Location;
+import org.bukkit.event.Event;
+import org.bukkit.loot.LootContext;
+import org.jetbrains.annotations.Nullable;
+import org.skriptlang.skript.bukkit.loottables.LootContextCreateEvent;
+
+@Name("Loot Location of Loot Context")
+@Description("Returns the loot location of a loot context.")
+@Examples({
+	"set {_player} to player",
+	"set {_context} to a loot context at player:",
+		"\tif {_player} is in \"world_nether\":",
+			"\t\tset loot location to location of last spawned pig",
+	"send loot location of {_context} to player"
+})
+@Since("2.10")
+public class ExprLootContextLocation extends SimplePropertyExpression<LootContext, Location> {
+
+	static {
+		registerDefault(ExprLootContextLocation.class, Location.class, "loot[ing] [context] location", "lootcontexts");
+	}
+
+	@Override
+	public Location convert(LootContext context) {
+		return context.getLocation();
+	}
+
+	@Override
+	public Class<?> @Nullable [] acceptChange(ChangeMode mode) {
+		if (!getParser().isCurrentEvent(LootContextCreateEvent.class)) {
+			Skript.error("You cannot set the loot context location of an existing loot context.");
+			return null;
+		}
+
+		if (mode == ChangeMode.SET)
+			return CollectionUtils.array(Location.class);
+		return null;
+	}
+
+	@Override
+	public void change(Event event, Object @Nullable [] delta, ChangeMode mode) {
+		if (!(event instanceof LootContextCreateEvent createEvent))
+			return;
+
+		assert delta != null;
+		createEvent.getContextWrapper().setLocation((Location) delta[0]);
+	}
+
+	@Override
+	public Class<? extends Location> getReturnType() {
+		return Location.class;
+	}
+
+	@Override
+	protected String getPropertyName() {
+		return "loot location";
+	}
+
+}
diff --git a/src/main/java/org/skriptlang/skript/bukkit/loottables/elements/expressions/ExprLootContextLooter.java b/src/main/java/org/skriptlang/skript/bukkit/loottables/elements/expressions/ExprLootContextLooter.java
new file mode 100644
index 00000000000..4a9874ca47f
--- /dev/null
+++ b/src/main/java/org/skriptlang/skript/bukkit/loottables/elements/expressions/ExprLootContextLooter.java
@@ -0,0 +1,76 @@
+package org.skriptlang.skript.bukkit.loottables.elements.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;
+import ch.njol.skript.doc.Name;
+import ch.njol.skript.doc.Since;
+import ch.njol.skript.expressions.base.SimplePropertyExpression;
+import ch.njol.util.coll.CollectionUtils;
+import org.bukkit.entity.Player;
+import org.bukkit.event.Event;
+import org.bukkit.loot.LootContext;
+import org.jetbrains.annotations.Nullable;
+import org.skriptlang.skript.bukkit.loottables.LootContextCreateEvent;
+
+@Name("Looter of Loot Context")
+@Description(
+	"Returns the looter of a loot context. "
+		+ "Note that setting the looter will read the looter's tool enchantments (e.g. looting) when generating loot."
+)
+@Examples({
+	"set {_killer} to looter of {_context}",
+	"",
+	"set {_context} to a loot context at player:",
+		"\tset loot luck value to 10",
+		"\tset looter to player",
+		"\tset looted entity to last spawned pig"
+})
+@Since("2.10")
+public class ExprLootContextLooter extends SimplePropertyExpression<LootContext, Player> {
+
+	static {
+		registerDefault(ExprLootContextLooter.class, Player.class, "(looter|looting player)", "lootcontexts");
+	}
+
+	@Override
+	public @Nullable Player convert(LootContext context) {
+		if (context.getKiller() instanceof Player player)
+			return player;
+		return null;
+	}
+
+	@Override
+	public Class<?> @Nullable [] acceptChange(ChangeMode mode) {
+		if (!getParser().isCurrentEvent(LootContextCreateEvent.class)) {
+			Skript.error("You cannot set the looting player of an existing loot context.");
+			return null;
+		}
+
+		return switch (mode) {
+			case SET, DELETE, RESET -> CollectionUtils.array(Player.class);
+			default -> null;
+		};
+	}
+
+	@Override
+	public void change(Event event, Object @Nullable [] delta, ChangeMode mode) {
+		if (!(event instanceof LootContextCreateEvent createEvent))
+			return;
+
+		Player player = delta != null ? (Player) delta[0] : null;
+		createEvent.getContextWrapper().setKiller(player);
+	}
+
+	@Override
+	public Class<? extends Player> getReturnType() {
+		return Player.class;
+	}
+
+	@Override
+	protected String getPropertyName() {
+		return "looting player";
+	}
+
+}
diff --git a/src/main/java/org/skriptlang/skript/bukkit/loottables/elements/expressions/ExprLootContextLuck.java b/src/main/java/org/skriptlang/skript/bukkit/loottables/elements/expressions/ExprLootContextLuck.java
new file mode 100644
index 00000000000..607779fd746
--- /dev/null
+++ b/src/main/java/org/skriptlang/skript/bukkit/loottables/elements/expressions/ExprLootContextLuck.java
@@ -0,0 +1,77 @@
+package org.skriptlang.skript.bukkit.loottables.elements.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;
+import ch.njol.skript.doc.Name;
+import ch.njol.skript.doc.Since;
+import ch.njol.skript.expressions.base.SimplePropertyExpression;
+import ch.njol.util.coll.CollectionUtils;
+import org.bukkit.event.Event;
+import org.bukkit.loot.LootContext;
+import org.jetbrains.annotations.Nullable;
+import org.skriptlang.skript.bukkit.loottables.LootContextCreateEvent;
+import org.skriptlang.skript.bukkit.loottables.LootContextWrapper;
+
+@Name("Luck of Loot Context")
+@Description("Returns the luck of a loot context as a float. This represents the luck potion effect that an entity can have.")
+@Examples({
+	"set {_luck} to loot luck value of {_context}",
+	"",
+	"set {_context} to a loot context at player:",
+		"\tset loot luck value to 10",
+		"\tset looter to player",
+		"\tset looted entity to last spawned pig"
+})
+@Since("2.10")
+public class ExprLootContextLuck extends SimplePropertyExpression<LootContext, Float> {
+
+	static {
+		registerDefault(ExprLootContextLuck.class, Float.class, "loot[ing] [context] luck [value|factor]", "lootcontexts");
+	}
+
+	@Override
+	public @Nullable Float convert(LootContext context) {
+		return context.getLuck();
+	}
+
+	@Override
+	public Class<?> @Nullable [] acceptChange(ChangeMode mode) {
+		if (!getParser().isCurrentEvent(LootContextCreateEvent.class)) {
+			Skript.error("You cannot set the loot context luck of an existing loot context.");
+			return null;
+		}
+
+		return switch (mode) {
+			case SET, DELETE, RESET, ADD, REMOVE -> CollectionUtils.array(Float.class);
+			default -> null;
+		};
+	}
+
+	@Override
+	public void change(Event event, Object @Nullable [] delta, ChangeMode mode) {
+		if (!(event instanceof LootContextCreateEvent createEvent))
+			return;
+
+		LootContextWrapper wrapper = createEvent.getContextWrapper();
+		float luck = delta != null ? (float) delta[0] : 0f;
+
+		switch (mode) {
+			case SET, DELETE, RESET -> wrapper.setLuck(luck);
+			case ADD -> wrapper.setLuck(wrapper.getLuck() + luck);
+			case REMOVE -> wrapper.setLuck(wrapper.getLuck() - luck);
+		}
+	}
+
+	@Override
+	public Class<? extends Float> getReturnType() {
+		return Float.class;
+	}
+
+	@Override
+	protected String getPropertyName() {
+		return "loot luck factor";
+	}
+
+}
diff --git a/src/main/java/org/skriptlang/skript/bukkit/loottables/elements/expressions/ExprLootItems.java b/src/main/java/org/skriptlang/skript/bukkit/loottables/elements/expressions/ExprLootItems.java
new file mode 100644
index 00000000000..d441ee8f173
--- /dev/null
+++ b/src/main/java/org/skriptlang/skript/bukkit/loottables/elements/expressions/ExprLootItems.java
@@ -0,0 +1,105 @@
+package org.skriptlang.skript.bukkit.loottables.elements.expressions;
+
+import ch.njol.skript.Skript;
+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.SkriptParser.ParseResult;
+import ch.njol.skript.lang.SyntaxStringBuilder;
+import ch.njol.skript.lang.util.SimpleExpression;
+import ch.njol.util.Kleenean;
+import org.bukkit.Bukkit;
+import org.bukkit.event.Event;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.loot.LootContext;
+import org.bukkit.loot.LootTable;
+import org.jetbrains.annotations.Nullable;
+import org.skriptlang.skript.bukkit.loottables.LootContextWrapper;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Random;
+import java.util.concurrent.ThreadLocalRandom;
+
+@Name("Loot of Loot Table")
+@Description(
+	"Returns the items of a loot table using a loot context. "
+		+ "Not specifying a loot context will use a loot context with a location at the world's origin."
+)
+@Examples({
+	"set {_items::*} to loot items of the loot table \"minecraft:chests/simple_dungeon\" with loot context {_context}",
+	"# this will set {_items::*} to the items that would be dropped from the simple dungeon loot table with the given loot context",
+	"",
+	"give player loot items of entity's loot table with loot context {_context}",
+	"# this will give the player the items that the entity would drop with the given loot context"
+})
+@Since("2.10")
+public class ExprLootItems extends SimpleExpression<ItemStack> {
+
+	static {
+		Skript.registerExpression(ExprLootItems.class, ItemStack.class, ExpressionType.COMBINED,
+			"[the] loot of %loottables% [(with|using) %-lootcontext%]",
+			"%loottables%'[s] loot [(with|using) %-lootcontext%]"
+		);
+	}
+
+	private Expression<LootTable> lootTables;
+	private Expression<LootContext> context;
+
+	@Override
+	@SuppressWarnings("unchecked")
+	public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelayed, ParseResult parseResult) {
+		lootTables = (Expression<LootTable>) exprs[0];
+		context = (Expression<LootContext>) exprs[1];
+		return true;
+	}
+
+	@Override
+	protected ItemStack @Nullable [] get(Event event) {
+		LootContext context;
+		if (this.context != null) {
+			context = this.context.getSingle(event);
+			if (context == null)
+				return new ItemStack[0];
+		} else {
+			context = new LootContextWrapper(Bukkit.getWorlds().get(0).getSpawnLocation()).getContext();
+		}
+
+		List<ItemStack> items = new ArrayList<>();
+
+		Random random = ThreadLocalRandom.current();
+		for (LootTable lootTable : lootTables.getArray(event)) {
+			try {
+				// todo: perhaps runtime error in the future
+				items.addAll(lootTable.populateLoot(random, context));
+			} catch (IllegalArgumentException ignore) {}
+		}
+
+		return items.toArray(new ItemStack[0]);
+	}
+
+	@Override
+	public boolean isSingle() {
+		return false;
+	}
+
+	@Override
+	public Class<? extends ItemStack> getReturnType() {
+		return ItemStack.class;
+	}
+
+	@Override
+	public String toString(@Nullable Event event, boolean debug) {
+		SyntaxStringBuilder builder = new SyntaxStringBuilder(event, debug);
+
+		builder.append("the loot of", lootTables);
+		if (context != null)
+			builder.append("with", context);
+
+		return builder.toString();
+	}
+
+}
diff --git a/src/main/java/org/skriptlang/skript/bukkit/loottables/elements/expressions/ExprLootTable.java b/src/main/java/org/skriptlang/skript/bukkit/loottables/elements/expressions/ExprLootTable.java
new file mode 100644
index 00000000000..7385aea2cd5
--- /dev/null
+++ b/src/main/java/org/skriptlang/skript/bukkit/loottables/elements/expressions/ExprLootTable.java
@@ -0,0 +1,77 @@
+package org.skriptlang.skript.bukkit.loottables.elements.expressions;
+
+import ch.njol.skript.classes.Changer.ChangeMode;
+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.expressions.base.SimplePropertyExpression;
+import ch.njol.util.coll.CollectionUtils;
+import org.bukkit.event.Event;
+import org.bukkit.loot.LootTable;
+import org.bukkit.loot.Lootable;
+import org.jetbrains.annotations.Nullable;
+import org.skriptlang.skript.bukkit.loottables.LootTableUtils;
+
+@Name("Loot Table")
+@Description({
+	"Returns the loot table of an entity or block.",
+	"Setting the loot table of a block will update the block state, and once opened will "
+		+ "generate loot of the specified loot table. Please note that doing so may cause "
+		+ "warnings in the console due to over-filling the chest.",
+	"Please note that resetting/deleting the loot table of an ENTITY will reset the entity's loot table to its default.",
+})
+@Examples({
+	"set loot table of event-entity to \"minecraft:entities/ghast\"",
+	"# this will set the loot table of the entity to a ghast's loot table, thus dropping ghast tears and gunpowder",
+	"",
+	"set loot table of event-block to \"minecraft:chests/simple_dungeon\"",
+})
+@Since("2.10")
+public class ExprLootTable extends SimplePropertyExpression<Object, LootTable> {
+
+	static {
+		register(ExprLootTable.class, LootTable.class, "loot[ ]table[s]", "entities/blocks");
+	}
+
+	@Override
+	public @Nullable LootTable convert(Object object) {
+		if (LootTableUtils.isLootable(object))
+			return LootTableUtils.getLootTable(object);
+		return null;
+	}
+
+	@Override
+	public Class<?> @Nullable [] acceptChange(ChangeMode mode) {
+		return switch (mode) {
+			case SET, DELETE, RESET -> CollectionUtils.array(LootTable.class);
+			default -> null;
+		};
+	}
+
+	@Override
+	public void change(Event event, Object @Nullable [] delta, ChangeMode mode) {
+		LootTable lootTable = delta != null ? ((LootTable) delta[0]) : null;
+
+		for (Object object : getExpr().getArray(event)) {
+			if (!LootTableUtils.isLootable(object))
+				continue;
+
+			Lootable lootable = LootTableUtils.getAsLootable(object);
+
+			lootable.setLootTable(lootTable);
+			LootTableUtils.updateState(lootable);
+		}
+	}
+
+	@Override
+	public Class<? extends LootTable> getReturnType() {
+		return LootTable.class;
+	}
+
+	@Override
+	protected String getPropertyName() {
+		return "loot table";
+	}
+
+}
diff --git a/src/main/java/org/skriptlang/skript/bukkit/loottables/elements/expressions/ExprLootTableFromString.java b/src/main/java/org/skriptlang/skript/bukkit/loottables/elements/expressions/ExprLootTableFromString.java
new file mode 100644
index 00000000000..4d313c51764
--- /dev/null
+++ b/src/main/java/org/skriptlang/skript/bukkit/loottables/elements/expressions/ExprLootTableFromString.java
@@ -0,0 +1,74 @@
+package org.skriptlang.skript.bukkit.loottables.elements.expressions;
+
+import ch.njol.skript.Skript;
+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.SkriptParser;
+import ch.njol.skript.lang.util.SimpleExpression;
+import ch.njol.util.Kleenean;
+import org.bukkit.Bukkit;
+import org.bukkit.NamespacedKey;
+import org.bukkit.event.Event;
+import org.bukkit.loot.LootTable;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Name("Loot Table from Key")
+@Description("Returns the loot table from a namespaced key.")
+@Examples("set {_table} to loot table \"minecraft:chests/simple_dungeon\"")
+@Since("2.10")
+public class ExprLootTableFromString extends SimpleExpression<LootTable> {
+
+	static {
+		Skript.registerExpression(ExprLootTableFromString.class, LootTable.class, ExpressionType.COMBINED,
+			"[the] loot[ ]table[s] %strings%"
+		);
+	}
+
+	private Expression<String> keys;
+
+	@Override
+	public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelayed, SkriptParser.ParseResult parseResult) {
+		//noinspection unchecked
+		keys = (Expression<String>) exprs[0];
+		return true;
+	}
+
+	@Override
+	protected LootTable @Nullable [] get(Event event) {
+		List<LootTable> lootTables = new ArrayList<>();
+		for (String key : keys.getArray(event)) {
+			NamespacedKey namespacedKey = NamespacedKey.fromString(key);
+			if (namespacedKey == null)
+				continue;
+
+			LootTable lootTable = Bukkit.getLootTable(namespacedKey);
+			if (lootTable != null)
+				lootTables.add(lootTable);
+		}
+
+		return lootTables.toArray(new LootTable[0]);
+	}
+
+	@Override
+	public boolean isSingle() {
+		return keys.isSingle();
+	}
+
+	@Override
+	public Class<? extends LootTable> getReturnType() {
+		return LootTable.class;
+	}
+
+	@Override
+	public String toString(@Nullable Event event, boolean debug) {
+		return "the loot table of " + keys.toString(event, debug);
+	}
+
+}
diff --git a/src/main/java/org/skriptlang/skript/bukkit/loottables/elements/expressions/ExprLootTableSeed.java b/src/main/java/org/skriptlang/skript/bukkit/loottables/elements/expressions/ExprLootTableSeed.java
new file mode 100644
index 00000000000..eb49328b0c9
--- /dev/null
+++ b/src/main/java/org/skriptlang/skript/bukkit/loottables/elements/expressions/ExprLootTableSeed.java
@@ -0,0 +1,65 @@
+package org.skriptlang.skript.bukkit.loottables.elements.expressions;
+
+import ch.njol.skript.classes.Changer.ChangeMode;
+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.expressions.base.SimplePropertyExpression;
+import ch.njol.util.coll.CollectionUtils;
+import org.bukkit.event.Event;
+import org.bukkit.loot.Lootable;
+import org.jetbrains.annotations.Nullable;
+import org.skriptlang.skript.bukkit.loottables.LootTableUtils;
+
+@Name("Seed of Loot Table")
+@Description("Returns the seed of a loot table. Setting the seed of a block or entity that does not have a loot table will not do anything.")
+@Examples({
+	"set {_seed} loot table seed of block",
+	"set loot table seed of entity to 123456789"
+})
+@Since("2.10")
+public class ExprLootTableSeed extends SimplePropertyExpression<Object, Long> {
+
+	static {
+		register(ExprLootTableSeed.class, Long.class, "loot[[ ]table] seed[s]", "entities/blocks");
+	}
+
+	@Override
+	public @Nullable Long convert(Object object) {
+		Lootable lootable = LootTableUtils.getAsLootable(object);
+		return lootable != null ? lootable.getSeed() : null;
+	}
+
+	public Class<?> @Nullable [] acceptChange(ChangeMode mode) {
+		if (mode == ChangeMode.SET)
+			return CollectionUtils.array(Number.class);
+		return null;
+	}
+
+	@Override
+	public void change(Event event, Object @Nullable [] delta, ChangeMode mode) {
+		assert delta != null;
+		long seedValue = ((Number) delta[0]).longValue();
+
+		for (Object object : getExpr().getArray(event)) {
+			if (!LootTableUtils.isLootable(object))
+				continue;
+
+			Lootable lootable = LootTableUtils.getAsLootable(object);
+			lootable.setSeed(seedValue);
+			LootTableUtils.updateState(lootable);
+		}
+	}
+
+	@Override
+	public Class<? extends Long> getReturnType() {
+		return Long.class;
+	}
+
+	@Override
+	protected String getPropertyName() {
+		return "loot table seed";
+	}
+
+}
diff --git a/src/main/java/org/skriptlang/skript/bukkit/loottables/elements/expressions/ExprSecCreateLootContext.java b/src/main/java/org/skriptlang/skript/bukkit/loottables/elements/expressions/ExprSecCreateLootContext.java
new file mode 100644
index 00000000000..79cc9437f89
--- /dev/null
+++ b/src/main/java/org/skriptlang/skript/bukkit/loottables/elements/expressions/ExprSecCreateLootContext.java
@@ -0,0 +1,96 @@
+package org.skriptlang.skript.bukkit.loottables.elements.expressions;
+
+import ch.njol.skript.Skript;
+import ch.njol.skript.config.SectionNode;
+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.expressions.base.SectionExpression;
+import ch.njol.skript.lang.SkriptParser.ParseResult;
+import ch.njol.skript.lang.*;
+import ch.njol.skript.registrations.EventValues;
+import ch.njol.skript.util.Direction;
+import ch.njol.skript.variables.Variables;
+import ch.njol.util.Kleenean;
+import org.bukkit.Location;
+import org.bukkit.event.Event;
+import org.bukkit.loot.LootContext;
+import org.jetbrains.annotations.Nullable;
+import org.skriptlang.skript.bukkit.loottables.LootContextCreateEvent;
+import org.skriptlang.skript.bukkit.loottables.LootContextWrapper;
+
+import java.util.List;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+@Name("Create Loot Context")
+@Description("Create a loot context.")
+@Examples({
+	"set {_player} to player",
+	"set {_context} to a loot context at player:",
+		"\tset loot luck value to 10",
+		"\tset looter to {_player}",
+		"\tset looted entity to last spawned pig",
+	"give player loot items of loot table \"minecraft:entities/iron_golem\" with loot context {_context}"
+})
+@Since("2.10")
+public class ExprSecCreateLootContext extends SectionExpression<LootContext> {
+
+	static {
+		Skript.registerExpression(ExprSecCreateLootContext.class, LootContext.class, ExpressionType.COMBINED,
+			"[a] loot context %direction% %location%");
+		EventValues.registerEventValue(LootContextCreateEvent.class, LootContext.class, event -> event.getContextWrapper().getContext());
+	}
+
+	private Trigger trigger;
+	private Expression<Location> location;
+
+	@Override
+	public boolean init(Expression<?>[] exprs, int pattern, Kleenean isDelayed, ParseResult result, @Nullable SectionNode node, @Nullable List<TriggerItem> triggerItems) {
+		if (node != null) {
+			AtomicBoolean delayed = new AtomicBoolean(false);
+			Runnable afterLoading = () -> delayed.set(!getParser().getHasDelayBefore().isFalse());
+			//noinspection unchecked
+			trigger = loadCode(node, "create loot context", afterLoading, LootContextCreateEvent.class);
+			if (delayed.get()) {
+				Skript.error("Delays cannot be used within a 'create loot context' section.");
+				return false;
+			}
+		}
+		//noinspection unchecked
+		location = Direction.combine((Expression<Direction>) exprs[0], (Expression<Location>) exprs[1]);
+		return true;
+	}
+
+	@Override
+	protected LootContext @Nullable [] get(Event event) {
+		Location loc = location.getSingle(event);
+		if (loc == null)
+			return new LootContext[0];
+
+		LootContextWrapper wrapper = new LootContextWrapper(loc);
+		if (trigger != null) {
+			LootContextCreateEvent contextEvent = new LootContextCreateEvent(wrapper);
+			Variables.withLocalVariables(event, contextEvent, () ->
+				TriggerItem.walk(trigger, contextEvent)
+			);
+		}
+		return new LootContext[]{wrapper.getContext()};
+	}
+
+	@Override
+	public boolean isSingle() {
+		return true;
+	}
+
+	@Override
+	public Class<? extends LootContext> getReturnType() {
+		return LootContext.class;
+	}
+
+	@Override
+	public String toString(@Nullable Event event, boolean debug) {
+		return "a loot context " + location.toString(event, debug);
+	}
+
+}
diff --git a/src/main/java/org/skriptlang/skript/bukkit/misc/effects/EffRotate.java b/src/main/java/org/skriptlang/skript/bukkit/misc/effects/EffRotate.java
new file mode 100644
index 00000000000..0fb51b6adca
--- /dev/null
+++ b/src/main/java/org/skriptlang/skript/bukkit/misc/effects/EffRotate.java
@@ -0,0 +1,185 @@
+package org.skriptlang.skript.bukkit.misc.effects;
+
+import ch.njol.skript.Skript;
+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.Effect;
+import ch.njol.skript.lang.Expression;
+import ch.njol.skript.lang.SkriptParser.ParseResult;
+import ch.njol.util.Kleenean;
+import org.bukkit.entity.Display;
+import org.bukkit.event.Event;
+import org.bukkit.util.Transformation;
+import org.bukkit.util.Vector;
+import org.jetbrains.annotations.Nullable;
+import org.jetbrains.annotations.UnknownNullability;
+import org.joml.Quaternionf;
+import org.joml.Vector3f;
+import org.skriptlang.skript.bukkit.misc.rotation.DisplayRotator;
+import org.skriptlang.skript.bukkit.misc.rotation.QuaternionRotator;
+import org.skriptlang.skript.bukkit.misc.rotation.Rotator;
+import org.skriptlang.skript.bukkit.misc.rotation.Rotator.Axis;
+import org.skriptlang.skript.bukkit.misc.rotation.VectorRotator;
+
+import java.util.Locale;
+
+@Name("Rotate")
+@Description({
+	"Rotates displays, quaternions, or vectors around an axis a set amount of degrees, or around all 3 axes at once.",
+	"Vectors can only be rotated around the global X/Y/Z axes, or an arbitrary vector axis.",
+	"Quaternions are more flexible, allowing rotation around the global or local X/Y/Z axes, arbitrary vectors, or all 3 local axes at once.",
+	"Global axes are the ones in the Minecraft world. Local axes are relative to how the quaternion is already oriented.",
+	"",
+	"Rotating a display is a shortcut for rotating its left rotation. If the right rotation needs to be modified, it should be acquired, rotated, and re-set.",
+	"",
+	"Note that rotating a quaternion/display around a vector results in a rotation around the local vector, so results may not be what you expect. " +
+	"For example, rotating quaternions/displays around vector(1, 0, 0) is the same as rotating around the local X axis.",
+	"The same applies to rotations by all three axes at once. " +
+	"In addition, rotating around all three axes of a quaternion/display at once will rotate in ZYX order, meaning the Z rotation will be applied first and the X rotation last."
+})
+@Examples({
+	"rotate {_quaternion} around x axis by 10 degrees",
+	"rotate last spawned block display around y axis by 10 degrees",
+	"rotate {_vector} around vector(1, 1, 1) by 45",
+	"rotate {_quaternion} by x 45, y 90, z 135"
+})
+@Since("2.2-dev28, 2.10 (quaternions, displays)")
+public class EffRotate extends Effect {
+
+	static {
+		Skript.registerEffect(EffRotate.class,
+			"rotate %vectors/quaternions/displays% around [the] [global] (:x|:y|:z)(-| )axis by %number%",
+			"rotate %quaternions/displays% around [the|its|their] local (:x|:y|:z)(-| )ax(i|e)s by %number%",
+			"rotate %vectors/quaternions/displays% around [the] %vector% by %number%",
+			"rotate %quaternions/displays% by x %number%, y %number%(, [and]| and) z %number%"
+		);
+	}
+
+	private Expression<?> toRotate;
+
+	private @UnknownNullability Expression<Number> angle;
+	private @UnknownNullability Expression<Vector> vector;
+	private @UnknownNullability Axis axis;
+
+	private @UnknownNullability Expression<Number> x, y, z;
+
+	private int matchedPattern;
+
+	@Override
+	@SuppressWarnings("unchecked")
+	public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelayed, ParseResult parseResult) {
+		toRotate = exprs[0];
+		this.matchedPattern = matchedPattern;
+		switch (matchedPattern) {
+			case 0, 1 -> {
+				String axisString = parseResult.tags.get(0).toUpperCase(Locale.ENGLISH);
+				if (matchedPattern == 1)
+					axisString = "LOCAL_" + axisString;
+				angle = (Expression<Number>) exprs[1];
+				axis = Axis.valueOf(axisString);
+			}
+			case 2 -> {
+				vector = (Expression<Vector>) exprs[1];
+				angle = (Expression<Number>) exprs[2];
+				axis = Axis.ARBITRARY;
+			}
+			case 3 -> {
+				x = (Expression<Number>) exprs[1];
+				y = (Expression<Number>) exprs[2];
+				z = (Expression<Number>) exprs[3];
+			}
+		}
+		return true;
+	}
+
+	@Override
+	protected void execute(Event event) {
+		if (matchedPattern == 3) {
+			Number x = this.x.getSingle(event);
+			Number y = this.y.getSingle(event);
+			Number z = this.z.getSingle(event);
+			if (x == null || y == null || z == null)
+				return;
+
+			float radX = (float) (x.floatValue() * Math.PI / 180);
+			float radY = (float) (y.floatValue() * Math.PI / 180);
+			float radZ = (float) (z.floatValue() * Math.PI / 180);
+
+			for (Object object : toRotate.getArray(event)) {
+				if (object instanceof Quaternionf quaternion) {
+					quaternion.rotateZYX(radZ, radY, radX);
+				} else if (object instanceof Display display) {
+					Transformation transformation = display.getTransformation();
+					Quaternionf leftRotation = transformation.getLeftRotation();
+					display.setTransformation(
+						new Transformation(
+							transformation.getTranslation(),
+							leftRotation.rotateZYX(radZ, radY, radX),
+							transformation.getScale(),
+							transformation.getRightRotation()
+						)
+					);
+				}
+			}
+			return;
+		}
+
+		// rotate around axis
+		Number angle = this.angle.getSingle(event);
+		if (angle == null)
+			return;
+		double radAngle = (angle.doubleValue() * Math.PI / 180);
+		if (Double.isInfinite(radAngle) || Double.isNaN(radAngle))
+			return;
+
+		Rotator<Vector> vectorRotator;
+		Rotator<Quaternionf> quaternionRotator;
+		Rotator<Display> displayRotator;
+
+		if (axis == Axis.ARBITRARY) {
+			// rotate around arbitrary axis
+			Vector axis = vector.getSingle(event);
+			if (axis == null || axis.isZero())
+				return;
+			axis.normalize();
+			Vector3f jomlAxis = axis.toVector3f();
+			vectorRotator = new VectorRotator(Axis.ARBITRARY, axis, radAngle);
+			quaternionRotator = new QuaternionRotator(Axis.LOCAL_ARBITRARY, jomlAxis, (float) radAngle);
+			displayRotator = new DisplayRotator(Axis.LOCAL_ARBITRARY, jomlAxis, (float) radAngle);
+		} else {
+			vectorRotator = new VectorRotator(axis, radAngle);
+			quaternionRotator = new QuaternionRotator(axis, (float) radAngle);
+			displayRotator = new DisplayRotator(axis, (float) radAngle);
+		}
+
+		for (Object object : toRotate.getArray(event)) {
+			if (object instanceof Vector vectorToRotate) {
+				vectorRotator.rotate(vectorToRotate);
+			} else if (object instanceof Quaternionf quaternion) {
+				quaternionRotator.rotate(quaternion);
+			} else if (object instanceof Display display) {
+				displayRotator.rotate(display);
+			}
+		}
+	}
+
+	@Override
+	public String toString(@Nullable Event event, boolean debug) {
+		return switch (matchedPattern) {
+			case 0, 1 -> "rotate " + toRotate.toString(event, debug) +
+					" around the " + axis + "-axis " +
+					"by " + angle.toString(event, debug) + " degrees";
+			case 2 -> "rotate " + toRotate.toString(event, debug) +
+					" around " + vector.toString(event, debug) + "-axis " +
+					"by " + angle.toString(event, debug) + " degrees";
+			case 3 -> "rotate " + toRotate.toString(event, debug) +
+					" by x " + x.toString(event, debug) + ", " +
+					"y " + y.toString(event, debug) + ", " +
+					"and z " + z.toString(event, debug);
+			default -> "invalid";
+		};
+	}
+
+}
diff --git a/src/main/java/org/skriptlang/skript/bukkit/misc/expressions/ExprItemOfEntity.java b/src/main/java/org/skriptlang/skript/bukkit/misc/expressions/ExprItemOfEntity.java
new file mode 100644
index 00000000000..6c25dfea834
--- /dev/null
+++ b/src/main/java/org/skriptlang/skript/bukkit/misc/expressions/ExprItemOfEntity.java
@@ -0,0 +1,64 @@
+package org.skriptlang.skript.bukkit.misc.expressions;
+
+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.expressions.base.SimplePropertyExpression;
+import ch.njol.skript.util.slot.DisplayEntitySlot;
+import ch.njol.skript.util.slot.DroppedItemSlot;
+import ch.njol.skript.util.slot.ItemFrameSlot;
+import ch.njol.skript.util.slot.Slot;
+import ch.njol.skript.util.slot.ThrowableProjectileSlot;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.Item;
+import org.bukkit.entity.ItemDisplay;
+import org.bukkit.entity.ItemFrame;
+import org.bukkit.entity.ThrowableProjectile;
+import org.jetbrains.annotations.Nullable;
+
+@Name("Item of an Entity")
+@Description({
+	"An item associated with an entity. For dropped item entities, it gets the item that was dropped.",
+	"For item frames, the item inside the frame is returned.",
+	"For throwable projectiles (snowballs, enderpearls etc.) or item displays, it gets the displayed item.",
+	"Other entities do not have items associated with them."
+})
+@Examples({
+	"item of event-entity",
+	"",
+	"set the item inside of event-entity to a diamond sword named \"Example\""
+})
+@Since("2.2-dev35, 2.2-dev36 (improved), 2.5.2 (throwable projectiles), 2.10 (item displays)")
+public class ExprItemOfEntity extends SimplePropertyExpression<Entity, Slot> {
+
+
+	static {
+		register(ExprItemOfEntity.class, Slot.class, "item [inside]", "entities");
+	}
+
+	@Override
+	public @Nullable Slot convert(Entity entity) {
+		if (entity instanceof ItemFrame itemFrame) {
+			return new ItemFrameSlot(itemFrame);
+		} else if (entity instanceof Item item) {
+			return new DroppedItemSlot(item);
+		} else if (entity instanceof ThrowableProjectile throwableProjectile) {
+			return new ThrowableProjectileSlot(throwableProjectile);
+		} else if (entity instanceof ItemDisplay itemDisplay) {
+			return new DisplayEntitySlot(itemDisplay);
+		}
+		return null; // Other entities don't have associated items
+	}
+
+	@Override
+	public Class<? extends Slot> getReturnType() {
+		return Slot.class;
+	}
+
+	@Override
+	protected String getPropertyName() {
+		return "item inside";
+	}
+
+}
diff --git a/src/main/java/org/skriptlang/skript/bukkit/misc/expressions/ExprQuaternionAxisAngle.java b/src/main/java/org/skriptlang/skript/bukkit/misc/expressions/ExprQuaternionAxisAngle.java
new file mode 100644
index 00000000000..4b0d130ec77
--- /dev/null
+++ b/src/main/java/org/skriptlang/skript/bukkit/misc/expressions/ExprQuaternionAxisAngle.java
@@ -0,0 +1,104 @@
+package org.skriptlang.skript.bukkit.misc.expressions;
+
+import ch.njol.skript.Skript;
+import ch.njol.skript.classes.Changer;
+import ch.njol.skript.classes.Changer.ChangeMode;
+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.expressions.base.SimplePropertyExpression;
+import ch.njol.skript.lang.Expression;
+import ch.njol.skript.lang.SkriptParser.ParseResult;
+import ch.njol.util.Kleenean;
+import ch.njol.util.coll.CollectionUtils;
+import org.bukkit.event.Event;
+import org.bukkit.util.Vector;
+import org.jetbrains.annotations.Nullable;
+import org.joml.AxisAngle4f;
+import org.joml.Math;
+import org.joml.Quaternionf;
+
+@Name("Rotation Axis/Angle")
+@Description({
+	"Returns the axis or angle that a quaternion will rotate by/around.",
+	"All quaternions can be represented by a rotation of some amount around some axis, so this expression provides " +
+	"the ability to get that angle/axis."
+})
+@Examples({
+	"set {_quaternion} to axisAngle(45, vector(1, 2, 3))",
+	"send rotation axis of {_quaternion} # 1, 2, 3",
+	"send rotation angle of {_quaternion} # 45",
+	"set rotation angle of {_quaternion} to 135",
+	"set rotation axis of {_quaternion} to vector(0, 1, 0)"
+})
+@Since("2.10")
+public class ExprQuaternionAxisAngle extends SimplePropertyExpression<Quaternionf, Object> {
+
+	static {
+		if (Skript.classExists("org.joml.Quaternionf"))
+			register(ExprQuaternionAxisAngle.class, Object.class, "rotation (angle|:axis)", "quaternions");
+	}
+
+	private boolean isAxis;
+
+	@Override
+	public boolean init(Expression<?>[] expressions, int matchedPattern, Kleenean isDelayed, ParseResult parseResult) {
+		isAxis = parseResult.hasTag("axis");
+		return super.init(expressions, matchedPattern, isDelayed, parseResult);
+	}
+
+	@Override
+	public @Nullable Object convert(Quaternionf from) {
+		AxisAngle4f axisAngle = new AxisAngle4f();
+		axisAngle.set(from);
+		if (isAxis)
+			return new Vector(axisAngle.x, axisAngle.y, axisAngle.z);
+		return (float) (axisAngle.angle * 180 / Math.PI);
+	}
+
+	@Override
+	public Class<?> @Nullable [] acceptChange(ChangeMode mode) {
+		return switch (mode) {
+			case ADD, SET, REMOVE ->  {
+				if (Changer.ChangerUtils.acceptsChange(getExpr(), ChangeMode.SET, Quaternionf.class))
+					yield CollectionUtils.array(isAxis ? Vector.class : Number.class);
+				yield null;
+			}
+			default -> null;
+		};
+	}
+
+	@Override
+	public void change(Event event, Object @Nullable [] delta, ChangeMode mode) {
+		assert delta != null; // reset/delete not supported
+		Quaternionf[] quaternions = getExpr().getArray(event);
+		AxisAngle4f axisAngle = new AxisAngle4f();
+		if (isAxis && delta[0] instanceof Vector vector) {
+			for (Quaternionf quaternion : quaternions) {
+				axisAngle.set(quaternion);
+				axisAngle.set(axisAngle.angle, (float) vector.getX(), (float) vector.getY(), (float) vector.getZ());
+				quaternion.set(axisAngle);
+			}
+		} else if (delta[0] instanceof Number number) {
+			float angle = (float) (number.floatValue() / 180 * Math.PI);
+			for (Quaternionf quaternion : quaternions) {
+				axisAngle.set(quaternion);
+				axisAngle.set(angle, axisAngle.x, axisAngle.y, axisAngle.z);
+				quaternion.set(axisAngle);
+			}
+		}
+		getExpr().change(event, quaternions, ChangeMode.SET);
+	}
+
+	@Override
+	public Class<?> getReturnType() {
+		return isAxis ? Vector.class : Float.class;
+	}
+
+	@Override
+	protected String getPropertyName() {
+		return isAxis ? "axis" : "angle";
+	}
+
+}
diff --git a/src/main/java/org/skriptlang/skript/bukkit/misc/expressions/ExprRotate.java b/src/main/java/org/skriptlang/skript/bukkit/misc/expressions/ExprRotate.java
new file mode 100644
index 00000000000..3bd938012de
--- /dev/null
+++ b/src/main/java/org/skriptlang/skript/bukkit/misc/expressions/ExprRotate.java
@@ -0,0 +1,182 @@
+package org.skriptlang.skript.bukkit.misc.expressions;
+
+import ch.njol.skript.Skript;
+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.SkriptParser.ParseResult;
+import ch.njol.skript.lang.util.SimpleExpression;
+import ch.njol.util.Kleenean;
+import org.bukkit.event.Event;
+import org.bukkit.util.Vector;
+import org.jetbrains.annotations.Nullable;
+import org.jetbrains.annotations.UnknownNullability;
+import org.joml.Quaternionf;
+import org.joml.Vector3f;
+import org.skriptlang.skript.bukkit.misc.rotation.NonMutatingQuaternionRotator;
+import org.skriptlang.skript.bukkit.misc.rotation.NonMutatingVectorRotator;
+import org.skriptlang.skript.bukkit.misc.rotation.Rotator;
+import org.skriptlang.skript.bukkit.misc.rotation.Rotator.Axis;
+
+import java.util.Locale;
+import java.util.Objects;
+
+@Name("Rotated Quaternion/Vector")
+@Description({
+	"Rotates a quaternion or vector around an axis a set amount of degrees, or around all 3 axes at once.",
+	"Vectors can only be rotated around the global X/Y/Z axes, or an arbitrary vector axis.",
+	"Quaternions are more flexible, allowing rotation around the global or local X/Y/Z axes, arbitrary vectors, or all 3 local axes at once.",
+	"Global axes are the ones in the Minecraft world. Local axes are relative to how the quaternion is already oriented.",
+	"",
+	"Note that rotating a quaternion around a vector results in a rotation around the local vector, so results may not be what you expect. " +
+	"For example, rotating around vector(1, 0, 0) is the same as rotating around the local X axis.",
+	"The same applies to rotations by all three axes at once. " +
+	"In addition, rotating around all three axes of a quaternion/display at once will rotate in ZYX order, meaning the Z rotation will be applied first and the X rotation last."
+})
+@Examples({
+	"set {_new} to {_quaternion} rotated around x axis by 10 degrees",
+	"set {_new} to {_vector} rotated around vector(1, 1, 1) by 45",
+	"set {_new} to {_quaternion} rotated by x 45, y 90, z 135"
+})
+@Since("2.10")
+public class ExprRotate extends SimpleExpression<Object> {
+
+	static {
+		Skript.registerExpression(ExprRotate.class, Object.class, ExpressionType.SIMPLE,
+				"%quaternions/vectors% rotated around [the] [global] (:x|:y|:z)(-| )axis by %number%",
+				"%quaternions% rotated around [the|its|their] local (:x|:y|:z)(-| )ax(i|e)s by %number%",
+				"%quaternions/vectors% rotated around [the] %vector% by %number%",
+				"%quaternions% rotated by x %number%, y %number%(, [and]| and) z %number%");
+	}
+
+	private Expression<?> toRotate;
+
+	private @UnknownNullability Expression<Number> angle;
+	private @UnknownNullability Expression<Vector> vector;
+	private @UnknownNullability Axis axis;
+
+	private @UnknownNullability Expression<Number> x, y, z;
+
+	private int matchedPattern;
+
+	@Override
+	@SuppressWarnings("unchecked")
+	public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelayed, ParseResult parseResult) {
+		toRotate = exprs[0];
+		this.matchedPattern = matchedPattern;
+		switch (matchedPattern) {
+			case 0, 1 -> {
+				String axisString = parseResult.tags.get(0).toUpperCase(Locale.ENGLISH);
+				if (matchedPattern == 1)
+					axisString = "LOCAL_" + axisString;
+				angle = (Expression<Number>) exprs[1];
+				axis = Axis.valueOf(axisString);
+			}
+			case 2 -> {
+				vector = (Expression<Vector>) exprs[1];
+				angle = (Expression<Number>) exprs[2];
+				axis = Axis.ARBITRARY;
+			}
+			case 3 -> {
+				x = (Expression<Number>) exprs[1];
+				y = (Expression<Number>) exprs[2];
+				z = (Expression<Number>) exprs[3];
+			}
+		}
+		return true;
+	}
+
+	@Override
+	@Nullable
+	protected Object[] get(Event event) {
+		if (matchedPattern == 3) {
+			Number x = this.x.getSingle(event);
+			Number y = this.y.getSingle(event);
+			Number z = this.z.getSingle(event);
+			if (x == null || y == null || z == null)
+				return new Quaternionf[0];
+
+			float radX = (float) (x.floatValue() * Math.PI / 180);
+			float radY = (float) (y.floatValue() * Math.PI / 180);
+			float radZ = (float) (z.floatValue() * Math.PI / 180);
+
+			//noinspection unchecked
+			return ((Expression<Quaternionf>) toRotate).stream(event)
+				.map(quaternion -> quaternion.rotateZYX(radZ, radY, radX))
+				.toArray(Quaternionf[]::new);
+		}
+
+		// rotate around axis
+		Number angle = this.angle.getSingle(event);
+		if (angle == null)
+			return new Object[0];
+		double radAngle = (angle.doubleValue() * Math.PI / 180);
+		if (Double.isInfinite(radAngle) || Double.isNaN(radAngle))
+			return new Object[0];
+
+		Rotator<Vector> vectorRotator;
+		Rotator<Quaternionf> quaternionRotator;
+
+		if (axis == Axis.ARBITRARY) {
+			// rotate around arbitrary axis
+			Vector axis = vector.getSingle(event);
+			if (axis == null || axis.isZero())
+				return new Object[0];
+			axis.normalize();
+			Vector3f jomlAxis = axis.toVector3f();
+			vectorRotator = new NonMutatingVectorRotator(Axis.ARBITRARY, axis, radAngle);
+			quaternionRotator = new NonMutatingQuaternionRotator(Axis.LOCAL_ARBITRARY, jomlAxis, (float) radAngle);
+		} else {
+			vectorRotator = new NonMutatingVectorRotator(axis, radAngle);
+			quaternionRotator = new NonMutatingQuaternionRotator(axis, (float) radAngle);
+		}
+
+		return toRotate.stream(event)
+			.map(object -> {
+				if (object instanceof Vector vectorToRotate) {
+					return vectorRotator.rotate(vectorToRotate);
+				} else if (object instanceof Quaternionf quaternion) {
+					return quaternionRotator.rotate(quaternion);
+				}
+				return null;
+			})
+			.filter(Objects::nonNull)
+			.toArray();
+	}
+
+	@Override
+	public boolean isSingle() {
+		return toRotate.isSingle();
+	}
+
+	@Override
+	public Class<?> getReturnType() {
+		return (matchedPattern == 1 || matchedPattern == 3) ? Quaternionf.class : toRotate.getReturnType();
+	}
+
+	@Override
+	public Class<?>[] possibleReturnTypes() {
+		return new Class<?>[]{Quaternionf.class, Vector.class};
+	}
+
+	@Override
+	public String toString(@Nullable Event event, boolean debug) {
+		return switch (matchedPattern) {
+			case 0, 1 -> toRotate.toString(event, debug) +
+				" rotated around the " + axis + "-axis " +
+				"by " + angle.toString(event, debug) + " degrees";
+			case 2 -> toRotate.toString(event, debug) +
+				" rotated around " + vector.toString(event, debug) + "-axis " +
+				"by " + angle.toString(event, debug) + " degrees";
+			case 3 -> toRotate.toString(event, debug) +
+				" rotated by x " + x.toString(event, debug) + ", " +
+				"y " + y.toString(event, debug) + ", " +
+				"and z " + z.toString(event, debug);
+			default -> "invalid";
+		};
+	}
+
+}
diff --git a/src/main/java/org/skriptlang/skript/bukkit/misc/expressions/ExprTextOf.java b/src/main/java/org/skriptlang/skript/bukkit/misc/expressions/ExprTextOf.java
new file mode 100644
index 00000000000..f08e985c0d1
--- /dev/null
+++ b/src/main/java/org/skriptlang/skript/bukkit/misc/expressions/ExprTextOf.java
@@ -0,0 +1,86 @@
+package org.skriptlang.skript.bukkit.misc.expressions;
+
+import org.bukkit.entity.TextDisplay;
+import org.bukkit.event.Event;
+import org.jetbrains.annotations.Nullable;
+
+import ch.njol.skript.ServerPlatform;
+import ch.njol.skript.Skript;
+import ch.njol.skript.classes.Changer.ChangeMode;
+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.expressions.base.SimplePropertyExpression;
+import ch.njol.skript.util.chat.BungeeConverter;
+import ch.njol.skript.util.chat.ChatMessages;
+import ch.njol.util.coll.CollectionUtils;
+import net.kyori.adventure.text.serializer.bungeecord.BungeeComponentSerializer;
+import net.md_5.bungee.api.chat.BaseComponent;
+
+@Name("Text Of")
+@Description({
+	"Returns or changes the <a href='classes.html#string'>text/string</a> of <a href='classes.html#display'>displays</a>.",
+	"Note that currently you can only use Skript chat codes when running Paper."
+})
+@Examples("set text of the last spawned text display to \"example\"")
+@Since("2.10")
+public class ExprTextOf extends SimplePropertyExpression<Object, String> {
+
+	private static final boolean IS_RUNNING_PAPER = Skript.getServerPlatform() == ServerPlatform.BUKKIT_PAPER;
+	private static BungeeComponentSerializer serializer;
+
+	static {
+		String types = "";
+		if (Skript.classExists("org.bukkit.entity.Display")) {
+			if (IS_RUNNING_PAPER)
+				serializer = BungeeComponentSerializer.get();
+			types += "displays";
+		}
+		// This is because this expression is setup to support future types.
+		// Remove this if non-versioning.
+		if (!types.isEmpty())
+			register(ExprTextOf.class, String.class, "text[s]", types);
+	}
+
+	@Override
+	public @Nullable String convert(Object object) {
+		if (object instanceof TextDisplay textDisplay)
+			return textDisplay.getText();
+		return null;
+	}
+
+	public Class<?> @Nullable [] acceptChange(ChangeMode mode) {
+		return switch (mode) {
+			case RESET -> CollectionUtils.array();
+			case SET -> CollectionUtils.array(String.class);
+			default -> null;
+		};
+	}
+
+	@Override
+	public void change(Event event, Object @Nullable [] delta, ChangeMode mode) {
+		String value = delta == null ? null : (String) delta[0];
+		for (Object object : getExpr().getArray(event)) {
+			if (!(object instanceof TextDisplay textDisplay))
+				continue;
+			if (IS_RUNNING_PAPER && serializer != null && value != null) {
+				BaseComponent[] components = BungeeConverter.convert(ChatMessages.parseToArray(value));
+				textDisplay.text(serializer.deserialize(components));
+			} else {
+				textDisplay.setText(value);
+			}
+		}
+	}
+
+	@Override
+	public Class<? extends String> getReturnType() {
+		return String.class;
+	}
+
+	@Override
+	protected String getPropertyName() {
+		return "text";
+	}
+
+}
diff --git a/src/main/java/org/skriptlang/skript/bukkit/misc/rotation/DisplayRotator.java b/src/main/java/org/skriptlang/skript/bukkit/misc/rotation/DisplayRotator.java
new file mode 100644
index 00000000000..423fff82510
--- /dev/null
+++ b/src/main/java/org/skriptlang/skript/bukkit/misc/rotation/DisplayRotator.java
@@ -0,0 +1,42 @@
+package org.skriptlang.skript.bukkit.misc.rotation;
+
+import org.bukkit.entity.Display;
+import org.bukkit.util.Transformation;
+import org.jetbrains.annotations.Contract;
+import org.joml.Quaternionf;
+import org.joml.Vector3f;
+
+/**
+ * Rotates {@link Display}s around the X, Y, and Z axes, as well as any arbitrary axis.
+ * Supports all local axes.
+ * Modifies the left rotation of the display.
+ */
+public class DisplayRotator implements Rotator<Display> {
+
+	private final QuaternionRotator qRotator;
+
+	public DisplayRotator(Axis axis, float angle) {
+		qRotator = new QuaternionRotator(axis, angle);
+	}
+
+	public DisplayRotator(Axis axis, Vector3f vector, float angle) {
+		qRotator = new QuaternionRotator(axis, vector, angle);
+	}
+
+	@Override
+	@Contract("_ -> param1")
+	public Display rotate(Display input) {
+		Transformation transformation = input.getTransformation();
+		Quaternionf leftRotation = transformation.getLeftRotation();
+		input.setTransformation(
+			new Transformation(
+				transformation.getTranslation(),
+				qRotator.rotate(leftRotation),
+				transformation.getScale(),
+				transformation.getRightRotation()
+			)
+		);
+		return input;
+	}
+
+}
diff --git a/src/main/java/org/skriptlang/skript/bukkit/misc/rotation/NonMutatingQuaternionRotator.java b/src/main/java/org/skriptlang/skript/bukkit/misc/rotation/NonMutatingQuaternionRotator.java
new file mode 100644
index 00000000000..2d99ea9375f
--- /dev/null
+++ b/src/main/java/org/skriptlang/skript/bukkit/misc/rotation/NonMutatingQuaternionRotator.java
@@ -0,0 +1,55 @@
+package org.skriptlang.skript.bukkit.misc.rotation;
+
+import org.jetbrains.annotations.Contract;
+import org.joml.Quaternionf;
+import org.joml.Vector3f;
+
+import java.util.function.Function;
+
+/**
+ * Rotates {@link Quaternionf}s around the X, Y, and Z axes, as well as any arbitrary axis.
+ * Supports all local axes.
+ * Returns new quaternion objects rather than mutating the input quaternion.
+ */
+public class NonMutatingQuaternionRotator implements Rotator<Quaternionf> {
+
+	private final Function<Quaternionf, Quaternionf> rotator;
+
+	/*
+	 * NOTE: the apparent mismatch between the axis and methods for local/non-local is intentional.
+	 * Rotating quaternions via rotateLocal results in a visual rotation around the global axis.
+	 */
+
+	public NonMutatingQuaternionRotator(Axis axis, float angle) {
+		this.rotator = switch (axis) {
+			case X -> (input) -> input.rotateLocalX(angle, new Quaternionf());
+			case Y -> (input) -> input.rotateLocalY(angle, new Quaternionf());
+			case Z -> (input) -> input.rotateLocalZ(angle, new Quaternionf());
+			case LOCAL_X -> (input) -> input.rotateX(angle, new Quaternionf());
+			case LOCAL_Y -> (input) -> input.rotateY(angle, new Quaternionf());
+			case LOCAL_Z -> (input) -> input.rotateZ(angle, new Quaternionf());
+			case LOCAL_ARBITRARY -> throw new UnsupportedOperationException("Rotation around the " + axis + " axis requires additional data. Use a different constructor.");
+			case ARBITRARY -> (input) -> input;
+		};
+	}
+
+	public NonMutatingQuaternionRotator(Axis axis, Vector3f vector, float angle) {
+		this.rotator = switch (axis) {
+			case X -> (input) -> input.rotateLocalX(angle, new Quaternionf());
+			case Y -> (input) -> input.rotateLocalY(angle, new Quaternionf());
+			case Z -> (input) -> input.rotateLocalZ(angle, new Quaternionf());
+			case LOCAL_X -> (input) -> input.rotateX(angle, new Quaternionf());
+			case LOCAL_Y -> (input) -> input.rotateY(angle, new Quaternionf());
+			case LOCAL_Z -> (input) -> input.rotateZ(angle, new Quaternionf());
+			case LOCAL_ARBITRARY -> (input) -> input.rotateAxis(angle, vector, new Quaternionf());
+			case ARBITRARY -> (input) -> input;
+		};
+	}
+
+	@Override
+	@Contract("_ -> new")
+	public Quaternionf rotate(Quaternionf input) {
+		return rotator.apply(input);
+	}
+
+}
diff --git a/src/main/java/org/skriptlang/skript/bukkit/misc/rotation/NonMutatingVectorRotator.java b/src/main/java/org/skriptlang/skript/bukkit/misc/rotation/NonMutatingVectorRotator.java
new file mode 100644
index 00000000000..e39c5d179e4
--- /dev/null
+++ b/src/main/java/org/skriptlang/skript/bukkit/misc/rotation/NonMutatingVectorRotator.java
@@ -0,0 +1,43 @@
+package org.skriptlang.skript.bukkit.misc.rotation;
+
+import org.bukkit.util.Vector;
+import org.jetbrains.annotations.Contract;
+
+import java.util.function.Function;
+
+/**
+ * Rotates {@link Vector}s around the X, Y, and Z axes, as well as any arbitrary axis.
+ * Does not support local axes.
+ * Returns new vector objects rather than mutating the input vector.
+ */
+public class NonMutatingVectorRotator implements Rotator<Vector> {
+
+	private final Function<Vector, Vector> rotator;
+
+	public NonMutatingVectorRotator(Axis axis, double angle) {
+		this.rotator = switch (axis) {
+			case X -> (input) -> input.clone().rotateAroundX(angle);
+			case Y -> (input) -> input.clone().rotateAroundY(angle);
+			case Z -> (input) -> input.clone().rotateAroundZ(angle);
+			case ARBITRARY -> throw new UnsupportedOperationException("Rotation around the " + axis + " axis requires additional data. Use a different constructor.");
+			case LOCAL_ARBITRARY, LOCAL_X, LOCAL_Y, LOCAL_Z -> (input) -> input;
+		};
+	}
+
+	public NonMutatingVectorRotator(Axis axis, Vector vector, double angle) {
+		this.rotator = switch (axis) {
+			case X -> (input) -> input.clone().rotateAroundX(angle);
+			case Y -> (input) -> input.clone().rotateAroundY(angle);
+			case Z -> (input) -> input.clone().rotateAroundZ(angle);
+			case ARBITRARY -> (input) -> input.clone().rotateAroundNonUnitAxis(vector, angle);
+			case LOCAL_ARBITRARY, LOCAL_X, LOCAL_Y, LOCAL_Z -> (input) -> input;
+		};
+	}
+
+	@Override
+	@Contract("_ -> new")
+	public Vector rotate(Vector input) {
+		return rotator.apply(input);
+	}
+
+}
diff --git a/src/main/java/org/skriptlang/skript/bukkit/misc/rotation/QuaternionRotator.java b/src/main/java/org/skriptlang/skript/bukkit/misc/rotation/QuaternionRotator.java
new file mode 100644
index 00000000000..694510d6739
--- /dev/null
+++ b/src/main/java/org/skriptlang/skript/bukkit/misc/rotation/QuaternionRotator.java
@@ -0,0 +1,54 @@
+package org.skriptlang.skript.bukkit.misc.rotation;
+
+import org.jetbrains.annotations.Contract;
+import org.joml.Quaternionf;
+import org.joml.Vector3f;
+
+import java.util.function.Function;
+
+/**
+ * Rotates {@link Quaternionf}s around the X, Y, and Z axes, as well as any arbitrary axis.
+ * Supports all local axes.
+ */
+public class QuaternionRotator implements Rotator<Quaternionf> {
+
+	private final Function<Quaternionf, Quaternionf> rotator;
+
+	/*
+	 * NOTE: the apparent mismatch between the axis and methods for local/non-local is intentional.
+	 * Rotating quaternions via rotateLocal results in a visual rotation around the global axis.
+	 */
+
+	public QuaternionRotator(Axis axis, float angle) {
+		this.rotator = switch (axis) {
+			case X -> (input) -> input.rotateLocalX(angle);
+			case Y -> (input) -> input.rotateLocalY(angle);
+			case Z -> (input) -> input.rotateLocalZ(angle);
+			case LOCAL_X -> (input) -> input.rotateX(angle);
+			case LOCAL_Y -> (input) -> input.rotateY(angle);
+			case LOCAL_Z -> (input) -> input.rotateZ(angle);
+			case LOCAL_ARBITRARY -> throw new UnsupportedOperationException("Rotation around the " + axis + " axis requires additional data. Use a different constructor.");
+			case ARBITRARY -> (input) -> input;
+		};
+	}
+
+	public QuaternionRotator(Axis axis, Vector3f vector, float angle) {
+		this.rotator = switch (axis) {
+			case X -> (input) -> input.rotateLocalX(angle);
+			case Y -> (input) -> input.rotateLocalY(angle);
+			case Z -> (input) -> input.rotateLocalZ(angle);
+			case LOCAL_X -> (input) -> input.rotateX(angle);
+			case LOCAL_Y -> (input) -> input.rotateY(angle);
+			case LOCAL_Z -> (input) -> input.rotateZ(angle);
+			case LOCAL_ARBITRARY -> (input) -> input.rotateAxis(angle, vector);
+			case ARBITRARY -> (input) -> input;
+		};
+	}
+
+	@Override
+	@Contract("_ -> param1")
+	public Quaternionf rotate(Quaternionf input) {
+		return rotator.apply(input);
+	}
+
+}
diff --git a/src/main/java/org/skriptlang/skript/bukkit/misc/rotation/Rotator.java b/src/main/java/org/skriptlang/skript/bukkit/misc/rotation/Rotator.java
new file mode 100644
index 00000000000..01b64105227
--- /dev/null
+++ b/src/main/java/org/skriptlang/skript/bukkit/misc/rotation/Rotator.java
@@ -0,0 +1,85 @@
+package org.skriptlang.skript.bukkit.misc.rotation;
+
+import java.util.Locale;
+
+/**
+ * A functional interface to support uniform rotation semantics between various types.
+ * A rotator rotates objects around a specific {@link Axis} by a specific angle in radians.
+ *
+ * @param <T> The class on which this rotator acts.
+ *
+ * @see	Axis
+ */
+@FunctionalInterface
+public interface Rotator<T> {
+
+	/**
+	 * Rotates the input around the rotator's axis by the rotator's angle.
+	 * May modify the input.
+	 */
+	T rotate(T input);
+
+	/**
+	 * Represents an axis around which to rotate.
+	 */
+	enum Axis {
+		/**
+		 * The global X axis, relative to the world as a whole.
+		 */
+		X,
+
+		/**
+		 * The local X axis, relative to the object being rotated.
+		 */
+		LOCAL_X,
+
+		/**
+		 * The global Y axis, relative to the world as a whole.
+		 */
+		Y,
+
+		/**
+		 * The local Y axis, relative to the object being rotated.
+		 */
+		LOCAL_Y,
+
+		/**
+		 * The global Z axis, relative to the world as a whole.
+		 */
+		Z,
+
+		/**
+		 * The local Z axis, relative to the object being rotated.
+		 */
+		LOCAL_Z,
+
+		/**
+		 * An arbitrary global axis, relative to the world as a whole.
+		 */
+		ARBITRARY,
+
+		/**
+		 * An arbitrary local axis, relative to the object being rotated.
+		 */
+		LOCAL_ARBITRARY;
+
+		@Override
+		public String toString() {
+			return super.toString().toLowerCase(Locale.ENGLISH).replace("_", " ");
+		}
+
+		/**
+		 * A helper method for converting from Bukkit {@link org.bukkit.Axis}.
+		 * @param axis the axis to convert from
+		 * @return the converted axis
+		 */
+		public static Axis fromBukkit(org.bukkit.Axis axis) {
+			return switch (axis) {
+				case X -> Axis.X;
+				case Y -> Axis.Y;
+				case Z -> Axis.Z;
+			};
+		}
+	}
+
+}
diff --git a/src/main/java/org/skriptlang/skript/bukkit/misc/rotation/VectorRotator.java b/src/main/java/org/skriptlang/skript/bukkit/misc/rotation/VectorRotator.java
new file mode 100644
index 00000000000..82760fe0fe2
--- /dev/null
+++ b/src/main/java/org/skriptlang/skript/bukkit/misc/rotation/VectorRotator.java
@@ -0,0 +1,42 @@
+package org.skriptlang.skript.bukkit.misc.rotation;
+
+import org.bukkit.util.Vector;
+import org.jetbrains.annotations.Contract;
+
+import java.util.function.Function;
+
+/**
+ * Rotates {@link Vector}s around the X, Y, and Z axes, as well as any arbitrary axis.
+ * Does not support local axes.
+ */
+public class VectorRotator implements Rotator<Vector> {
+
+	private final Function<Vector, Vector> rotator;
+
+	public VectorRotator(Axis axis, double angle) {
+		this.rotator = switch (axis) {
+			case X -> (input) -> input.rotateAroundX(angle);
+			case Y -> (input) -> input.rotateAroundY(angle);
+			case Z -> (input) -> input.rotateAroundZ(angle);
+			case ARBITRARY -> throw new UnsupportedOperationException("Rotation around the " + axis + " axis requires additional data. Use a different constructor.");
+			case LOCAL_ARBITRARY, LOCAL_X, LOCAL_Y, LOCAL_Z -> (input) -> input;
+		};
+	}
+
+	public VectorRotator(Axis axis, Vector vector, double angle) {
+		this.rotator = switch (axis) {
+			case X -> (input) -> input.rotateAroundX(angle);
+			case Y -> (input) -> input.rotateAroundY(angle);
+			case Z -> (input) -> input.rotateAroundZ(angle);
+			case ARBITRARY -> (input) -> input.rotateAroundNonUnitAxis(vector, angle);
+			case LOCAL_ARBITRARY, LOCAL_X, LOCAL_Y, LOCAL_Z -> (input) -> input;
+		};
+	}
+
+	@Override
+	@Contract("_ -> param1")
+	public Vector rotate(Vector input) {
+		return rotator.apply(input);
+	}
+
+}
diff --git a/src/main/java/org/skriptlang/skript/lang/util/package-info.java b/src/main/java/org/skriptlang/skript/bukkit/misc/rotation/package-info.java
similarity index 93%
rename from src/main/java/org/skriptlang/skript/lang/util/package-info.java
rename to src/main/java/org/skriptlang/skript/bukkit/misc/rotation/package-info.java
index c48b939796c..ddd2cbbcf13 100644
--- a/src/main/java/org/skriptlang/skript/lang/util/package-info.java
+++ b/src/main/java/org/skriptlang/skript/bukkit/misc/rotation/package-info.java
@@ -16,5 +16,4 @@
  *
  * Copyright Peter Güttinger, SkriptLang team and contributors
  */
-package org.skriptlang.skript.lang.util;
-
+package org.skriptlang.skript.bukkit.misc.rotation;
diff --git a/src/main/java/org/skriptlang/skript/bukkit/registration/BukkitRegistryKeys.java b/src/main/java/org/skriptlang/skript/bukkit/registration/BukkitRegistryKeys.java
new file mode 100644
index 00000000000..336b84a2361
--- /dev/null
+++ b/src/main/java/org/skriptlang/skript/bukkit/registration/BukkitRegistryKeys.java
@@ -0,0 +1,22 @@
+package org.skriptlang.skript.bukkit.registration;
+
+import ch.njol.skript.lang.SkriptEvent;
+import org.jetbrains.annotations.ApiStatus;
+import org.skriptlang.skript.bukkit.registration.BukkitSyntaxInfos.Event;
+import org.skriptlang.skript.registration.SyntaxRegistry;
+import org.skriptlang.skript.registration.SyntaxRegistry.Key;
+
+/**
+ * A class containing {@link SyntaxRegistry} keys for Bukkit-specific syntax elements.
+ */
+@ApiStatus.Experimental
+public final class BukkitRegistryKeys {
+
+	private BukkitRegistryKeys() { }
+
+	/**
+	 * A key representing the Bukkit-specific {@link SkriptEvent} syntax element.
+	 */
+	public static final Key<Event<?>> EVENT = Key.of("event");
+
+}
diff --git a/src/main/java/org/skriptlang/skript/bukkit/registration/BukkitSyntaxInfos.java b/src/main/java/org/skriptlang/skript/bukkit/registration/BukkitSyntaxInfos.java
new file mode 100644
index 00000000000..8a29109a016
--- /dev/null
+++ b/src/main/java/org/skriptlang/skript/bukkit/registration/BukkitSyntaxInfos.java
@@ -0,0 +1,353 @@
+package org.skriptlang.skript.bukkit.registration;
+
+import ch.njol.skript.lang.SkriptEvent;
+import ch.njol.skript.lang.SkriptEvent.ListeningBehavior;
+import org.jetbrains.annotations.ApiStatus;
+import org.jetbrains.annotations.Contract;
+import org.jetbrains.annotations.Nullable;
+import org.skriptlang.skript.bukkit.registration.BukkitSyntaxInfosImpl.EventImpl;
+import org.skriptlang.skript.registration.SyntaxInfo;
+
+import java.util.Collection;
+
+/**
+ * A class containing the interfaces representing Bukkit-specific SyntaxInfo implementations.
+ */
+@ApiStatus.Experimental
+public final class BukkitSyntaxInfos {
+
+	private BukkitSyntaxInfos() { }
+
+	/**
+	 * A syntax info to be used for {@link SkriptEvent}s.
+	 * It contains additional details including the Bukkit events represented along with documentation data.
+	 * @param <E> The class providing the implementation of the SkriptEvent this info represents.
+	 */
+	public interface Event<E extends SkriptEvent> extends SyntaxInfo<E> {
+
+		/**
+		 * @param eventClass The Structure class the info will represent.
+		 * @param name The name of the SkriptEvent.
+		 * @return A Structure-specific builder for creating a syntax info representing <code>type</code>.
+		 */
+		static <E extends SkriptEvent> Builder<? extends Builder<?, E>, E> builder(
+			Class<E> eventClass, String name
+		) {
+			return new EventImpl.BuilderImpl<>(eventClass, name);
+		}
+
+		/**
+		 * {@inheritDoc}
+		 */
+		@Override
+		@Contract("-> new")
+		Builder<? extends Builder<?, E>, E> toBuilder();
+
+		/**
+		 * @return The listening behavior for the SkriptEvent. Determines when the event should trigger.
+		 */
+		ListeningBehavior listeningBehavior();
+
+		/**
+		 * @return The name of the {@link SkriptEvent}.
+		 */
+		String name();
+
+		/**
+		 * @return A documentation-friendly version of {@link #name()}.
+		 */
+		String id();
+
+		/**
+		 * @return Documentation data. Represents the version of the plugin in which a syntax was added.
+		 * @see ch.njol.skript.doc.Since
+		 */
+		@Nullable String since();
+
+		/**
+		 * @return Documentation data. Used for identifying specific syntaxes in documentation.
+		 * @see ch.njol.skript.doc.DocumentationId
+		 */
+		@Nullable String documentationId();
+
+		/**
+		 * @return Documentation data. A description of a syntax.
+		 * @see ch.njol.skript.doc.Description
+		 */
+		Collection<String> description();
+
+		/**
+		 * @return Documentation data. Examples for using a syntax.
+		 * @see ch.njol.skript.doc.Examples
+		 */
+		Collection<String> examples();
+
+		/**
+		 * @return Documentation data. Keywords are used by the search engine to provide relevant results.
+		 * @see ch.njol.skript.doc.Keywords
+		 */
+		Collection<String> keywords();
+
+		/**
+		 * @return Documentation data. Plugins other than Skript that are required by a syntax.
+		 * @see ch.njol.skript.doc.RequiredPlugins
+		 */
+		Collection<String> requiredPlugins();
+
+		/**
+		 * @return A collection of the classes representing the Bukkit events the {@link SkriptEvent} listens for.
+		 */
+		Collection<Class<? extends org.bukkit.event.Event>> events();
+
+		/**
+		 * An Event-specific builder is used for constructing a new Event syntax info.
+		 * @see #builder(Class, String)
+		 * @param <B> The type of builder being used.
+		 * @param <E> The SkriptEvent class providing the implementation of the syntax info being built.
+		 */
+		interface Builder<B extends Builder<B, E>, E extends SkriptEvent> extends SyntaxInfo.Builder<B, E> {
+
+			/**
+			 * Sets the listening behavior the event will use.
+			 * This determines when the event should trigger.
+			 * By default, this is {@link ListeningBehavior#UNCANCELLED}.
+			 * @param listeningBehavior The listening behavior to use.
+			 * @return This builder.
+			 * @see Event#listeningBehavior()
+			 */
+			@Contract("_ -> this")
+			B listeningBehavior(ListeningBehavior listeningBehavior);
+
+			/**
+			 * Sets the "since" value the event's documentation will use.
+			 * @param since The "since" value to use.
+			 * @return This builder.
+			 * @see Event#since()
+			 */
+			@Contract("_ -> this")
+			B since(String since);
+
+			/**
+			 * Sets the documentation identifier the event's documentation will use.
+			 * @param documentationId The documentation identifier to use.
+			 * @return This builder.
+			 * @see Event#documentationId()
+			 */
+			@Contract("_ -> this")
+			B documentationId(String documentationId);
+
+			/**
+			 * Adds a description line to the event's documentation.
+			 * @param description The description line to add.
+			 * @return This builder.
+			 * @see Event#description()
+			 */
+			@Contract("_ -> this")
+			B addDescription(String description);
+
+			/**
+			 * Adds lines of description to the event's documentation.
+			 * @param description The description lines to add.
+			 * @return This builder.
+			 * @see Event#description()
+			 */
+			@Contract("_ -> this")
+			B addDescription(String... description);
+
+			/**
+			 * Adds lines of description to the event's documentation.
+			 * @param description The description lines to add.
+			 * @return This builder.
+			 * @see Event#description()
+			 */
+			@Contract("_ -> this")
+			B addDescription(Collection<String> description);
+
+			/**
+			 * Removes all description lines from the event's documentation.
+			 * @return This builder.
+			 * @see Event#description()
+			 */
+			@Contract("-> this")
+			B clearDescription();
+
+			/**
+			 * Adds an example to the event's documentation.
+			 * @param example The example to add.
+			 * @return This builder.
+			 * @see Event#examples()
+			 */
+			@Contract("_ -> this")
+			B addExample(String example);
+
+			/**
+			 * Adds examples to the event's documentation.
+			 * @param examples The examples to add.
+			 * @return This builder.
+			 * @see Event#examples()
+			 */
+			@Contract("_ -> this")
+			B addExamples(String... examples);
+
+			/**
+			 * Adds examples to the event's documentation.
+			 * @param examples The examples to add.
+			 * @return This builder.
+			 * @see Event#examples()
+			 */
+			@Contract("_ -> this")
+			B addExamples(Collection<String> examples);
+
+			/**
+			 * Removes all examples from the event's documentation.
+			 * @return This builder.
+			 * @see Event#examples()
+			 */
+			@Contract("-> this")
+			B clearExamples();
+
+			/**
+			 * Adds a keyword to the event's documentation.
+			 * @param keyword The keyword to add.
+			 * @return This builder.
+			 * @see Event#keywords()
+			 */
+			@Contract("_ -> this")
+			B addKeyword(String keyword);
+
+			/**
+			 * Adds keywords to the event's documentation.
+			 * @param keywords The keywords to add.
+			 * @return This builder.
+			 * @see Event#keywords()
+			 */
+			@Contract("_ -> this")
+			B addKeywords(String... keywords);
+
+			/**
+			 * Adds keywords to the event's documentation.
+			 * @param keywords The keywords to add.
+			 * @return This builder.
+			 * @see Event#keywords()
+			 */
+			@Contract("_ -> this")
+			B addKeywords(Collection<String> keywords);
+
+			/**
+			 * Removes all keywords from the event's documentation.
+			 * @return This builder.
+			 * @see Event#keywords()
+			 */
+			@Contract("-> this")
+			B clearKeywords();
+
+			/**
+			 * Adds a required plugin to event's documentation.
+			 * @param plugin The required plugin to add.
+			 * @return This builder.
+			 * @see Event#requiredPlugins()
+			 */
+			@Contract("_ -> this")
+			B addRequiredPlugin(String plugin);
+
+			/**
+			 * Adds required plugins to the event's documentation.
+			 * @param plugins The required plugins to add.
+			 * @return This builder.
+			 * @see Event#requiredPlugins()
+			 */
+			@Contract("_ -> this")
+			B addRequiredPlugins(String... plugins);
+
+			/**
+			 * Adds required plugins to the event's documentation.
+			 * @param plugins The required plugins to add.
+			 * @return This builder.
+			 * @see Event#requiredPlugins()
+			 */
+			@Contract("_ -> this")
+			B addRequiredPlugins(Collection<String> plugins);
+
+			/**
+			 * Removes all required plugins from the event's documentation.
+			 * @return This builder.
+			 * @see Event#requiredPlugins()
+			 */
+			B clearRequiredPlugins();
+
+			/**
+			 * Adds an event to the event's documentation.
+			 * @param event The event to add.
+			 * @return This builder.
+			 * @see Event#events()
+			 */
+			@Contract("_ -> this")
+			B addEvent(Class<? extends org.bukkit.event.Event> event);
+
+			/**
+			 * Adds events to the event's documentation.
+			 * @param events The events to add.
+			 * @return This builder.
+			 * @see Event#events()
+			 */
+			@Contract("_ -> this")
+			B addEvents(Class<? extends org.bukkit.event.Event>[] events);
+
+			/**
+			 * Adds events to the event's documentation.
+			 * @param events The events to add.
+			 * @return This builder.
+			 * @see Event#events()
+			 */
+			@Contract("_ -> this")
+			B addEvents(Collection<Class<? extends org.bukkit.event.Event>> events);
+
+			/**
+			 * Removes all events from the event's documentation.
+			 * @return This builder.
+			 * @see Event#events()
+			 */
+			@Contract("-> this")
+			B clearEvents();
+
+			/**
+			 * {@inheritDoc}
+			 */
+			@Override
+			@Contract("-> new")
+			Event<E> build();
+
+		}
+
+	}
+
+	/**
+	 * Fixes patterns in event by modifying every {@link ch.njol.skript.patterns.TypePatternElement} to be nullable.
+	 */
+	public static String fixPattern(String pattern) {
+		char[] chars = pattern.toCharArray();
+		StringBuilder stringBuilder = new StringBuilder();
+
+		boolean inType = false;
+		for (int i = 0; i < chars.length; i++) {
+			char character = chars[i];
+			stringBuilder.append(character);
+
+			if (character == '%') {
+				// toggle inType
+				inType = !inType;
+
+				// add the dash character if it's not already present
+				// a type specification can have two prefix characters for modification
+				if (inType && i + 2 < chars.length && chars[i + 1] != '-' && chars[i + 2] != '-')
+					stringBuilder.append('-');
+			} else if (character == '\\' && i + 1 < chars.length) {
+				// Make sure we don't toggle inType for escape percentage signs
+				stringBuilder.append(chars[i + 1]);
+				i++;
+			}
+		}
+		return stringBuilder.toString();
+	}
+
+}
diff --git a/src/main/java/org/skriptlang/skript/bukkit/registration/BukkitSyntaxInfosImpl.java b/src/main/java/org/skriptlang/skript/bukkit/registration/BukkitSyntaxInfosImpl.java
new file mode 100644
index 00000000000..96f8f614743
--- /dev/null
+++ b/src/main/java/org/skriptlang/skript/bukkit/registration/BukkitSyntaxInfosImpl.java
@@ -0,0 +1,419 @@
+package org.skriptlang.skript.bukkit.registration;
+
+import ch.njol.skript.lang.SkriptEvent;
+import ch.njol.skript.lang.SkriptEvent.ListeningBehavior;
+import com.google.common.base.MoreObjects;
+import com.google.common.collect.ImmutableList;
+import org.jetbrains.annotations.Nullable;
+import org.jetbrains.annotations.Unmodifiable;
+import org.skriptlang.skript.bukkit.registration.BukkitSyntaxInfos.Event;
+import org.skriptlang.skript.registration.SyntaxInfo;
+import org.skriptlang.skript.registration.SyntaxOrigin;
+import org.skriptlang.skript.util.Priority;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.Locale;
+import java.util.Objects;
+import java.util.function.Supplier;
+
+final class BukkitSyntaxInfosImpl {
+
+	static final class EventImpl<E extends SkriptEvent> implements Event<E> {
+
+		private final SyntaxInfo<E> defaultInfo;
+		private final ListeningBehavior listeningBehavior;
+		private final String name;
+		private final String id;
+		private final @Nullable String since;
+		private final @Nullable String documentationId;
+		private final Collection<String> description;
+		private final Collection<String> examples;
+		private final Collection<String> keywords;
+		private final Collection<String> requiredPlugins;
+		private final Collection<Class<? extends org.bukkit.event.Event>> events;
+
+		EventImpl(
+			SyntaxInfo<E> defaultInfo, ListeningBehavior listeningBehavior, String name,
+			@Nullable String since, @Nullable String documentationId, Collection<String> description, Collection<String> examples,
+			Collection<String> keywords, Collection<String> requiredPlugins, Collection<Class<? extends org.bukkit.event.Event>> events
+		) {
+			this.defaultInfo = defaultInfo;
+			this.listeningBehavior = listeningBehavior;
+			this.name = name.startsWith("*") ? name.substring(1) : "On " + name;
+			this.id = name.toLowerCase(Locale.ENGLISH)
+					.replaceAll("[#'\"<>/&]", "")
+					.replaceAll("\\s+", "_");
+			this.since = since;
+			this.documentationId = documentationId;
+			this.description = ImmutableList.copyOf(description);
+			this.examples = ImmutableList.copyOf(examples);
+			this.keywords = ImmutableList.copyOf(keywords);
+			this.requiredPlugins = ImmutableList.copyOf(requiredPlugins);
+			this.events = ImmutableList.copyOf(events);
+		}
+
+		@Override
+		public Builder<? extends Builder<?, E>, E> toBuilder() {
+			var builder = new BuilderImpl<>(type(), name);
+			defaultInfo.toBuilder().applyTo(builder);
+			builder.listeningBehavior(listeningBehavior);
+			builder.documentationId(id);
+			if (since != null) {
+				builder.since(since);
+			}
+			if (documentationId != null) {
+				builder.documentationId(documentationId);
+			}
+			builder.addDescription(description);
+			builder.addExamples(examples);
+			builder.addKeywords(keywords);
+			builder.addRequiredPlugins(requiredPlugins);
+			builder.addEvents(events);
+			return builder;
+		}
+
+		@Override
+		public ListeningBehavior listeningBehavior() {
+			return listeningBehavior;
+		}
+
+		@Override
+		public String name() {
+			return name;
+		}
+
+		@Override
+		public String id() {
+			return id;
+		}
+
+		@Override
+		@Nullable
+		public String since() {
+			return since;
+		}
+
+		@Override
+		@Nullable
+		public String documentationId() {
+			return documentationId;
+		}
+
+		@Override
+		public Collection<String> description() {
+			return description;
+		}
+
+		@Override
+		public Collection<String> examples() {
+			return examples;
+		}
+
+		@Override
+		public Collection<String> keywords() {
+			return keywords;
+		}
+
+		@Override
+		public Collection<String> requiredPlugins() {
+			return requiredPlugins;
+		}
+
+		@Override
+		public Collection<Class<? extends org.bukkit.event.Event>> events() {
+			return events;
+		}
+
+		@Override
+		public boolean equals(Object other) {
+			if (this == other) {
+				return true;
+			}
+			return (other instanceof Event<?> event) &&
+					Objects.equals(defaultInfo, other) &&
+					Objects.equals(name(), event.name()) &&
+					Objects.equals(events(), event.events());
+		}
+
+		@Override
+		public int hashCode() {
+			return Objects.hash(defaultInfo, name(), events());
+		}
+
+		@Override
+		public String toString() {
+			return MoreObjects.toStringHelper(this)
+					.add("origin", origin())
+					.add("type", type())
+					.add("patterns", patterns())
+					.add("priority", priority())
+					.add("name", name())
+					.add("events", events())
+					.toString();
+		}
+
+		//
+		// default methods
+		//
+
+		@Override
+		public SyntaxOrigin origin() {
+			return defaultInfo.origin();
+		}
+
+		@Override
+		public Class<E> type() {
+			return defaultInfo.type();
+		}
+
+		@Override
+		public E instance() {
+			return defaultInfo.instance();
+		}
+
+		@Override
+		@Unmodifiable
+		public Collection<String> patterns() {
+			return defaultInfo.patterns();
+		}
+
+		@Override
+		public Priority priority() {
+			return defaultInfo.priority();
+		}
+
+		@SuppressWarnings("unchecked")
+		static final class BuilderImpl<B extends Event.Builder<B, E>, E extends SkriptEvent> implements Event.Builder<B, E> {
+
+			private final SyntaxInfo.Builder<?, E> defaultBuilder;
+			private ListeningBehavior listeningBehavior = ListeningBehavior.UNCANCELLED;
+			private final String name;
+			private @Nullable String since;
+			private @Nullable String documentationId;
+			private final List<String> description = new ArrayList<>();
+			private final List<String> examples = new ArrayList<>();
+			private final List<String> keywords = new ArrayList<>();
+			private final List<String> requiredPlugins = new ArrayList<>();
+			private final List<Class<? extends org.bukkit.event.Event>> events = new ArrayList<>();
+
+			BuilderImpl(Class<E> type, String name) {
+				this.defaultBuilder = SyntaxInfo.builder(type);
+				this.name = name;
+			}
+
+			@Override
+			public B listeningBehavior(ListeningBehavior listeningBehavior) {
+				this.listeningBehavior = listeningBehavior;
+				return (B) this;
+			}
+
+			@Override
+			public B since(String since) {
+				this.since = since;
+				return (B) this;
+			}
+
+			@Override
+			public B documentationId(String documentationId) {
+				this.documentationId = documentationId;
+				return (B) this;
+			}
+
+			@Override
+			public B addDescription(String description) {
+				this.description.add(description);
+				return (B) this;
+			}
+
+			@Override
+			public B addDescription(String... description) {
+				Collections.addAll(this.description, description);
+				return (B) this;
+			}
+
+			@Override
+			public B addDescription(Collection<String> description) {
+				this.description.addAll(description);
+				return (B) this;
+			}
+
+			@Override
+			public B clearDescription() {
+				this.description.clear();
+				return (B) this;
+			}
+
+			@Override
+			public B addExample(String example) {
+				this.examples.add(example);
+				return (B) this;
+			}
+
+			@Override
+			public B addExamples(String... examples) {
+				Collections.addAll(this.examples, examples);
+				return (B) this;
+			}
+
+			@Override
+			public B addExamples(Collection<String> examples) {
+				this.examples.addAll(examples);
+				return (B) this;
+			}
+
+			@Override
+			public B clearExamples() {
+				this.examples.clear();
+				return (B) this;
+			}
+
+			@Override
+			public B addKeyword(String keyword) {
+				this.keywords.add(keyword);
+				return (B) this;
+			}
+
+			@Override
+			public B addKeywords(String... keywords) {
+				Collections.addAll(this.keywords, keywords);
+				return (B) this;
+			}
+
+			@Override
+			public B addKeywords(Collection<String> keywords) {
+				this.keywords.addAll(keywords);
+				return (B) this;
+			}
+
+			@Override
+			public B clearKeywords() {
+				this.keywords.clear();
+				return (B) this;
+			}
+
+			@Override
+			public B addRequiredPlugin(String plugin) {
+				this.requiredPlugins.add(plugin);
+				return (B) this;
+			}
+
+			@Override
+			public B addRequiredPlugins(String... plugins) {
+				Collections.addAll(this.requiredPlugins, plugins);
+				return (B) this;
+			}
+
+			@Override
+			public B addRequiredPlugins(Collection<String> plugins) {
+				this.requiredPlugins.addAll(plugins);
+				return (B) this;
+			}
+
+			@Override
+			public B clearRequiredPlugins() {
+				this.requiredPlugins.clear();
+				return (B) this;
+			}
+
+			@Override
+			public B addEvent(Class<? extends org.bukkit.event.Event> event) {
+				this.events.add(event);
+				return (B) this;
+			}
+
+			@Override
+			public B addEvents(Class<? extends org.bukkit.event.Event>... events) {
+				Collections.addAll(this.events, events);
+				return (B) this;
+			}
+
+			@Override
+			public B addEvents(Collection<Class<? extends org.bukkit.event.Event>> events) {
+				this.events.addAll(events);
+				return (B) this;
+			}
+
+			@Override
+			public B clearEvents() {
+				this.events.clear();
+				return (B) this;
+			}
+
+			@Override
+			public B origin(SyntaxOrigin origin) {
+				defaultBuilder.origin(origin);
+				return (B) this;
+			}
+
+			@Override
+			public B supplier(Supplier<E> supplier) {
+				defaultBuilder.supplier(supplier);
+				return (B) this;
+			}
+
+			@Override
+			public B addPattern(String pattern) {
+				defaultBuilder.addPattern(pattern);
+				return (B) this;
+			}
+
+			@Override
+			public B addPatterns(String... patterns) {
+				defaultBuilder.addPatterns(patterns);
+				return (B) this;
+			}
+
+			@Override
+			public B addPatterns(Collection<String> patterns) {
+				defaultBuilder.addPatterns(patterns);
+				return (B) this;
+			}
+
+			@Override
+			public B clearPatterns() {
+				defaultBuilder.clearPatterns();
+				return (B) this;
+			}
+
+			@Override
+			public B priority(Priority priority) {
+				defaultBuilder.priority(priority);
+				return (B) this;
+			}
+
+			@Override
+			public Event<E> build() {
+				return new EventImpl<>(
+					defaultBuilder.build(), listeningBehavior, name,
+					since, documentationId, description, examples, keywords, requiredPlugins, events
+				);
+			}
+
+			@Override
+			public void applyTo(SyntaxInfo.Builder<?, ?> builder) {
+				defaultBuilder.applyTo(builder);
+				//noinspection rawtypes - Should be safe, generics will not influence this
+				if (builder instanceof Event.Builder eventBuilder) {
+					eventBuilder.listeningBehavior(listeningBehavior);
+					if (since != null) {
+						eventBuilder.since(since);
+					}
+					if (documentationId != null) {
+						eventBuilder.documentationId(documentationId);
+					}
+					eventBuilder.addDescription(description);
+					eventBuilder.addExamples(examples);
+					eventBuilder.addKeywords(keywords);
+					eventBuilder.addRequiredPlugins(requiredPlugins);
+					eventBuilder.addEvents(events);
+				}
+			}
+
+		}
+
+	}
+
+}
diff --git a/src/main/java/org/skriptlang/skript/bukkit/tags/SkriptTag.java b/src/main/java/org/skriptlang/skript/bukkit/tags/SkriptTag.java
new file mode 100644
index 00000000000..e565d0a3304
--- /dev/null
+++ b/src/main/java/org/skriptlang/skript/bukkit/tags/SkriptTag.java
@@ -0,0 +1,44 @@
+package org.skriptlang.skript.bukkit.tags;
+
+import org.bukkit.Keyed;
+import org.bukkit.NamespacedKey;
+import org.bukkit.Tag;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.UnmodifiableView;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Set;
+
+/**
+ * Represents a custom tag created by the Skript user.
+ * Implementation of {@link Tag} with a custom set of contents.
+ * @param <T> The type of the contents.
+ */
+public class SkriptTag<T extends Keyed> implements Tag<T> {
+
+	private final Set<T> contents;
+	private final NamespacedKey key;
+
+	public SkriptTag(NamespacedKey key, Collection<T> contents) {
+		this.key = key;
+		this.contents = new HashSet<>(contents);
+	}
+
+	@Override
+	public boolean isTagged(@NotNull T item) {
+		return contents.contains(item);
+	}
+
+	@Override
+	public @NotNull @UnmodifiableView Set<T> getValues() {
+		return Collections.unmodifiableSet(contents);
+	}
+
+	@Override
+	public @NotNull NamespacedKey getKey() {
+		return key;
+	}
+
+}
diff --git a/src/main/java/org/skriptlang/skript/bukkit/tags/TagModule.java b/src/main/java/org/skriptlang/skript/bukkit/tags/TagModule.java
new file mode 100644
index 00000000000..92bbda1087f
--- /dev/null
+++ b/src/main/java/org/skriptlang/skript/bukkit/tags/TagModule.java
@@ -0,0 +1,109 @@
+package org.skriptlang.skript.bukkit.tags;
+
+import ch.njol.skript.Skript;
+import ch.njol.skript.aliases.ItemType;
+import ch.njol.skript.bukkitutil.EntityUtils;
+import ch.njol.skript.classes.ClassInfo;
+import ch.njol.skript.classes.Parser;
+import ch.njol.skript.entity.EntityData;
+import ch.njol.skript.lang.ParseContext;
+import ch.njol.skript.registrations.Classes;
+import ch.njol.skript.util.slot.Slot;
+import org.bukkit.Keyed;
+import org.bukkit.Tag;
+import org.bukkit.block.Block;
+import org.bukkit.block.data.BlockData;
+import org.bukkit.entity.Entity;
+import org.bukkit.inventory.ItemStack;
+import org.jetbrains.annotations.Contract;
+import org.jetbrains.annotations.Nullable;
+import org.skriptlang.skript.lang.comparator.Comparators;
+import org.skriptlang.skript.lang.comparator.Relation;
+
+import java.io.IOException;
+
+public class TagModule {
+
+	// paper tags
+	public static final boolean PAPER_TAGS_EXIST = Skript.classExists("com.destroystokyo.paper.MaterialTags");
+
+	// tag object
+	public static TagRegistry tagRegistry;
+
+	public static void load() throws IOException {
+		// abort if no class exists
+		if (!Skript.classExists("org.bukkit.Tag"))
+			return;
+
+		// Classes
+		Classes.registerClass(new ClassInfo<>(Tag.class, "minecrafttag")
+			.user("minecraft ?tags?")
+			.name("Minecraft Tag")
+			.description("A tag that classifies a material, or entity.")
+			.since("2.10")
+			.parser(new Parser<Tag<?>>() {
+				@Override
+				public boolean canParse(ParseContext context) {
+					return false;
+				}
+
+				@Override
+				public String toString(Tag<?> tag, int flags) {
+					return "tag " + tag.getKey();
+				}
+
+				@Override
+				public String toVariableNameString(Tag<?> tag) {
+					return toString(tag, 0);
+				}
+			}));
+
+		// load classes (todo: replace with registering methods after registration api
+		Skript.getAddonInstance().loadClasses("org.skriptlang.skript.bukkit", "tags");
+
+		// compare tags by keys, not by object instance.
+		Comparators.registerComparator(Tag.class, Tag.class, (a, b) -> Relation.get(a.getKey().equals(b.getKey())));
+
+		// init tags
+		tagRegistry = new TagRegistry();
+	}
+
+	/**
+	 * Retrieves a Keyed array based on the type of the provided input object.
+	 *
+	 * @param input the input object to determine the keyed value, can be of type Entity,
+	 *              EntityData, ItemType, ItemStack, Slot, Block, or BlockData.
+	 * @return a Keyed array corresponding to the input's type, or null if the input is null
+	 *         or if no corresponding Keyed value can be determined. ItemTypes may return multiple values,
+	 *         though everything else will return a single element array.
+	 */
+	@Contract(value = "null -> null", pure = true)
+	public static @Nullable Keyed[] getKeyed(Object input) {
+		Keyed value = null;
+		Keyed[] values = null;
+		if (input == null)
+			return null;
+		if (input instanceof Entity entity) {
+			value = entity.getType();
+		} if (input instanceof EntityData<?> data) {
+			value = EntityUtils.toBukkitEntityType(data);
+		} else if (input instanceof ItemType itemType) {
+			values = itemType.getMaterials();
+		} else if (input instanceof ItemStack itemStack) {
+			value = itemStack.getType();
+		} else if (input instanceof Slot slot) {
+			ItemStack stack = slot.getItem();
+			if (stack == null)
+				return null;
+			value = stack.getType();
+		} else if (input instanceof Block block) {
+			value = block.getType();
+		} else if (input instanceof BlockData data) {
+			value = data.getMaterial();
+		}
+		if (value == null)
+			return values;
+		return new Keyed[]{value};
+	}
+
+}
diff --git a/src/main/java/org/skriptlang/skript/bukkit/tags/TagRegistry.java b/src/main/java/org/skriptlang/skript/bukkit/tags/TagRegistry.java
new file mode 100644
index 00000000000..7bbd2eb2d5c
--- /dev/null
+++ b/src/main/java/org/skriptlang/skript/bukkit/tags/TagRegistry.java
@@ -0,0 +1,218 @@
+package org.skriptlang.skript.bukkit.tags;
+
+import ch.njol.util.coll.iterator.CheckedIterator;
+import com.destroystokyo.paper.MaterialTags;
+import com.google.common.collect.ArrayListMultimap;
+import com.google.common.collect.Iterators;
+import io.papermc.paper.tag.EntityTags;
+import org.bukkit.Keyed;
+import org.bukkit.Material;
+import org.bukkit.NamespacedKey;
+import org.bukkit.Tag;
+import org.bukkit.entity.EntityType;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+import org.skriptlang.skript.bukkit.tags.sources.BukkitTagSource;
+import org.skriptlang.skript.bukkit.tags.sources.PaperTagSource;
+import org.skriptlang.skript.bukkit.tags.sources.SkriptTagSource;
+import org.skriptlang.skript.bukkit.tags.sources.TagOrigin;
+import org.skriptlang.skript.bukkit.tags.sources.TagSource;
+
+import java.lang.reflect.Field;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.function.Predicate;
+
+/**
+ * A class in charge of storing and handling all the tags Skript can access.
+ */
+public class TagRegistry {
+
+	private final TagSourceMap tagSourceMap = new TagSourceMap();
+
+	/**
+	 * Each new instance will create a new set of tag sources, in an effort to be reload safe.
+	 */
+	TagRegistry() {
+		tagSourceMap.put(TagType.ITEMS, new BukkitTagSource<>("items", TagType.ITEMS));
+		tagSourceMap.put(TagType.BLOCKS, new BukkitTagSource<>("blocks", TagType.BLOCKS));
+		tagSourceMap.put(TagType.ENTITIES, new BukkitTagSource<>("entity_types", TagType.ENTITIES));
+
+		if (TagModule.PAPER_TAGS_EXIST) {
+			try {
+				List<Tag<Material>> itemTags = new ArrayList<>();
+				List<Tag<Material>> blockTags = new ArrayList<>();
+				List<Tag<Material>> blockAndItemTag = new ArrayList<>();
+				for (Field field : MaterialTags.class.getDeclaredFields()) {
+					if (field.canAccess(null)) {
+						//noinspection unchecked
+						Tag<Material> tag = (Tag<Material>) field.get(null);
+						boolean hasItem = false;
+						boolean hasBlock = false;
+						for (Material material : tag.getValues()) {
+							if (!hasBlock && material.isBlock()) {
+								blockTags.add(tag);
+								hasBlock = true;
+							}
+							if (!hasItem && material.isItem()) {
+								itemTags.add(tag);
+								hasItem = true;
+							}
+							if (hasItem && hasBlock) {
+								blockAndItemTag.add(tag);
+								break;
+							}
+						}
+					}
+				}
+				PaperTagSource<Material> paperMaterialTags = new PaperTagSource<>(blockAndItemTag, TagType.BLOCKS, TagType.ITEMS);
+				PaperTagSource<Material> paperItemTags = new PaperTagSource<>(itemTags, TagType.ITEMS);
+				PaperTagSource<Material> paperBlockTags = new PaperTagSource<>(blockTags, TagType.BLOCKS);
+				tagSourceMap.put(TagType.BLOCKS, paperMaterialTags);
+				tagSourceMap.put(TagType.ITEMS, paperMaterialTags);
+
+				tagSourceMap.put(TagType.BLOCKS, paperBlockTags);
+				tagSourceMap.put(TagType.ITEMS, paperItemTags);
+
+				List<Tag<EntityType>> entityTags = new ArrayList<>();
+				for (Field field : EntityTags.class.getDeclaredFields()) {
+					if (field.canAccess(null))
+						//noinspection unchecked
+						entityTags.add((Tag<EntityType>) field.get(null));
+				}
+				PaperTagSource<EntityType> paperEntityTags = new PaperTagSource<>(entityTags, TagType.ENTITIES);
+				tagSourceMap.put(TagType.ENTITIES, paperEntityTags);
+			} catch (IllegalAccessException ignored) {}
+		}
+
+		SkriptTagSource.makeDefaultSources();
+		tagSourceMap.put(TagType.ITEMS, SkriptTagSource.ITEMS());
+		tagSourceMap.put(TagType.BLOCKS, SkriptTagSource.BLOCKS());
+		tagSourceMap.put(TagType.ENTITIES, SkriptTagSource.ENTITIES());
+	}
+
+	/**
+	 * Gets all the tags of a specific origin that are applicable to a given class.
+	 * @param origin The origin to filter by.
+	 * @param typeClass The class the tags should be applicable to.
+	 * @param types Tag types to check with. Leaving this empty will check all tag types.
+	 * @return TagRegistry from the given origin and types that apply to the given class.
+	 * @param <T> see typeClass.
+	 */
+	public <T extends Keyed> Iterable<Tag<T>> getTags(TagOrigin origin, Class<T> typeClass, TagType<?>... types) {
+		List<Iterator<Tag<T>>> tagIterators = new ArrayList<>();
+		if (types == null)
+			types = tagSourceMap.map.keys().toArray(new TagType[0]);
+		for (TagType<?> type : types) {
+			if (typeClass.isAssignableFrom(type.type())) {
+				//noinspection unchecked
+				Iterator<Tag<T>> iterator = getTags(origin, (TagType<T>) type).iterator();
+				if (iterator.hasNext())
+					tagIterators.add(iterator);
+			}
+		}
+		return new Iterable<>() {
+			@Override
+			public @NotNull Iterator<Tag<T>> iterator() {
+				return Iterators.concat(tagIterators.iterator());
+			}
+		};
+	}
+
+	/**
+	 * Gets all the tags of a specific origin that are of a specific type.
+	 * @param origin The origin to filter by.
+	 * @param type The type of tags to get.
+	 * @return TagRegistry from the given origin that are of the given type.
+	 * @param <T> The class these tags apply to.
+	 */
+	public <T extends Keyed> Iterable<Tag<T>> getTags(TagOrigin origin, TagType<T> type) {
+		if (!tagSourceMap.containsKey(type))
+			return List.of();
+		Iterator<TagSource<T>> tagSources = tagSourceMap.get(origin, type).iterator();
+		if (!tagSources.hasNext())
+			return List.of();
+		return new Iterable<>() {
+			@Override
+			public @NotNull Iterator<Tag<T>> iterator() {
+				return Iterators.concat(new Iterator<Iterator<Tag<T>>>() {
+					@Override
+					public boolean hasNext() {
+						return tagSources.hasNext();
+					}
+
+					@Override
+					public Iterator<Tag<T>> next() {
+						return tagSources.next().getAllTags().iterator();
+					}
+				});
+			}
+		};
+	}
+
+	/**
+	 * Gets all the tags of a specific origin that are of a specific type. Filters the resulting tags using the given
+	 * predicate.
+	 * @param origin The origin to filter by.
+	 * @param type The type of tags to get.
+	 * @param predicate A predicate to filter the tags with.
+	 * @return TagRegistry from the given origin that are of the given type and that pass the filter.
+	 * @param <T> The class these tags apply to.
+	 */
+	public <T extends Keyed> Iterable<Tag<T>> getMatchingTags(TagOrigin origin, TagType<T> type, Predicate<Tag<T>> predicate) {
+		Iterator<Tag<T>> tagIterator = getTags(origin, type).iterator();
+		return new Iterable<>() {
+			@Override
+			public @NotNull Iterator<Tag<T>> iterator() {
+				return new CheckedIterator<>(tagIterator, predicate::test);
+			}
+		};
+	}
+
+	/**
+	 * Gets a specific tag of a specific origin that is of a specific type.
+	 * @param origin The origin to filter by.
+	 * @param type The type of tags to get.
+	 * @param key The key of the tag to get.
+	 * @return The tag that matched the above values. Null if no tag is found.
+	 * @param <T> The class these tags apply to.
+	 */
+	public <T extends Keyed> @Nullable Tag<T> getTag(TagOrigin origin, TagType<T> type, NamespacedKey key) {
+		Tag<T> tag;
+		for (TagSource<T> source : tagSourceMap.get(origin, type)) {
+			tag = source.getTag(key);
+			if (tag != null)
+				return tag;
+		}
+		return null;
+	}
+
+	/**
+	 * A MultiMap that maps TagTypes to multiple TagSources, matching generics.
+	 */
+	private static class TagSourceMap {
+
+		private final ArrayListMultimap<TagType<?>, TagSource<?>> map = ArrayListMultimap.create();
+
+		public <T extends Keyed> void put(TagType<T> key, TagSource<T> value) {
+			map.put(key, value);
+		}
+
+		public <T extends Keyed> @NotNull List<TagSource<T>> get(TagOrigin origin, TagType<T> key) {
+			List<TagSource<T>> sources = new ArrayList<>();
+			for (TagSource<?> source : map.get(key)) {
+				if (source.getOrigin().matches(origin))
+					//noinspection unchecked
+					sources.add((TagSource<T>) source);
+			}
+			return sources;
+		}
+
+		public <T extends Keyed> boolean containsKey(TagType<T> type) {
+			return map.containsKey(type);
+		}
+
+	}
+
+}
diff --git a/src/main/java/org/skriptlang/skript/bukkit/tags/TagType.java b/src/main/java/org/skriptlang/skript/bukkit/tags/TagType.java
new file mode 100644
index 00000000000..e0dc3aecfdb
--- /dev/null
+++ b/src/main/java/org/skriptlang/skript/bukkit/tags/TagType.java
@@ -0,0 +1,141 @@
+package org.skriptlang.skript.bukkit.tags;
+
+import ch.njol.skript.lang.Expression;
+import ch.njol.skript.lang.SkriptParser;
+import ch.njol.util.Kleenean;
+import org.bukkit.Keyed;
+import org.bukkit.Material;
+import org.bukkit.entity.EntityType;
+import org.jetbrains.annotations.Contract;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.UnmodifiableView;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * The type of a tag. Represents a category or context that the tags apply in.
+ * For example, {@link #ITEMS} tags apply to {@link Material}s, like {@link #BLOCKS}, but in item form rather than as
+ * placed blocks.
+ * <br>
+ * This class also contains a static registry of all tag types.
+ *
+ * @param <T> see type.
+ */
+public class TagType<T extends Keyed> {
+
+	private static final List<TagType<?>> REGISTERED_TAG_TYPES = Collections.synchronizedList(new ArrayList<>());
+
+	public static final TagType<Material> ITEMS = new TagType<>("item", Material.class);
+	public static final TagType<Material> BLOCKS = new TagType<>("block", Material.class);
+	public static final TagType<EntityType> ENTITIES = new TagType<>("entity [type]", "entity type", EntityType.class);
+
+	static {
+		TagType.addType(ITEMS, BLOCKS, ENTITIES);
+	}
+
+	private final String pattern;
+	private final String toString;
+	private final Class<T> type;
+
+	/**
+	 * @param pattern The pattern to use when constructing the selection Skript pattern.
+	 * @param type The class this tag type applies to.
+	 */
+	public TagType(String pattern, Class<T> type) {
+		this(pattern, pattern, type);
+	}
+
+	/**
+	 * @param pattern The pattern to use when constructing the selection Skript pattern.
+	 * @param toString The string to use when printing a toString.
+	 * @param type The class this tag type applies to.
+	 */
+	public TagType(String pattern, String toString, Class<T> type) {
+		this.pattern = pattern;
+		this.type = type;
+		this.toString = toString;
+	}
+
+	public String pattern() {
+		return pattern;
+	}
+
+	public Class<T> type() {
+		return type;
+	}
+
+	@Override
+	public String toString() {
+		return toString;
+	}
+
+	/**
+	 * Adds types to the registered tag types.
+	 * @param type The types to add.
+	 */
+	public static void addType(TagType<?>... type) {
+		REGISTERED_TAG_TYPES.addAll(List.of(type));
+	}
+
+	/**
+	 * @return An unmodifiable list of all the registered types.
+	 */
+	@Contract(pure = true)
+	public static @NotNull @UnmodifiableView List<TagType<?>> getTypes() {
+		return Collections.unmodifiableList(REGISTERED_TAG_TYPES);
+	}
+
+	/**
+	 * Gets tag types by index. If a negative value is used, gets all the tag types.
+	 * @param i The index of the type to get.
+	 * @return The type at that index, or all tags if index < 0.
+	 */
+	public static TagType<?> @NotNull [] getType(int i) {
+		if (i < 0)
+			return REGISTERED_TAG_TYPES.toArray(new TagType<?>[0]);
+		return new TagType[]{REGISTERED_TAG_TYPES.get(i)};
+	}
+
+	/**
+	 * Gets tag types by parser mark. Equivalent to {@code getType(i - 1)}.
+	 * @param i The index of the type to get.
+	 * @return The type at that index, or all tags if index < 0.
+	 * @see #getType(int)
+	 * @see #getFullPattern()
+	 */
+	public static TagType<?> @NotNull [] fromParseMark(int i) {
+		return getType(i - 1);
+	}
+
+	/**
+	 * @return Returns an optional choice pattern for use in Skript patterns. Contains parse marks.
+	 *			Pass the parse mark to {@link #fromParseMark(int)} to get the
+	 *			selected tag type in
+	 *			{@link ch.njol.skript.lang.SyntaxElement#init(Expression[], int, Kleenean, SkriptParser.ParseResult)}.
+	 */
+	public static @NotNull String getFullPattern() {
+		return getFullPattern(false);
+	}
+
+	/**
+	 * @param required whether the choice should be optional or required.
+	 * @return Returns a choice pattern for use in Skript patterns. Contains parse marks.
+	 *			Pass the parse mark to {@link #fromParseMark(int)} to get the
+	 *			selected tag type in
+	 *			{@link ch.njol.skript.lang.SyntaxElement#init(Expression[], int, Kleenean, SkriptParser.ParseResult)}.
+	 */
+	public static @NotNull String getFullPattern(boolean required) {
+		StringBuilder fullPattern = new StringBuilder(required ? "(" : "[");
+		int numRegistries = REGISTERED_TAG_TYPES.size();
+		for (int i = 0; i < numRegistries; i++) {
+			fullPattern.append(i + 1).append(":").append(REGISTERED_TAG_TYPES.get(i).pattern());
+			if (i + 1 != numRegistries)
+				fullPattern.append("|");
+		}
+		fullPattern.append(required ? ")" : "]");
+		return fullPattern.toString();
+	}
+
+}
diff --git a/src/main/java/org/skriptlang/skript/bukkit/tags/elements/CondIsTagged.java b/src/main/java/org/skriptlang/skript/bukkit/tags/elements/CondIsTagged.java
new file mode 100644
index 00000000000..3741bbb9d68
--- /dev/null
+++ b/src/main/java/org/skriptlang/skript/bukkit/tags/elements/CondIsTagged.java
@@ -0,0 +1,103 @@
+package org.skriptlang.skript.bukkit.tags.elements;
+
+import ch.njol.skript.aliases.ItemType;
+import ch.njol.skript.conditions.base.PropertyCondition;
+import ch.njol.skript.conditions.base.PropertyCondition.PropertyType;
+import ch.njol.skript.doc.Description;
+import ch.njol.skript.doc.Examples;
+import ch.njol.skript.doc.Keywords;
+import ch.njol.skript.doc.Name;
+import ch.njol.skript.doc.Since;
+import ch.njol.skript.lang.Condition;
+import ch.njol.skript.lang.Expression;
+import ch.njol.skript.lang.SkriptParser.ParseResult;
+import ch.njol.util.Kleenean;
+import org.bukkit.Keyed;
+import org.bukkit.Tag;
+import org.bukkit.event.Event;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+import org.skriptlang.skript.bukkit.tags.TagModule;
+
+@Name("Is Tagged")
+@Description({
+	"Checks whether an item, block, entity, or entitydata is tagged with the given tag."
+})
+@Examples({
+	"if player's tool is tagged with minecraft tag \"enchantable/sharp_weapon\":",
+		"\tenchant player's tool with sharpness 1",
+	"",
+	"if all logs are tagged with tag \"minecraft:logs\""
+})
+@Since("2.10")
+@Keywords({"blocks", "minecraft tag", "type", "category"})
+public class CondIsTagged extends Condition {
+
+	static {
+		PropertyCondition.register(CondIsTagged.class, PropertyCondition.PropertyType.BE,
+				"tagged (as|with) %minecrafttags%",
+				"itemtypes/entities/entitydatas");
+	}
+
+	private Expression<Tag<Keyed>> tags;
+	private Expression<?> elements;
+
+	@Override
+	public boolean init(Expression<?>[] expressions, int matchedPattern, Kleenean isDelayed, ParseResult parseResult) {
+		this.elements = expressions[0];
+		//noinspection unchecked
+		this.tags = (Expression<Tag<Keyed>>) expressions[1];
+		setNegated(matchedPattern == 1);
+		return true;
+	}
+
+	@Override
+	public boolean check(Event event) {
+		Tag<Keyed>[] tags = this.tags.getArray(event);
+		if (tags.length == 0)
+			return isNegated();
+		boolean and = this.tags.getAnd();
+ 		return elements.check(event, element -> {
+			boolean isAny = (element instanceof ItemType itemType && !itemType.isAll());
+			Keyed[] values = TagModule.getKeyed(element);
+			if (values == null)
+				return false;
+
+			for (Tag<Keyed> tag : tags) {
+				 if (isTagged(tag, values, !isAny)) {
+					 if (!and)
+						 return true;
+				 } else if (and) {
+					 return false;
+				 }
+			 }
+			return and;
+		}, isNegated());
+	}
+
+	/**
+	 * Helper method for checking if a series of values have a tag.
+	 * @param tag The tag to check for.
+	 * @param values The values to check against.
+	 * @param allTagged Whether all values need to have the tag (true), or just one (false).
+	 * @return Whether the values are tagged with the tag.
+	 */
+	private boolean isTagged(Tag<Keyed> tag, Keyed @NotNull [] values, boolean allTagged) {
+		for (Keyed value : values) {
+			if (tag.isTagged(value)) {
+				if (!allTagged)
+					return true;
+			} else if (allTagged) {
+				return false;
+			}
+		}
+		return allTagged;
+	}
+
+	@Override
+	public String toString(@Nullable Event event, boolean debug) {
+		return PropertyCondition.toString(this, PropertyType.BE, event, debug, elements,
+				" tagged as " + tags.toString(event, debug));
+	}
+
+}
diff --git a/src/main/java/org/skriptlang/skript/bukkit/tags/elements/EffRegisterTag.java b/src/main/java/org/skriptlang/skript/bukkit/tags/elements/EffRegisterTag.java
new file mode 100644
index 00000000000..b32a954fd03
--- /dev/null
+++ b/src/main/java/org/skriptlang/skript/bukkit/tags/elements/EffRegisterTag.java
@@ -0,0 +1,167 @@
+package org.skriptlang.skript.bukkit.tags.elements;
+
+import ch.njol.skript.Skript;
+import ch.njol.skript.aliases.ItemType;
+import ch.njol.skript.doc.Description;
+import ch.njol.skript.doc.Examples;
+import ch.njol.skript.doc.Keywords;
+import ch.njol.skript.doc.Name;
+import ch.njol.skript.doc.Since;
+import ch.njol.skript.lang.Effect;
+import ch.njol.skript.lang.Expression;
+import ch.njol.skript.lang.Literal;
+import ch.njol.skript.lang.SkriptParser.ParseResult;
+import ch.njol.skript.lang.SyntaxStringBuilder;
+import ch.njol.util.Kleenean;
+import org.bukkit.Keyed;
+import org.bukkit.Material;
+import org.bukkit.NamespacedKey;
+import org.bukkit.Tag;
+import org.bukkit.entity.EntityType;
+import org.bukkit.event.Event;
+import org.jetbrains.annotations.Contract;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+import org.skriptlang.skript.bukkit.tags.SkriptTag;
+import org.skriptlang.skript.bukkit.tags.TagModule;
+import org.skriptlang.skript.bukkit.tags.TagType;
+import org.skriptlang.skript.bukkit.tags.sources.SkriptTagSource;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.ThreadLocalRandom;
+import java.util.regex.Pattern;
+
+@Name("Register Tag")
+@Description({
+	"Registers a new tag containing either items or entity datas. Note that items will NOT keep any information other " +
+	"than their type, so adding `diamond sword named \"test\"` to a tag is the same as adding `diamond sword`",
+	"Item tags should be used for contexts where the item is not placed down, while block tags should be used " +
+	"for contexts where the item is placed. For example, and item tag could be \"skript:edible\", " +
+	"while a block tag would be \"skript:needs_water_above\".",
+	"All custom tags will be given the namespace \"skript\", followed by the name you give it. The name must only " +
+	"include the characters A to Z, 0 to 9, and '/', '.', '_', and '-'. Otherwise, the tag will not register.",
+	"",
+	"Please note that two tags can share a name if they are of different types. Registering a new tag of the same " +
+	"name and type will overwrite the existing tag. Tags will reset on server shutdown."
+})
+@Examples({
+	"register a new custom entity tag named \"fish\" using cod, salmon, tropical fish, and pufferfish",
+	"register an item tag named \"skript:wasp_weapons/swords\" containing diamond sword and netherite sword",
+	"register block tag named \"pokey\" containing sweet berry bush and bamboo sapling",
+	"",
+	"on player move:",
+		"\tblock at player is tagged as tag \"skript:pokey\"",
+		"\tdamage the player by 1 heart"
+})
+@Since("2.10")
+@Keywords({"blocks", "minecraft tag", "type", "category"})
+public class EffRegisterTag extends Effect {
+
+	private static final Pattern KEY_PATTERN = Pattern.compile("[a-zA-Z0-9/._-]+");
+
+	static {
+		Skript.registerEffect(EffRegisterTag.class,
+				"register [a[n]] [custom] " + TagType.getFullPattern(true) +
+					" tag named %string% (containing|using) %entitydatas/itemtypes%");
+	}
+
+	private Expression<String> name;
+	private Expression<?> contents;
+	private TagType<?> type;
+
+	@Override
+	public boolean init(Expression<?>[] expressions, int matchedPattern, Kleenean isDelayed, ParseResult parseResult) {
+		//noinspection unchecked
+		name = (Expression<String>) expressions[0];
+		if (name instanceof Literal<String> literal) {
+			String key = removeSkriptNamespace(literal.getSingle());
+			if (!KEY_PATTERN.matcher(key).matches()) {
+				Skript.error("Tag names can only contain the following characters: letters, numbers, and some symbols: " +
+						"'/', '.', '_', and '-'");
+				return false;
+			}
+		}
+
+		contents = expressions[1];
+		type = TagType.getType(parseResult.mark - 1)[0];
+		return true;
+	}
+
+	@Override
+	protected void execute(Event event) {
+		String name = this.name.getSingle(event);
+		if (name == null)
+			return;
+
+		name = removeSkriptNamespace(name);
+
+		if (!KEY_PATTERN.matcher(name).matches())
+			return;
+
+		NamespacedKey key = new NamespacedKey(Skript.getInstance(), name);
+
+		Object[] contents = this.contents.getArray(event);
+		if (contents.length == 0)
+			return;
+
+
+		if (this.type.type() == Material.class) {
+			Tag<Material> tag = getMaterialTag(key, contents);
+			if (this.type == TagType.ITEMS) {
+				SkriptTagSource.ITEMS().addTag(tag);
+			} else if (this.type == TagType.BLOCKS) {
+				SkriptTagSource.BLOCKS().addTag(tag);
+			}
+
+		} else if (this.type.type() == EntityType.class) {
+			Tag<EntityType> tag = getEntityTag(key, contents);
+			SkriptTagSource.ENTITIES().addTag(tag);
+		}
+	}
+
+	private static @NotNull String removeSkriptNamespace(@NotNull String key) {
+		if (key.startsWith("skript:"))
+			key = key.substring(7);
+		return key;
+	}
+
+	@Contract("_, _ -> new")
+	private @NotNull Tag<Material> getMaterialTag(NamespacedKey key, Object @NotNull [] contents) {
+		ThreadLocalRandom random = ThreadLocalRandom.current();
+		List<Material> tagContents = new ArrayList<>();
+		for (Object object : contents) {
+			Keyed[] values = TagModule.getKeyed(object);
+			if (object instanceof ItemType itemType && !itemType.isAll()) {
+				// add random
+				tagContents.add((Material) values[random.nextInt(0, values.length)]);
+			} else {
+				for (Keyed value : values) {
+					if (value instanceof Material material)
+						tagContents.add(material);
+				}
+			}
+		}
+		return new SkriptTag<>(key, tagContents);
+	}
+
+	@Contract("_, _ -> new")
+	private @NotNull Tag<EntityType> getEntityTag(NamespacedKey key, Object @NotNull [] contents) {
+		List<EntityType> tagContents = new ArrayList<>();
+		for (Object object : contents) {
+			for (Keyed value : TagModule.getKeyed(object)) {
+				if (value instanceof EntityType entityType)
+					tagContents.add(entityType);
+			}
+		}
+		return new SkriptTag<>(key, tagContents);
+	}
+
+	@Override
+	public String toString(@Nullable Event event, boolean debug) {
+		return new SyntaxStringBuilder(event, debug)
+			.append("register a new", type.toString(), "tag named", name, "containing", contents)
+			.toString();
+	}
+
+}
diff --git a/src/main/java/org/skriptlang/skript/bukkit/tags/elements/ExprTag.java b/src/main/java/org/skriptlang/skript/bukkit/tags/elements/ExprTag.java
new file mode 100644
index 00000000000..8c990e6b85e
--- /dev/null
+++ b/src/main/java/org/skriptlang/skript/bukkit/tags/elements/ExprTag.java
@@ -0,0 +1,138 @@
+package org.skriptlang.skript.bukkit.tags.elements;
+
+import ch.njol.skript.Skript;
+import ch.njol.skript.doc.Description;
+import ch.njol.skript.doc.Examples;
+import ch.njol.skript.doc.Keywords;
+import ch.njol.skript.doc.Name;
+import ch.njol.skript.doc.RequiredPlugins;
+import ch.njol.skript.doc.Since;
+import ch.njol.skript.lang.Expression;
+import ch.njol.skript.lang.ExpressionType;
+import ch.njol.skript.lang.Literal;
+import ch.njol.skript.lang.SkriptParser.ParseResult;
+import ch.njol.skript.lang.util.ContextlessEvent;
+import ch.njol.skript.lang.util.SimpleExpression;
+import ch.njol.skript.lang.util.SimpleLiteral;
+import ch.njol.util.Kleenean;
+import org.bukkit.NamespacedKey;
+import org.bukkit.Tag;
+import org.bukkit.event.Event;
+import org.jetbrains.annotations.Nullable;
+import org.skriptlang.skript.bukkit.tags.TagModule;
+import org.skriptlang.skript.bukkit.tags.TagType;
+import org.skriptlang.skript.bukkit.tags.sources.TagOrigin;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Name("Tag")
+@Description({
+		"Represents a tag which can be used to classify items, blocks, or entities.",
+		"Tags are composed of a value and an optional namespace: \"minecraft:oak_logs\".",
+		"If you omit the namespace, one will be provided for you, depending on what kind of tag you're using. " +
+		"For example, `tag \"doors\"` will be the tag \"minecraft:doors\", " +
+		"while `paper tag \"doors\"` will be \"paper:doors\".",
+		"`minecraft tag` will search through the vanilla tags, `datapack tag` will search for datapack-provided tags " +
+		"(a namespace is required here!), `paper tag` will search for Paper's custom tags if you are running Paper, " +
+		"and `custom tag` will look in the \"skript\" namespace for custom tags you've registered.",
+		"You can also filter by tag types using \"item\", \"block\", or \"entity\"."
+})
+@Examples({
+		"minecraft tag \"dirt\" # minecraft:dirt",
+		"paper tag \"doors\" # paper:doors",
+		"tag \"skript:custom_dirt\" # skript:custom_dirt",
+		"custom tag \"dirt\" # skript:dirt",
+		"datapack block tag \"dirt\" # minecraft:dirt",
+		"datapack tag \"my_pack:custom_dirt\" # my_pack:custom_dirt",
+		"tag \"minecraft:mineable/pickaxe\" # minecraft:mineable/pickaxe",
+		"custom item tag \"blood_magic_sk/can_sacrifice_with\" # skript:blood_magic_sk/can_sacrifice_with"
+})
+@Since("2.10")
+@RequiredPlugins("Paper (paper tags)")
+@Keywords({"blocks", "minecraft tag", "type", "category"})
+public class ExprTag extends SimpleExpression<Tag> {
+
+	static {
+		Skript.registerExpression(ExprTag.class, Tag.class, ExpressionType.COMBINED,
+				TagOrigin.getFullPattern() + " " + TagType.getFullPattern() + " tag %strings%");
+	}
+
+	private Expression<String> names;
+	TagType<?>[] types;
+	private TagOrigin origin;
+	private boolean datapackOnly;
+
+	@Override
+	public boolean init(Expression<?>[] expressions, int matchedPattern, Kleenean isDelayed, ParseResult parseResult) {
+		//noinspection unchecked
+		names = (Expression<String>) expressions[0];
+		types = TagType.fromParseMark(parseResult.mark);
+		origin = TagOrigin.fromParseTags(parseResult.tags);
+		datapackOnly = origin == TagOrigin.BUKKIT && parseResult.hasTag("datapack");
+		return true;
+	}
+
+	@Override
+	protected Tag<?> @Nullable [] get(Event event) {
+		String[] names = this.names.getArray(event);
+		List<Tag<?>> tags = new ArrayList<>();
+
+		String namespace = switch (origin) {
+			case ANY, BUKKIT -> "minecraft";
+			case PAPER -> "paper";
+			case SKRIPT -> "skript";
+		};
+
+		nextName: for (String name : names) {
+			// get key
+			NamespacedKey key;
+			if (name.contains(":")) {
+				key = NamespacedKey.fromString(name);
+			} else {
+				// populate namespace if not provided
+				key = new NamespacedKey(namespace, name);
+			}
+			if (key == null)
+				continue;
+
+			Tag<?> tag;
+			for (TagType<?> type : types) {
+				tag = TagModule.tagRegistry.getTag(origin, type, key);
+				if (tag != null
+					// ensures that only datapack/minecraft tags are sent when specifically requested
+					&& (origin != TagOrigin.BUKKIT || (datapackOnly ^ tag.getKey().getNamespace().equals("minecraft")))
+				) {
+					tags.add(tag);
+					continue nextName; // ensure 1:1
+				}
+			}
+		}
+		return tags.toArray(new Tag[0]);
+	}
+
+	@Override
+	public boolean isSingle() {
+		return names.isSingle();
+	}
+
+	@Override
+	@SuppressWarnings("rawtypes")
+	public Class<? extends Tag> getReturnType() {
+		return Tag.class;
+	}
+
+	@Override
+	public String toString(@Nullable Event event, boolean debug) {
+		String registry = types.length > 1 ? "" : " " + types[0].toString();
+		return origin.toString(datapackOnly) + registry + " tag " + names.toString(event, debug);
+	}
+
+	@Override
+	public Expression<? extends Tag> simplify() {
+		if (names instanceof Literal<String>)
+			return new SimpleLiteral<>(getArray(ContextlessEvent.get()), Tag.class, true);
+		return super.simplify();
+	}
+
+}
diff --git a/src/main/java/org/skriptlang/skript/bukkit/tags/elements/ExprTagContents.java b/src/main/java/org/skriptlang/skript/bukkit/tags/elements/ExprTagContents.java
new file mode 100644
index 00000000000..422e4a2e805
--- /dev/null
+++ b/src/main/java/org/skriptlang/skript/bukkit/tags/elements/ExprTagContents.java
@@ -0,0 +1,144 @@
+package org.skriptlang.skript.bukkit.tags.elements;
+
+import ch.njol.skript.Skript;
+import ch.njol.skript.aliases.ItemType;
+import ch.njol.skript.bukkitutil.EntityUtils;
+import ch.njol.skript.doc.Description;
+import ch.njol.skript.doc.Examples;
+import ch.njol.skript.doc.Keywords;
+import ch.njol.skript.doc.Name;
+import ch.njol.skript.doc.Since;
+import ch.njol.skript.entity.EntityData;
+import ch.njol.skript.lang.Expression;
+import ch.njol.skript.lang.ExpressionType;
+import ch.njol.skript.lang.Literal;
+import ch.njol.skript.lang.SkriptParser.ParseResult;
+import ch.njol.skript.lang.util.ContextlessEvent;
+import ch.njol.skript.lang.util.SimpleExpression;
+import ch.njol.skript.lang.util.SimpleLiteral;
+import ch.njol.skript.registrations.Classes;
+import ch.njol.util.Kleenean;
+import org.bukkit.Material;
+import org.bukkit.Tag;
+import org.bukkit.entity.EntityType;
+import org.bukkit.event.Event;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+import org.skriptlang.skript.bukkit.tags.TagType;
+
+import java.lang.reflect.Array;
+import java.util.Objects;
+import java.util.stream.Stream;
+
+@Name("Tags Contents")
+@Description({
+		"Returns all the values that a tag contains.",
+		"For item and block tags, this will return items. For entity tags, " +
+		"it will return entity datas (a creeper, a zombie)."
+})
+@Examples({
+		"broadcast tag values of minecraft tag \"dirt\"",
+		"broadcast (first element of player's tool's block tags)'s tag contents"
+})
+@Since("2.10")
+@Keywords({"blocks", "minecraft tag", "type", "category"})
+public class ExprTagContents extends SimpleExpression<Object> {
+
+	static {
+		Skript.registerExpression(ExprTagContents.class, Object.class, ExpressionType.PROPERTY,
+				"[the] tag (contents|values) of %minecrafttag%",
+				"%minecrafttag%'[s] tag (contents|values)");
+	}
+
+	private Expression<Tag<?>> tag;
+
+	private Class<?> returnType;
+	private Class<?>[] possibleReturnTypes;
+
+	@Override
+	public boolean init(Expression<?> @NotNull [] expressions, int matchedPattern, Kleenean isDelayed, ParseResult parseResult) {
+		//noinspection unchecked
+		tag = (Expression<Tag<?>>) expressions[0];
+
+		TagType<?>[] tagTypes = null;
+		if (expressions[0] instanceof ExprTag exprTag) {
+			tagTypes = exprTag.types;
+		} else if (expressions[0] instanceof ExprTagsOf exprTagsOf) {
+			tagTypes = exprTagsOf.types;
+		} else if (expressions[0] instanceof ExprTagsOfType exprTagsOfType) {
+			tagTypes = exprTagsOfType.types;
+		}
+		if (tagTypes != null) { // try to determine the return type
+			possibleReturnTypes = new Class<?>[tagTypes.length];
+			for (int i = 0; i < tagTypes.length; i++) {
+				Class<?> type = tagTypes[i].type();
+				// map types
+				if (type == Material.class) {
+					type = ItemType.class;
+				} else if (type == EntityType.class) {
+					type = EntityData.class;
+				}
+				possibleReturnTypes[i] = type;
+			}
+			returnType = Classes.getSuperClassInfo(possibleReturnTypes).getC();
+		} else {
+			returnType = Object.class;
+			possibleReturnTypes = new Class<?>[]{returnType};
+		}
+
+		return true;
+	}
+
+	@Override
+	@SuppressWarnings({"unchecked", "rawtypes", "RedundantCast"}) // cast to avoid type issues
+	protected Object @Nullable [] get(Event event) {
+		return ((Stream) stream(event)).toArray(length -> Array.newInstance(getReturnType(), length));
+	}
+
+	@Override
+	public Stream<?> stream(Event event) {
+		Tag<?> tag = this.tag.getSingle(event);
+		if (tag == null)
+			return Stream.empty();
+		return tag.getValues().stream()
+			.map(value -> {
+				if (value instanceof Material material) {
+					return new ItemType(material);
+				} else if (value instanceof EntityType entityType) {
+					return EntityUtils.toSkriptEntityData(entityType);
+				}
+				return null;
+			})
+			.filter(Objects::nonNull);
+	}
+
+	@Override
+	public boolean isSingle() {
+		return false;
+	}
+
+	@Override
+	public Class<?> getReturnType() {
+		return returnType;
+	}
+
+	@Override
+	public Class<?>[] possibleReturnTypes() {
+		return possibleReturnTypes;
+	}
+
+	@Override
+	public String toString(@Nullable Event event, boolean debug) {
+		return "the tag contents of " + tag.toString(event, debug);
+	}
+
+	@Override
+	public Expression<?> simplify() {
+		if (tag instanceof Literal<Tag<?>>) {
+			Object[] values = getArray(ContextlessEvent.get());
+			return new SimpleLiteral(values, values.getClass().getComponentType(), true);
+		}
+		return super.simplify();
+	}
+
+}
diff --git a/src/main/java/org/skriptlang/skript/bukkit/tags/elements/ExprTagKey.java b/src/main/java/org/skriptlang/skript/bukkit/tags/elements/ExprTagKey.java
new file mode 100644
index 00000000000..c8ee8694874
--- /dev/null
+++ b/src/main/java/org/skriptlang/skript/bukkit/tags/elements/ExprTagKey.java
@@ -0,0 +1,45 @@
+package org.skriptlang.skript.bukkit.tags.elements;
+
+import ch.njol.skript.doc.Description;
+import ch.njol.skript.doc.Examples;
+import ch.njol.skript.doc.Keywords;
+import ch.njol.skript.doc.Name;
+import ch.njol.skript.doc.Since;
+import ch.njol.skript.expressions.base.SimplePropertyExpression;
+import org.bukkit.Tag;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+// TODO: adapt to generic expression after Any X is merged
+
+@Name("Tag Namespaced Key")
+@Description("The namespaced key of a minecraft tag. This takes the form of \"namespace:key\", e.g. \"minecraft:dirt\".")
+@Examples({
+	"broadcast namespaced keys of the tags of player's tool",
+	"if the key of {_my-tag} is \"minecraft:stone\":",
+		"\treturn true"
+})
+@Since("2.10")
+@Keywords({"minecraft tag", "type", "key", "namespace"})
+public class ExprTagKey extends SimplePropertyExpression<Tag<?>, String> {
+
+	static {
+		register(ExprTagKey.class, String.class, "[namespace[d]] key[s]", "minecrafttags");
+	}
+
+	@Override
+	public @Nullable String convert(@NotNull Tag<?> from) {
+		return from.getKey().toString();
+	}
+
+	@Override
+	protected String getPropertyName() {
+		return "namespaced key";
+	}
+
+	@Override
+	public Class<String> getReturnType() {
+		return String.class;
+	}
+
+}
diff --git a/src/main/java/org/skriptlang/skript/bukkit/tags/elements/ExprTagsOf.java b/src/main/java/org/skriptlang/skript/bukkit/tags/elements/ExprTagsOf.java
new file mode 100644
index 00000000000..8ddc46e4e9c
--- /dev/null
+++ b/src/main/java/org/skriptlang/skript/bukkit/tags/elements/ExprTagsOf.java
@@ -0,0 +1,129 @@
+package org.skriptlang.skript.bukkit.tags.elements;
+
+import ch.njol.skript.Skript;
+import ch.njol.skript.aliases.ItemType;
+import ch.njol.skript.doc.Description;
+import ch.njol.skript.doc.Examples;
+import ch.njol.skript.doc.Keywords;
+import ch.njol.skript.doc.Name;
+import ch.njol.skript.doc.RequiredPlugins;
+import ch.njol.skript.doc.Since;
+import ch.njol.skript.expressions.base.PropertyExpression;
+import ch.njol.skript.lang.Expression;
+import ch.njol.skript.lang.ExpressionType;
+import ch.njol.skript.lang.SkriptParser.ParseResult;
+import ch.njol.util.Kleenean;
+import org.bukkit.Keyed;
+import org.bukkit.Tag;
+import org.bukkit.event.Event;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+import org.skriptlang.skript.bukkit.tags.TagModule;
+import org.skriptlang.skript.bukkit.tags.TagType;
+import org.skriptlang.skript.bukkit.tags.sources.TagOrigin;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Set;
+import java.util.TreeSet;
+import java.util.concurrent.ThreadLocalRandom;
+
+@Name("Tags of X")
+@Description({
+	"Returns all the tags of an item, block, or entity.",
+	"`minecraft tag` will return only the vanilla tags, `datapack tag` will return only datapack-provided tags, " +
+	"`paper tag` will return only Paper's custom tags (if you are running Paper), " +
+	"and `custom tag` will look in the \"skript\" namespace for custom tags you've registered.",
+	"You can also filter by tag types using \"item\", \"block\", or \"entity\"."
+})
+@Examples({
+	"broadcast minecraft tags of dirt",
+	"send true if paper item tags of target block contains paper tag \"doors\"",
+	"broadcast the block tags of player's tool"
+})
+@Since("2.10")
+@RequiredPlugins("Paper (paper tags)")
+@Keywords({"blocks", "minecraft tag", "type", "category"})
+public class ExprTagsOf extends PropertyExpression<Object, Tag> {
+
+	static {
+		Skript.registerExpression(ExprTagsOf.class, Tag.class, ExpressionType.PROPERTY,
+				"[all [[of] the]|the] " + TagOrigin.getFullPattern() + " " + TagType.getFullPattern() + " tags of %itemtype/entity/entitydata%",
+				"%itemtype/entity/entitydata%'[s] " + TagOrigin.getFullPattern() + " " + TagType.getFullPattern() + " tags");
+	}
+
+	TagType<?>[] types;
+	TagOrigin origin;
+	boolean datapackOnly;
+
+	@Override
+	public boolean init(Expression<?>[] expressions, int matchedPattern, Kleenean isDelayed, ParseResult parseResult) {
+		this.setExpr(expressions[0]);
+		types = TagType.fromParseMark(parseResult.mark);
+		origin = TagOrigin.fromParseTags(parseResult.tags);
+		datapackOnly = origin == TagOrigin.BUKKIT && parseResult.hasTag("datapack");
+		return true;
+	}
+
+	@Override
+	protected Tag<?> @Nullable [] get(Event event, Object @NotNull [] source) {
+		if (source.length == 0)
+			return null;
+		boolean isAny = (source[0] instanceof ItemType itemType && !itemType.isAll());
+		Keyed[] values = TagModule.getKeyed(source[0]);
+		if (values == null)
+			return null;
+		// choose single material if it's something like `any log`
+		if (isAny) {
+			ThreadLocalRandom random = ThreadLocalRandom.current();
+			values = new Keyed[]{values[random.nextInt(0, values.length)]};
+		}
+
+		Set<Tag<?>> tags = new TreeSet<>(Comparator.comparing(Keyed::key));
+		for (Keyed value : values) {
+			tags.addAll(getTags(value));
+		}
+
+		return tags.stream()
+				.filter(tag ->
+					// ensures that only datapack/minecraft tags are sent when specifically requested
+					(origin != TagOrigin.BUKKIT || (datapackOnly ^ tag.getKey().getNamespace().equals("minecraft"))))
+				.toArray(Tag[]::new);
+	}
+
+	/**
+	 * Helper method for getting the tags of a value.
+	 * @param value The value to get the tags of.
+	 * @return The tags the value is a part of.
+	 * @param <T> The type of the value.
+	 */
+	public <T extends Keyed> Collection<Tag<T>> getTags(@NotNull T value) {
+		List<Tag<T>> tags = new ArrayList<>();
+		//noinspection unchecked
+		Class<T> clazz = (Class<T>) value.getClass();
+		for (Tag<T> tag : TagModule.tagRegistry.getTags(origin, clazz, types)) {
+			if (tag.isTagged(value))
+				tags.add(tag);
+		}
+		return tags;
+	}
+
+	@Override
+	public boolean isSingle() {
+		return false;
+	}
+
+	@Override
+	public Class<Tag> getReturnType() {
+		return Tag.class;
+	}
+
+	@Override
+	public String toString(@Nullable Event event, boolean debug) {
+		String registry = types.length > 1 ? "" : " " + types[0].toString();
+		return  origin.toString(datapackOnly) + registry + " tags of " + getExpr().toString(event, debug);
+	}
+
+}
diff --git a/src/main/java/org/skriptlang/skript/bukkit/tags/elements/ExprTagsOfType.java b/src/main/java/org/skriptlang/skript/bukkit/tags/elements/ExprTagsOfType.java
new file mode 100644
index 00000000000..271fbd59979
--- /dev/null
+++ b/src/main/java/org/skriptlang/skript/bukkit/tags/elements/ExprTagsOfType.java
@@ -0,0 +1,92 @@
+package org.skriptlang.skript.bukkit.tags.elements;
+
+import ch.njol.skript.Skript;
+import ch.njol.skript.doc.Description;
+import ch.njol.skript.doc.Examples;
+import ch.njol.skript.doc.Keywords;
+import ch.njol.skript.doc.Name;
+import ch.njol.skript.doc.RequiredPlugins;
+import ch.njol.skript.doc.Since;
+import ch.njol.skript.lang.Expression;
+import ch.njol.skript.lang.ExpressionType;
+import ch.njol.skript.lang.SkriptParser.ParseResult;
+import ch.njol.skript.lang.util.SimpleExpression;
+import ch.njol.util.Kleenean;
+import org.bukkit.Keyed;
+import org.bukkit.NamespacedKey;
+import org.bukkit.Tag;
+import org.bukkit.event.Event;
+import org.jetbrains.annotations.Nullable;
+import org.skriptlang.skript.bukkit.tags.TagModule;
+import org.skriptlang.skript.bukkit.tags.TagType;
+import org.skriptlang.skript.bukkit.tags.sources.TagOrigin;
+
+import java.util.Comparator;
+import java.util.Set;
+import java.util.TreeSet;
+
+@Name("All Tags of a Type")
+@Description({
+	"Returns all the tags.",
+	"`minecraft tag` will return only the vanilla tags, `datapack tag` will return only datapack-provided tags, " +
+		"`paper tag` will return only Paper's custom tags (if you are running Paper), " +
+		"and `custom tag` will look in the \"skript\" namespace for custom tags you've registered.",
+	"You can also filter by tag types using \"item\", \"block\", or \"entity\"."
+})
+@Examples({
+	"broadcast minecraft tags",
+	"send paper entity tags",
+	"broadcast all block tags"
+})
+@Since("2.10")
+@RequiredPlugins("Paper (paper tags)")
+@Keywords({"blocks", "minecraft tag", "type", "category"})
+public class ExprTagsOfType extends SimpleExpression<Tag> {
+
+	static {
+		Skript.registerExpression(ExprTagsOfType.class, Tag.class, ExpressionType.SIMPLE,
+				"[all [[of] the]|the] " + TagOrigin.getFullPattern() + " " + TagType.getFullPattern() + " tags");
+	}
+
+	TagType<?>[] types;
+	private TagOrigin origin;
+	private boolean datapackOnly;
+
+	@Override
+	public boolean init(Expression<?>[] expressions, int matchedPattern, Kleenean isDelayed, ParseResult parseResult) {
+		types = TagType.fromParseMark(parseResult.mark);
+		origin = TagOrigin.fromParseTags(parseResult.tags);
+		datapackOnly = origin == TagOrigin.BUKKIT && parseResult.hasTag("datapack");
+		return true;
+	}
+
+	@Override
+	protected Tag<?> @Nullable [] get(Event event) {
+		Set<Tag<?>> tags = new TreeSet<>(Comparator.comparing(Keyed::key));
+		for (TagType<?> type : types) {
+			for (Tag<?> tag : TagModule.tagRegistry.getMatchingTags(origin, type,
+				tag -> (origin != TagOrigin.BUKKIT || (datapackOnly ^ tag.getKey().getNamespace().equals(NamespacedKey.MINECRAFT))))
+			) {
+				tags.add(tag);
+			}
+		}
+		return tags.toArray(new Tag[0]);
+	}
+
+	@Override
+	public boolean isSingle() {
+		return false;
+	}
+
+	@Override
+	public Class<Tag> getReturnType() {
+		return Tag.class;
+	}
+
+	@Override
+	public String toString(@Nullable Event event, boolean debug) {
+		String registry = types.length > 1 ? "" : " " + types[0].toString();
+		return "all of the " + origin.toString(datapackOnly) + registry + " tags";
+	}
+
+}
diff --git a/src/main/java/org/skriptlang/skript/bukkit/tags/sources/BukkitTagSource.java b/src/main/java/org/skriptlang/skript/bukkit/tags/sources/BukkitTagSource.java
new file mode 100644
index 00000000000..ccf74ce6bd0
--- /dev/null
+++ b/src/main/java/org/skriptlang/skript/bukkit/tags/sources/BukkitTagSource.java
@@ -0,0 +1,38 @@
+package org.skriptlang.skript.bukkit.tags.sources;
+
+import org.bukkit.Bukkit;
+import org.bukkit.Keyed;
+import org.bukkit.NamespacedKey;
+import org.bukkit.Tag;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+import org.skriptlang.skript.bukkit.tags.TagType;
+
+/**
+ * A set of tags provided by Bukkit.
+ * @param <T> The class of the tags of this source.
+ */
+public class BukkitTagSource<T extends Keyed> extends TagSource<T> {
+
+	private final String registry;
+
+	/**
+	 * @param registry The name of the registry to use. For example, {@link Tag#REGISTRY_ITEMS}.
+	 * @param type The type of tag this represents. To continue the example, {@link TagType#ITEMS}.
+	 */
+	public BukkitTagSource(String registry, TagType<T> type) {
+		super(TagOrigin.BUKKIT, type);
+		this.registry = registry;
+	}
+
+	@Override
+	public @NotNull Iterable<Tag<T>> getAllTags() {
+		return Bukkit.getTags(registry, getTypes()[0].type());
+	}
+
+	@Override
+	public @Nullable Tag<T> getTag(NamespacedKey key) {
+		return Bukkit.getTag(registry, key, getTypes()[0].type());
+	}
+
+}
diff --git a/src/main/java/org/skriptlang/skript/bukkit/tags/sources/CustomTagSource.java b/src/main/java/org/skriptlang/skript/bukkit/tags/sources/CustomTagSource.java
new file mode 100644
index 00000000000..364621734ef
--- /dev/null
+++ b/src/main/java/org/skriptlang/skript/bukkit/tags/sources/CustomTagSource.java
@@ -0,0 +1,46 @@
+package org.skriptlang.skript.bukkit.tags.sources;
+
+import org.bukkit.Keyed;
+import org.bukkit.NamespacedKey;
+import org.bukkit.Tag;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+import org.skriptlang.skript.bukkit.tags.TagType;
+
+import java.util.Collections;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+/**
+ * A custom source of tags that stores its own tags.
+ * @param <T> The class of the tags provided by this source.
+ */
+public sealed class CustomTagSource<T extends Keyed> extends TagSource<T> permits PaperTagSource, SkriptTagSource {
+
+	final Map<NamespacedKey, Tag<T>> tags;
+
+	/**
+	 * @param origin The origin of this source.
+	 * @param tags The tags this source will own.
+	 * @param types The tag types this source will represent.
+	 */
+	@SafeVarargs
+	CustomTagSource(TagOrigin origin, @NotNull Iterable<Tag<T>> tags, TagType<T>... types) {
+		super(origin, types);
+		this.tags = new ConcurrentHashMap<>();
+		for (Tag<T> tag : tags) {
+			this.tags.put(tag.getKey(), tag);
+		}
+	}
+
+	@Override
+	public Iterable<Tag<T>> getAllTags() {
+		return Collections.unmodifiableCollection(tags.values());
+	}
+
+	@Override
+	public @Nullable Tag<T> getTag(NamespacedKey key) {
+		return tags.get(key);
+	}
+
+}
diff --git a/src/main/java/org/skriptlang/skript/bukkit/tags/sources/PaperTagSource.java b/src/main/java/org/skriptlang/skript/bukkit/tags/sources/PaperTagSource.java
new file mode 100644
index 00000000000..1a7bbb58624
--- /dev/null
+++ b/src/main/java/org/skriptlang/skript/bukkit/tags/sources/PaperTagSource.java
@@ -0,0 +1,73 @@
+package org.skriptlang.skript.bukkit.tags.sources;
+
+import org.bukkit.Keyed;
+import org.bukkit.NamespacedKey;
+import org.bukkit.Tag;
+import org.jetbrains.annotations.NotNull;
+import org.skriptlang.skript.bukkit.tags.TagType;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+
+/**
+ * A set of tags provided by Paper.
+ * @param <T> The class of tag this source provides.
+ */
+public final class PaperTagSource<T extends Keyed> extends CustomTagSource<T> {
+
+	/**
+	 * Creates {@link PaperTag}s from the raw tags. Removes _settag.
+	 * @param tags The raw tags provided by Paper.
+	 * @return The modified tags with _settag removed from their keys.
+	 * @param <T> The class of the tags.
+	 */
+	private static <T extends Keyed> @NotNull Iterable<Tag<T>> getPaperTags(@NotNull Iterable<Tag<T>> tags) {
+		List<Tag<T>> modifiedTags = new ArrayList<>();
+		for (Tag<T> tag : tags) {
+			modifiedTags.add(new PaperTag<>(tag));
+		}
+		return modifiedTags;
+	}
+
+	/**
+	 * @param tags The raw tags from Paper.
+	 * @param types The tag types this source represents.
+	 */
+	@SafeVarargs
+	public PaperTagSource(Iterable<Tag<T>> tags, TagType<T>... types) {
+		super(TagOrigin.PAPER, getPaperTags(tags), types);
+	}
+
+	/**
+	 * Wrapper for Paper tags to remove "_settag" from their key.
+	 * @param <T1> The class of the tag.
+	 */
+	private static class PaperTag<T1 extends Keyed> implements Tag<T1> {
+
+		private final Tag<T1> paperTag;
+		private final NamespacedKey key;
+
+		public PaperTag(@NotNull Tag<T1> paperTag) {
+			this.paperTag = paperTag;
+			this.key = NamespacedKey.fromString(paperTag.getKey().toString().replace("_settag", ""));
+		}
+
+		@Override
+		public boolean isTagged(@NotNull T1 item) {
+			return paperTag.isTagged(item);
+		}
+
+		@Override
+		public @NotNull Set<T1> getValues() {
+			return paperTag.getValues();
+		}
+
+		@Override
+		public @NotNull NamespacedKey getKey() {
+			return key;
+		}
+
+	}
+
+}
diff --git a/src/main/java/org/skriptlang/skript/bukkit/tags/sources/SkriptTagSource.java b/src/main/java/org/skriptlang/skript/bukkit/tags/sources/SkriptTagSource.java
new file mode 100644
index 00000000000..b197878f989
--- /dev/null
+++ b/src/main/java/org/skriptlang/skript/bukkit/tags/sources/SkriptTagSource.java
@@ -0,0 +1,55 @@
+package org.skriptlang.skript.bukkit.tags.sources;
+
+import ch.njol.util.coll.iterator.EmptyIterable;
+import org.bukkit.Keyed;
+import org.bukkit.Material;
+import org.bukkit.Tag;
+import org.bukkit.entity.EntityType;
+import org.skriptlang.skript.bukkit.tags.TagType;
+
+public final class SkriptTagSource<T extends Keyed> extends CustomTagSource<T> {
+
+	private static SkriptTagSource<Material> ITEMS;
+	private static SkriptTagSource<Material> BLOCKS;
+	private static SkriptTagSource<EntityType> ENTITIES;
+
+	public static void makeDefaultSources() {
+		ITEMS = new SkriptTagSource<>(TagType.ITEMS);
+		BLOCKS = new SkriptTagSource<>(TagType.BLOCKS);
+		ENTITIES = new SkriptTagSource<>(TagType.ENTITIES);
+	}
+
+	/**
+	 * @param types The tag types this source will represent.
+	 */
+	@SafeVarargs
+	private SkriptTagSource(TagType<T>... types) {
+		super(TagOrigin.SKRIPT, new EmptyIterable<>(), types);
+	}
+
+	public void addTag(Tag<T> tag) {
+		tags.put(tag.getKey(), tag);
+	}
+
+	/**
+	 * @return Skript tag source for item contexts
+	 */
+	public static SkriptTagSource<Material> ITEMS() {
+		return ITEMS;
+	}
+
+	/**
+	 * @return Skript tag source for block contexts
+	 */
+	public static SkriptTagSource<Material> BLOCKS() {
+		return BLOCKS;
+	}
+
+	/**
+	 * @return Skript tag source for entities
+	 */
+	public static SkriptTagSource<EntityType> ENTITIES() {
+		return ENTITIES;
+	}
+
+}
diff --git a/src/main/java/org/skriptlang/skript/bukkit/tags/sources/TagOrigin.java b/src/main/java/org/skriptlang/skript/bukkit/tags/sources/TagOrigin.java
new file mode 100644
index 00000000000..82ff9c2f089
--- /dev/null
+++ b/src/main/java/org/skriptlang/skript/bukkit/tags/sources/TagOrigin.java
@@ -0,0 +1,94 @@
+package org.skriptlang.skript.bukkit.tags.sources;
+
+import org.bukkit.event.Event;
+import org.jetbrains.annotations.Contract;
+import org.jetbrains.annotations.NotNull;
+import org.skriptlang.skript.bukkit.tags.TagModule;
+
+import java.util.Collection;
+
+/**
+ * The origin of a tag, eg. from Bukkit, from Paper, from a custom Skript tag, or from anywhere.
+ * Used for classification and filtering tags.
+ */
+public enum TagOrigin {
+	/**
+	 * Bukkit supplies both native minecraft tags and datapack tags.
+	 */
+	BUKKIT,
+
+	/**
+	 * Paper supplies a set of custom tags they curate.
+	 */
+	PAPER,
+
+	/**
+	 * Custom tags registered via Skript.
+	 */
+	SKRIPT,
+
+	/**
+	 * Used when asking for tags, matches all origins.
+	 */
+	ANY;
+
+	/**
+	 * Returns an optional choice of all the origins (minecraft, datapack, paper, and custom).
+	 * Will not include paper on non-paper servers.
+	 * Contains parse tags.
+	 * @see #fromParseTags(Collection)
+	 */
+	@Contract(pure = true)
+	public static @NotNull String getFullPattern() {
+		if (TagModule.PAPER_TAGS_EXIST)
+			return "[:minecraft|:datapack|:paper|:custom]";
+		return "[:minecraft|:datapack|:custom]";
+	}
+
+	/**
+	 * Determines the origin of tags based on the parse tags provided.
+	 *
+	 * @param tags the list of tags to parse for determining the origin.
+	 * @return the determined {@code TagOrigin}.
+	 *         Returns {@code TagOrigin.ANY} if no specific origin is found.
+	 * @see #getFullPattern()
+	 */
+	@Contract(value = "_ -> new", pure = true)
+	public static TagOrigin fromParseTags(@NotNull Collection<String> tags) {
+		TagOrigin origin = TagOrigin.ANY;
+		if (tags.contains("minecraft") || tags.contains("datapack")) {
+			origin = TagOrigin.BUKKIT;
+		} else if (tags.contains("paper")) {
+			origin = TagOrigin.PAPER;
+		} else if (tags.contains("custom")) {
+			origin = TagOrigin.SKRIPT;
+		}
+		return origin;
+	}
+
+	/**
+	 * Checks if the current TagOrigin matches another TagOrigin, considering ANY as a wildcard.
+	 *
+	 * @param other The other TagOrigin to be matched against.
+	 * @return {@code true} if the TagOrigins match (i.e., they are the same, or either is {@link #ANY}).
+	 */
+	public boolean matches(TagOrigin other) {
+		return this == other || this == ANY || other == ANY;
+	}
+
+	/**
+	 * Returns a string for use in {@link ch.njol.skript.lang.Debuggable#toString(Event, boolean)} methods.
+	 * @param datapackOnly Whether to output "datapack " or "minecraft " for {@link #BUKKIT}.
+	 * @return a string representing the origin, with a trailing space.
+	 */
+	@Contract(pure = true)
+	public @NotNull String toString(boolean datapackOnly) {
+		return switch (this) {
+			case BUKKIT -> datapackOnly ? "datapack" : "minecraft";
+			case PAPER -> "paper";
+			case SKRIPT -> "custom";
+			case ANY -> "";
+		};
+	}
+
+}
diff --git a/src/main/java/org/skriptlang/skript/bukkit/tags/sources/TagSource.java b/src/main/java/org/skriptlang/skript/bukkit/tags/sources/TagSource.java
new file mode 100644
index 00000000000..ec933de34d6
--- /dev/null
+++ b/src/main/java/org/skriptlang/skript/bukkit/tags/sources/TagSource.java
@@ -0,0 +1,76 @@
+package org.skriptlang.skript.bukkit.tags.sources;
+
+import ch.njol.util.coll.iterator.CheckedIterator;
+import org.bukkit.Keyed;
+import org.bukkit.NamespacedKey;
+import org.bukkit.Tag;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+import org.skriptlang.skript.bukkit.tags.TagType;
+
+import java.util.Iterator;
+import java.util.function.Predicate;
+
+/**
+ * A source for {@link org.bukkit.Tag}s, be it Bukkit's tag registries, Paper's handmade tags, or
+ * custom tags made by the user.
+ * @param <T> The type of tags this source will return.
+ *           For example, the Bukkit "items" tag registry would return {@link org.bukkit.Material}s.
+ */
+public abstract class TagSource<T extends Keyed> {
+
+	private final TagType<T>[] types;
+	private final TagOrigin origin;
+
+	/**
+	 * @param origin The origin of this source.
+	 * @param types The tag types this source represents.
+	 */
+	@SafeVarargs
+	protected TagSource(TagOrigin origin, TagType<T>... types) {
+		this.types = types;
+		this.origin = origin;
+	}
+
+	/**
+	 * @return All the tags associated with this source.
+	 */
+	public abstract Iterable<Tag<T>> getAllTags();
+
+	/**
+	 * For use in getting specific subsets of tags.
+	 * @param predicate A Predicate used to filter tags.
+	 * @return All the tags from this source, filtered based on the predicate.
+	 */
+	public Iterable<Tag<T>> getAllTagsMatching(Predicate<Tag<T>> predicate) {
+		Iterator<Tag<T>> tagIterator = getAllTags().iterator();
+ 		return new Iterable<>() {
+			@Override
+			public @NotNull Iterator<Tag<T>> iterator() {
+				return new CheckedIterator<>(tagIterator, predicate::test);
+			}
+		};
+	}
+
+	/**
+	 * Gets a specific tag by the key.
+	 * @param key The key to use to find the tag.
+	 * @return The tag associated with the key. Null if no such tag exists.
+	 */
+	public abstract @Nullable Tag<T> getTag(NamespacedKey key);
+
+	/**
+	 * @return All the tag types that are represented by this source.
+	 */
+	public TagType<T>[] getTypes() {
+		return types;
+	}
+
+	/**
+	 * @return The origin of this source.
+	 */
+	public TagOrigin getOrigin() {
+		return origin;
+	}
+
+}
diff --git a/src/main/java/org/skriptlang/skript/lang/arithmetic/Arithmetics.java b/src/main/java/org/skriptlang/skript/lang/arithmetic/Arithmetics.java
index 10563db0b68..a30cd499133 100644
--- a/src/main/java/org/skriptlang/skript/lang/arithmetic/Arithmetics.java
+++ b/src/main/java/org/skriptlang/skript/lang/arithmetic/Arithmetics.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package org.skriptlang.skript.lang.arithmetic;
 
 import ch.njol.skript.Skript;
diff --git a/src/main/java/org/skriptlang/skript/lang/arithmetic/DifferenceInfo.java b/src/main/java/org/skriptlang/skript/lang/arithmetic/DifferenceInfo.java
index eb3a4bd485b..c41bc5e7a57 100644
--- a/src/main/java/org/skriptlang/skript/lang/arithmetic/DifferenceInfo.java
+++ b/src/main/java/org/skriptlang/skript/lang/arithmetic/DifferenceInfo.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package org.skriptlang.skript.lang.arithmetic;
 
 /**
diff --git a/src/main/java/org/skriptlang/skript/lang/arithmetic/Operation.java b/src/main/java/org/skriptlang/skript/lang/arithmetic/Operation.java
index 469be7dd08a..46574b07d58 100644
--- a/src/main/java/org/skriptlang/skript/lang/arithmetic/Operation.java
+++ b/src/main/java/org/skriptlang/skript/lang/arithmetic/Operation.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package org.skriptlang.skript.lang.arithmetic;
 
 import org.jetbrains.annotations.NotNull;
diff --git a/src/main/java/org/skriptlang/skript/lang/arithmetic/OperationInfo.java b/src/main/java/org/skriptlang/skript/lang/arithmetic/OperationInfo.java
index 6ad628fd040..c906a9ee3be 100644
--- a/src/main/java/org/skriptlang/skript/lang/arithmetic/OperationInfo.java
+++ b/src/main/java/org/skriptlang/skript/lang/arithmetic/OperationInfo.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package org.skriptlang.skript.lang.arithmetic;
 
 import com.google.common.base.MoreObjects;
diff --git a/src/main/java/org/skriptlang/skript/lang/arithmetic/Operator.java b/src/main/java/org/skriptlang/skript/lang/arithmetic/Operator.java
index 4c93807204c..ef15649e51d 100644
--- a/src/main/java/org/skriptlang/skript/lang/arithmetic/Operator.java
+++ b/src/main/java/org/skriptlang/skript/lang/arithmetic/Operator.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package org.skriptlang.skript.lang.arithmetic;
 
 import ch.njol.skript.Skript;
diff --git a/src/main/java/org/skriptlang/skript/lang/comparator/Comparator.java b/src/main/java/org/skriptlang/skript/lang/comparator/Comparator.java
index d06f508a735..53fb3c75102 100644
--- a/src/main/java/org/skriptlang/skript/lang/comparator/Comparator.java
+++ b/src/main/java/org/skriptlang/skript/lang/comparator/Comparator.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package org.skriptlang.skript.lang.comparator;
 
 /**
diff --git a/src/main/java/org/skriptlang/skript/lang/comparator/ComparatorInfo.java b/src/main/java/org/skriptlang/skript/lang/comparator/ComparatorInfo.java
index 261f499a494..5c4971febf9 100644
--- a/src/main/java/org/skriptlang/skript/lang/comparator/ComparatorInfo.java
+++ b/src/main/java/org/skriptlang/skript/lang/comparator/ComparatorInfo.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package org.skriptlang.skript.lang.comparator;
 
 /**
diff --git a/src/main/java/org/skriptlang/skript/lang/comparator/Comparators.java b/src/main/java/org/skriptlang/skript/lang/comparator/Comparators.java
index 1fc656c7377..43e8c2703c2 100644
--- a/src/main/java/org/skriptlang/skript/lang/comparator/Comparators.java
+++ b/src/main/java/org/skriptlang/skript/lang/comparator/Comparators.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package org.skriptlang.skript.lang.comparator;
 
 import ch.njol.skript.Skript;
diff --git a/src/main/java/org/skriptlang/skript/lang/comparator/ConvertedComparator.java b/src/main/java/org/skriptlang/skript/lang/comparator/ConvertedComparator.java
index f8ba918e49e..63f181c9296 100644
--- a/src/main/java/org/skriptlang/skript/lang/comparator/ConvertedComparator.java
+++ b/src/main/java/org/skriptlang/skript/lang/comparator/ConvertedComparator.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package org.skriptlang.skript.lang.comparator;
 
 import org.jetbrains.annotations.Nullable;
diff --git a/src/main/java/org/skriptlang/skript/lang/comparator/InverseComparator.java b/src/main/java/org/skriptlang/skript/lang/comparator/InverseComparator.java
index 4207020ef65..737a4a481ca 100644
--- a/src/main/java/org/skriptlang/skript/lang/comparator/InverseComparator.java
+++ b/src/main/java/org/skriptlang/skript/lang/comparator/InverseComparator.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package org.skriptlang.skript.lang.comparator;
 
 /**
diff --git a/src/main/java/org/skriptlang/skript/lang/comparator/Relation.java b/src/main/java/org/skriptlang/skript/lang/comparator/Relation.java
index 1f52ed46106..912333256da 100644
--- a/src/main/java/org/skriptlang/skript/lang/comparator/Relation.java
+++ b/src/main/java/org/skriptlang/skript/lang/comparator/Relation.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package org.skriptlang.skript.lang.comparator;
 
 /**
diff --git a/src/main/java/org/skriptlang/skript/lang/condition/CompoundConditional.java b/src/main/java/org/skriptlang/skript/lang/condition/CompoundConditional.java
new file mode 100644
index 00000000000..9e6e0657535
--- /dev/null
+++ b/src/main/java/org/skriptlang/skript/lang/condition/CompoundConditional.java
@@ -0,0 +1,155 @@
+package org.skriptlang.skript.lang.condition;
+
+import ch.njol.util.Kleenean;
+import com.google.common.base.Preconditions;
+import org.bukkit.event.Event;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+import org.jetbrains.annotations.Unmodifiable;
+
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+/**
+ * A {@link Conditional} that is built of other {@link Conditional}s.
+ * It is composed of an ordered {@link Set} of {@link Conditional}s that are acted upon by a single {@link Operator}.
+ * @param <T> The context class to use for evaluation.
+ * @see DNFConditionalBuilder
+ */
+class CompoundConditional<T> implements Conditional<T> {
+
+	private final LinkedHashSet<Conditional<T>> componentConditionals = new LinkedHashSet<>();
+	private final Operator operator;
+
+	/**
+	 * Whether a cache will be used during evaluation. True if this compound contains other compounds, otherwise false.
+	 */
+	private boolean useCache;
+
+	/**
+	 * @param operator The {@link Operator} to use to combine the conditionals. If {@link Operator#NOT} is used,
+	 * 					{@code conditionals} must exactly 1 conditional.
+	 * @param conditionals A collection of conditionals to combine using the operator. Must be >= 1 in length,
+	 *                     or exactly 1 if {@link Operator#NOT} is used.
+	 */
+	CompoundConditional(Operator operator, @NotNull Collection<Conditional<T>> conditionals) {
+		Preconditions.checkArgument(!conditionals.isEmpty(),
+				"CompoundConditionals must contain at least 1 component conditional.");
+		Preconditions.checkArgument(!(operator == Operator.NOT && conditionals.size() != 1),
+				"The NOT operator cannot be applied to multiple Conditionals.");
+
+		this.componentConditionals.addAll(conditionals);
+		useCache = conditionals.stream().anyMatch(cond -> cond instanceof CompoundConditional);
+		this.operator = operator;
+	}
+
+	/**
+	 * @param operator The {@link Operator} to use to combine the conditionals. If {@link Operator#NOT} is used,
+	 * 					{@code conditionals} must exactly 1 conditional.
+	 * @param conditionals Conditionals to combine using the operator. Must be >= 1 in length,
+	 *                     or exactly 1 if {@link Operator#NOT} is used.
+	 */
+	@SafeVarargs
+	CompoundConditional(Operator operator, Conditional<T>... conditionals) {
+		this(operator, List.of(conditionals));
+	}
+
+	@Override
+	public Kleenean evaluate(T context) {
+		Map<Conditional<T>, Kleenean> cache = null;
+		// only use overhead of a cache if we think it will be useful (stacked conditionals)
+		if (useCache)
+			cache = new HashMap<>();
+		return evaluate(context, cache);
+	}
+
+	@Override
+	public Kleenean evaluate(T context, Map<Conditional<T>, Kleenean> cache) {
+		Kleenean result;
+		return switch (operator) {
+			case OR -> {
+				result = Kleenean.FALSE;
+				for (Conditional<T> conditional : componentConditionals) {
+					result = conditional.evaluateOr(result, context, cache);
+				}
+				yield result;
+			}
+			case AND -> {
+				result = Kleenean.TRUE;
+				for (Conditional<T> conditional : componentConditionals) {
+					result = conditional.evaluateAnd(result, context, cache);
+				}
+				yield result;
+			}
+			case NOT -> {
+				if (componentConditionals.size() > 1)
+					throw new IllegalStateException("Cannot apply NOT to multiple conditionals! Cannot evaluate.");
+				// best workaround since getFirst is java 21
+				for (Conditional<T> conditional : componentConditionals) {
+					yield conditional.evaluate(context, cache).not();
+				}
+				throw new IllegalStateException("Cannot apply NOT to zero conditionals! Cannot evaluate.");
+			}
+		};
+	}
+
+	/**
+	 * @return An immutable list of the component conditionals of this object.
+	 */
+	public @Unmodifiable List<Conditional<T>> getConditionals() {
+		return componentConditionals.stream().toList();
+	}
+
+	/**
+	 * @return The operator used in this object.
+	 */
+	public Operator getOperator() {
+		return operator;
+	}
+
+	/**
+	 * @param conditionals Adds more conditionals to this object's component conditionals.
+	 */
+	@SafeVarargs
+	public final void addConditionals(Conditional<T>... conditionals) {
+		addConditionals(List.of(conditionals));
+	}
+
+	/**
+	 * @param conditionals Adds more conditionals to this object's component conditionals.
+	 */
+	public void addConditionals(Collection<Conditional<T>> conditionals) {
+		componentConditionals.addAll(conditionals);
+		useCache |= conditionals.stream().anyMatch(cond -> cond instanceof CompoundConditional);
+	}
+
+	//TODO: replace event with context object in debuggable rework pr
+	@Override
+	public String toString(@Nullable Event event, boolean debug) {
+		String output = joinConditionals(event, debug);
+
+		if (componentConditionals.size() > 1)
+			output = "(" + output + ")";
+
+		if (operator == Operator.NOT)
+			return "!" + output;
+		return output;
+	}
+
+	private String joinConditionals(@Nullable Event event, boolean debug) {
+		return componentConditionals.stream()
+			.map(conditional -> conditional.toString(event, debug))
+			.collect(Collectors.joining(" " + operator.getSymbol() + " "));
+	}
+
+	@Override
+	public String toString() {
+		return toString(null, false);
+	}
+
+}
diff --git a/src/main/java/org/skriptlang/skript/lang/condition/Conditional.java b/src/main/java/org/skriptlang/skript/lang/condition/Conditional.java
new file mode 100644
index 00000000000..04766831629
--- /dev/null
+++ b/src/main/java/org/skriptlang/skript/lang/condition/Conditional.java
@@ -0,0 +1,285 @@
+package org.skriptlang.skript.lang.condition;
+
+import ch.njol.skript.lang.Debuggable;
+import ch.njol.util.Kleenean;
+import com.google.common.base.Preconditions;
+import org.jetbrains.annotations.Contract;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * An object which can evaluate to `true`, `false`, or `unknown`.
+ * `unknown` is currently unused, but intended for future handling of unexpected runtime situations, where some aspect of
+ * the condition in ill-defined by the user and would result in ambiguous or undefined behavior.
+ * @param <T> The context class to use for evaluation.
+ */
+public interface Conditional<T> extends Debuggable {
+
+	/**
+	 * Evaluates this object as `true`, `false`, or `unknown`.
+	 * This value may change between subsequent callings.
+	 *
+	 * @param context The context with which to evaluate this object.
+	 * @return The evaluation of this object.
+	 */
+	@Contract(pure = true)
+	Kleenean evaluate(T context);
+
+	/**
+	 * Evaluates this object as `true`, `false`, or `unknown`.
+	 * This value may change between subsequent callings.
+	 * May use a mutable cache of evaluated conditionals to prevent duplicate evaluations.
+	 *
+	 * @param context The context with which to evaluate this object.
+	 * @param cache The cache of evaluated conditionals.
+	 * @return The evaluation of this object.
+	 */
+	@Contract(pure = true)
+	default Kleenean evaluate(T context, @Nullable Map<Conditional<T>, Kleenean> cache) {
+		if (cache == null)
+			return evaluate(context);
+		//noinspection DataFlowIssue
+		return cache.computeIfAbsent(this, cond -> cond.evaluate(context));
+	}
+
+	/**
+	 * Computes {@link Kleenean#and(Kleenean)} with the evaluations of this {@link Conditional} and the other.
+	 * Evaluates the other first, and shortcuts if it is not {@link Kleenean#TRUE}.
+	 *
+	 * @param other The {@link Conditional} to AND with. Will always be evaluated.
+	 * @param context The context with which to evaluate the conditionals.
+	 * @return The result of {@link Kleenean#and(Kleenean)}, given the evaluations of the two conditionals.
+	 */
+	@Contract(pure = true)
+	default Kleenean evaluateAnd(Conditional<T> other, T context) {
+		return evaluateAnd(other.evaluate(context, null), context, null);
+	}
+
+	/**
+	 * Computes {@link Kleenean#and(Kleenean)} with the evaluations of this {@link Conditional} and the other.
+	 * Evaluates the other first, and shortcuts if it is not {@link Kleenean#TRUE}.
+	 * Uses a mutable cache of evaluated conditionals to prevent duplicate evaluations.
+	 *
+	 * @param other The {@link Conditional} to AND with. Will always be evaluated.
+	 * @param context The context with which to evaluate the conditionals.
+	 * @param cache The cache of evaluated conditionals.
+	 * @return The result of {@link Kleenean#and(Kleenean)}, given the evaluations of the two conditionals.
+	 */
+	@Contract(pure = true)
+	default Kleenean evaluateAnd(Conditional<T> other, T context, @Nullable Map<Conditional<T>, Kleenean> cache) {
+		return evaluateAnd(other.evaluate(context, cache), context, cache);
+	}
+
+	/**
+	 * Computes {@link Kleenean#and(Kleenean)} with the evaluation of this {@link Conditional} and the given Kleenean.
+	 * Evaluates this object iff the given {@link Kleenean} is {@link Kleenean#TRUE}.
+	 *
+	 * @param other The {@link Kleenean} to AND with.
+	 * @param context The context with which to evaluate the conditional, if necessary.
+	 * @return The result of {@link Kleenean#and(Kleenean)}, given the evaluation of the conditional.
+	 */
+	@Contract(pure = true)
+	default Kleenean evaluateAnd(Kleenean other, T context) {
+		return evaluateAnd(other, context, null);
+	}
+
+	/**
+	 * Computes {@link Kleenean#and(Kleenean)} with the evaluation of this {@link Conditional} and the given Kleenean.
+	 * Evaluates this object iff the given {@link Kleenean} is not {@link Kleenean#FALSE}.
+	 * Uses a mutable cache of evaluated conditionals to prevent duplicate evaluations.
+	 *
+	 * @param other The {@link Kleenean} to AND with.
+	 * @param context The context with which to evaluate the conditional, if necessary.
+	 * @param cache The cache of evaluated conditionals.
+	 * @return The result of {@link Kleenean#and(Kleenean)}, given the evaluation of the conditional.
+	 */
+	@Contract(pure = true)
+	default Kleenean evaluateAnd(Kleenean other, T context, @Nullable Map<Conditional<T>, Kleenean> cache) {
+		if (other.isFalse())
+			return other;
+		return other.and(evaluate(context, cache));
+	}
+
+	/**
+	 * Computes {@link Kleenean#or(Kleenean)} with the evaluations of this {@link Conditional} and the other.
+	 * Evaluates the other first, and shortcuts if it is not {@link Kleenean#TRUE}.
+	 *
+	 * @param other The {@link Conditional} to OR with. Will always be evaluated.
+	 * @param context The context with which to evaluate the conditionals.
+	 * @return The result of {@link Kleenean#or(Kleenean)}, given the evaluations of the two conditionals.
+	 */
+	@Contract(pure = true)
+	default Kleenean evaluateOr(Conditional<T> other, T context) {
+		return evaluateOr(other.evaluate(context, null), context, null);
+	}
+
+	/**
+	 * Computes {@link Kleenean#or(Kleenean)} with the evaluations of this {@link Conditional} and the other.
+	 * Evaluates the other first, and shortcuts if it is not {@link Kleenean#TRUE}.
+	 * Uses a mutable cache of evaluated conditionals to prevent duplicate evaluations.
+	 *
+	 * @param other The {@link Conditional} to OR with. Will always be evaluated.
+	 * @param context The context with which to evaluate the conditionals.
+	 * @param cache The cache of evaluated conditionals.
+	 * @return The result of {@link Kleenean#and(Kleenean)}, given the evaluations of the two conditionals.
+	 */
+	@Contract(pure = true)
+	default Kleenean evaluateOr(Conditional<T> other, T context, @Nullable Map<Conditional<T>, Kleenean> cache) {
+		return evaluateOr(other.evaluate(context, cache), context, cache);
+	}
+
+	/**
+	 * Computes {@link Kleenean#or(Kleenean)} with the evaluation of this {@link Conditional} and the given Kleenean.
+	 * Evaluates this object iff the given {@link Kleenean} is {@link Kleenean#FALSE} or {@link Kleenean#UNKNOWN}.
+	 *
+	 * @param other The {@link Kleenean} to OR with.
+	 * @param context The context with which to evaluate the conditional, if necessary.
+	 * @return The result of {@link Kleenean#or(Kleenean)}, given the evaluation of the conditional.
+	 */
+	@Contract(pure = true)
+	default Kleenean evaluateOr(Kleenean other, T context) {
+		return evaluateOr(other, context, null);
+	}
+
+	/**
+	 * Computes {@link Kleenean#or(Kleenean)} with the evaluation of this {@link Conditional} and the given Kleenean.
+	 * Evaluates this object iff the given {@link Kleenean} is {@link Kleenean#FALSE} or {@link Kleenean#UNKNOWN}.
+	 * Uses a mutable cache of evaluated conditionals to prevent duplicate evaluations.
+	 *
+	 * @param other The {@link Kleenean} to OR with.
+	 * @param context The context with which to evaluate the conditional, if necessary.
+	 * @param cache The cache of evaluated conditionals.
+	 * @return The result of {@link Kleenean#or(Kleenean)}, given the evaluation of the conditional.
+	 */
+	@Contract(pure = true)
+	default Kleenean evaluateOr(Kleenean other, T context, @Nullable Map<Conditional<T>, Kleenean> cache) {
+		if (other.isTrue())
+			return other;
+		return other.or(evaluate(context, cache));
+	}
+
+	/**
+	 * Computes {@link Kleenean#not()} on the evaluation of this {@link Conditional}.
+	 * @param context The context with which to evaluate the conditional.
+	 * @return The result of {@link Kleenean#not()}, given the evaluation of the conditional.
+	 */
+	@Contract(pure = true)
+	default Kleenean evaluateNot(T context) {
+		return evaluateNot(context, null);
+	}
+
+	/**
+	 * Computes {@link Kleenean#not()} on the evaluation of this {@link Conditional}.
+	 * @param context The context with which to evaluate the conditional.
+	 * @return The result of {@link Kleenean#not()}, given the evaluation of the conditional.
+	 */
+	@Contract(pure = true)
+	default Kleenean evaluateNot(T context, @Nullable Map<Conditional<T>, Kleenean> cache) {
+		return this.evaluate(context, cache).not();
+	}
+
+	/**
+	 * Creates a compound conditional from multiple conditionals using {@link Operator#AND} or {@link Operator#OR}.
+	 * This does not maintain DNF. Use {@link DNFConditionalBuilder} for that purpose.
+	 * @param operator The operator to use (AND or OR).
+	 * @param conditionals The conditionals to combine.
+	 * @return A new conditional that contains this conditional and the given conditionals
+	 */
+	@Contract("_, _ -> new")
+	static <T> Conditional<T> compound(Operator operator, Collection<Conditional<T>> conditionals) {
+		Preconditions.checkArgument(operator != Operator.NOT, "Cannot combine conditionals using NOT!");
+		return new CompoundConditional<>(operator, conditionals);
+	}
+
+	/**
+	 * Creates a compound conditional from multiple conditionals using {@link Operator#AND} or {@link Operator#OR}.
+	 * This does not maintain DNF. Use {@link DNFConditionalBuilder} for that purpose.
+	 * @param operator The operator to use (AND or OR).
+	 * @param conditionals The conditionals to combine.
+	 * @return A new conditional that contains this conditional and the given conditionals
+	 */
+	@SuppressWarnings("unchecked")
+	@Contract("_, _ -> new")
+	static <T> Conditional<T> compound(Operator operator, Conditional<T>... conditionals) {
+		return compound(operator, List.of(conditionals));
+	}
+
+	/**
+	 * Provides a builder for conditions in disjunctive normal form. ex: {@code (A && B) || C || (!D &&E)}
+	 * @param ignoredContextClass The class of the context to use for the built condition.
+	 * @return a new builder object for making DNF conditions.
+	 */
+	@Contract(value = "_ -> new", pure = true)
+	static <T> @NotNull DNFConditionalBuilder<T> builderDNF(Class<T> ignoredContextClass) {
+		return new DNFConditionalBuilder<>();
+	}
+
+	/**
+	 * @param conditional A conditional to begin the builder with.
+	 * @return a new builder object for making conditions, specifically compound ones.
+	 */
+	@Contract("_ -> new")
+	static <T> @NotNull DNFConditionalBuilder<T> builderDNF(Conditional<T> conditional) {
+		return new DNFConditionalBuilder<>(conditional);
+	}
+
+	/**
+	 * Negates a given conditional. Follows the following transformation rules: <br>
+	 * {@code !!a -> a}<br>
+	 * {@code !(a || b) -> (!a && !b)}<br>
+	 * {@code !(a && b) -> (!a || !b)}<br>
+	 * @param conditional The conditional to negate.
+	 * @return The negated conditional.
+	 */
+	static <T> Conditional<T> negate(Conditional<T> conditional) {
+		if (!(conditional instanceof CompoundConditional<T> compound))
+			return new CompoundConditional<>(Operator.NOT, conditional);
+
+		return switch (compound.getOperator()) {
+			// !!a -> a
+			case NOT -> compound.getConditionals().getFirst();
+			// !(a && b) -> (!a || !b)
+			case AND -> {
+				List<Conditional<T>> newConditionals = new ArrayList<>();
+				for (Conditional<T> cond : compound.getConditionals()) {
+					newConditionals.add(negate(cond));
+				}
+				yield new CompoundConditional<>(Operator.OR, newConditionals);
+			}
+			// !(a || b) -> (!a && !b)
+			case OR -> {
+				List<Conditional<T>> newConditionals = new ArrayList<>();
+				for (Conditional<T> cond : compound.getConditionals()) {
+					newConditionals.add(negate(cond));
+				}
+				yield new CompoundConditional<>(Operator.AND, newConditionals);
+			}
+		};
+	}
+
+	/**
+	 * Represents a boolean logic operator.
+	 */
+	enum Operator {
+		AND("&&"),
+		OR("||"),
+		NOT("!");
+
+		private final String symbol;
+
+		Operator(String symbol) {
+			this.symbol = symbol;
+		}
+
+		String getSymbol() {
+			return symbol;
+		}
+
+	}
+
+}
diff --git a/src/main/java/org/skriptlang/skript/lang/condition/DNFConditionalBuilder.java b/src/main/java/org/skriptlang/skript/lang/condition/DNFConditionalBuilder.java
new file mode 100644
index 00000000000..1e979e4297a
--- /dev/null
+++ b/src/main/java/org/skriptlang/skript/lang/condition/DNFConditionalBuilder.java
@@ -0,0 +1,171 @@
+package org.skriptlang.skript.lang.condition;
+
+import com.google.common.base.Preconditions;
+import org.jetbrains.annotations.Contract;
+import org.skriptlang.skript.lang.condition.Conditional.Operator;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+import static org.skriptlang.skript.lang.condition.Conditional.negate;
+
+/**
+ * Builds a Disjunctive Normal Form {@link CompoundConditional}, meaning it is solely composed of groups of ANDs all ORed together,
+ * ex. {@code (a && !b && c) || b || (!c && d)}.
+ * <br>
+ * A builder should no longer be used after calling {@link #build()}.
+ * @param <T> The context class to use for evaluation.
+ */
+public class DNFConditionalBuilder<T> {
+
+	private CompoundConditional<T> root;
+
+	/**
+	 * Creates an empty builder.
+	 */
+	DNFConditionalBuilder() {
+		this.root = null;
+	}
+
+	/**
+	 * Creates a builder with a single conditional.
+	 * @param root If given a {@link CompoundConditional}, it is used as the root conditional.
+	 *             Otherwise, a OR compound conditional is created as the root with the given conditional within.
+	 */
+	DNFConditionalBuilder(Conditional<T> root) {
+		if (root instanceof CompoundConditional<T> compoundConditional) {
+			this.root = compoundConditional;
+		} else {
+			this.root = new CompoundConditional<>(Operator.OR, root);
+		}
+	}
+
+	/**
+	 * @return The root conditional, which will be DNF-compliant
+	 * @throws IllegalStateException if the builder is empty.
+	 */
+	public Conditional<T> build() {
+		return Preconditions.checkNotNull(root, "Cannot build an empty conditional!");
+	}
+
+	/**
+	 * Adds conditionals to the root node via the AND operator: {@code (existing) && newA && newB && ...}.
+	 * If the root is currently OR, the statement is transformed as follows to maintain DNF:
+	 * {@code (a || b) && c -> (a && c) || (b && c)}
+	 * @param andConditionals conditionals to AND to the existing conditional.
+	 * @return the builder
+	 */
+	@SafeVarargs
+	@Contract("_ -> this")
+	public final DNFConditionalBuilder<T> and(Conditional<T>... andConditionals) {
+		if (root == null) {
+			root = new CompoundConditional<>(Operator.AND, andConditionals);
+			return this;
+		}
+
+		// unroll conditionals if they're ANDs
+		List<Conditional<T>> newConditionals = unroll(List.of(andConditionals), Operator.AND);
+
+		// if the root is still just AND, we can just append.
+		if (root.getOperator() == Operator.AND) {
+			root.addConditionals(newConditionals);
+			return this;
+		}
+		// Otherwise, we need to transform:
+		// (a || b) && c -> (a && c) || (b && c)
+		List<Conditional<T>> transformedConditionals = new ArrayList<>();
+		newConditionals.add(0, null); // just for padding
+		for (Conditional<T> conditional : root.getConditionals()) {
+			newConditionals.set(0, conditional);
+			transformedConditionals.add(new CompoundConditional<>(Operator.AND, newConditionals));
+		}
+
+		root = new CompoundConditional<>(Operator.OR, transformedConditionals);
+		return this;
+	}
+
+	/**
+	 * Adds conditionals to the root node via the OR operator: {@code (existing) || newA || newB || ...}.
+	 * If the root is currently AND, a new OR root node is created containing the previous root and the new conditionals.
+	 * @param orConditionals conditionals to OR to the existing conditional.
+	 * @return the builder
+	 */
+	@SafeVarargs
+	@Contract("_ -> this")
+	public final DNFConditionalBuilder<T> or(Conditional<T>... orConditionals) {
+		if (root == null) {
+			root = new CompoundConditional<>(Operator.OR, orConditionals);
+			return this;
+		}
+
+		// unroll conditionals if they're ORs
+		List<Conditional<T>> newConditionals = unroll(List.of(orConditionals), Operator.OR);
+
+		// Since DNF is a series of ANDs, ORed together, we can simply add these to the root if it's already OR.
+		if (root.getOperator() == Operator.OR) {
+			root.addConditionals(newConditionals);
+			return this;
+		}
+		// otherwise we need to nest the AND/NOT condition within a new root with OR operator.
+		newConditionals.add(0, root);
+		root = new CompoundConditional<>(Operator.OR, newConditionals);
+		return this;
+	}
+
+	/**
+	 * Adds a negated conditional to the root node via the AND and NOT operators: {@code (existing) && !new}.
+	 * @param conditional The conditional to negate and add.
+	 * @return the builder
+	 */
+	@Contract("_ -> this")
+	public DNFConditionalBuilder<T> andNot(Conditional<T> conditional) {
+		return and(negate(conditional));
+	}
+
+	/**
+	 * Adds a negated conditional to the root node via the OR and NOT operators: {@code (existing) || !new}.
+	 * @param conditional The conditional to negate and add.
+	 * @return the builder
+	 */
+	@Contract("_ -> this")
+	public DNFConditionalBuilder<T> orNot(Conditional<T> conditional) {
+		return or(negate(conditional));
+	}
+
+	/**
+	 * Adds conditionals to the root node via the AND or OR operators.
+	 * A helper for dynamically adding conditionals.
+	 * @param or Whether to use OR (true) or AND (false)
+	 * @param conditionals The conditional to add.
+	 * @return the builder
+	 */
+	@SafeVarargs
+	@Contract("_,_ -> this")
+	public final DNFConditionalBuilder<T> add(boolean or, Conditional<T>... conditionals) {
+		if (or)
+			return or(conditionals);
+		return and(conditionals);
+	}
+
+	/**
+	 * Unrolls nested conditionals which are superfluous:
+	 * {@code a || (b || c) -> a || b || c}
+	 * @param conditionals A collection of conditionals to unroll.
+	 * @param operator Which operator to unroll.
+	 * @return A new list of conditionals without superfluous nesting.
+	 */
+	@Contract("_,_ -> new")
+	private static <T> List<Conditional<T>> unroll(Collection<Conditional<T>> conditionals, Operator operator) {
+		List<Conditional<T>> newConditionals = new ArrayList<>();
+		for (Conditional<T> conditional : conditionals) {
+			if (conditional instanceof CompoundConditional<T> compound && compound.getOperator() == operator) {
+				newConditionals.addAll(unroll(compound.getConditionals(), operator));
+			} else {
+				newConditionals.add(conditional);
+			}
+		}
+		return newConditionals;
+	}
+
+}
diff --git a/src/main/java/org/skriptlang/skript/lang/converter/ChainedConverter.java b/src/main/java/org/skriptlang/skript/lang/converter/ChainedConverter.java
index 1416e3be0cf..9741c426367 100644
--- a/src/main/java/org/skriptlang/skript/lang/converter/ChainedConverter.java
+++ b/src/main/java/org/skriptlang/skript/lang/converter/ChainedConverter.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package org.skriptlang.skript.lang.converter;
 
 import org.jetbrains.annotations.Nullable;
diff --git a/src/main/java/org/skriptlang/skript/lang/converter/Converter.java b/src/main/java/org/skriptlang/skript/lang/converter/Converter.java
index 68762d90cd5..6c7df376f45 100644
--- a/src/main/java/org/skriptlang/skript/lang/converter/Converter.java
+++ b/src/main/java/org/skriptlang/skript/lang/converter/Converter.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package org.skriptlang.skript.lang.converter;
 
 import org.jetbrains.annotations.Nullable;
@@ -37,15 +19,36 @@ public interface Converter<F, T> {
 	/**
 	 * A Converter flag declaring this Converter cannot be chained to another Converter.
 	 * This means that this Converter must be the beginning of a chain.
+	 * <br/>
+	 * <strong>Note</strong>: unchecked casts are not permitted before this converter
+	 * (e.g. {@code Object} to {@param <F>}).
 	 */
 	int NO_LEFT_CHAINING = 1;
 
 	/**
 	 * A Converter flag declaring that another Converter cannot be chained to this Converter.
 	 * This means that this Converter must be the end of a chain.
+	 * <br/>
+	 * <strong>Note</strong>: unchecked casts are not permitted after this converter
+	 * (e.g. {@param <T>} to {@param <? extends T>}).
 	 */
 	int NO_RIGHT_CHAINING = 2;
 
+	/**
+	 * A Converter flag declaring that the input/output of this can use an unchecked cast,
+	 * when combined with {@link #NO_LEFT_CHAINING} or {@link #NO_RIGHT_CHAINING}.
+	 * <br/>
+	 * An unchecked cast would be {@code Number -> Integer}. (Not all numbers are integers, some are floats!)
+	 * <br/>
+	 * <br/>
+	 * When combined with {@link #NO_RIGHT_CHAINING} the output can be conformed with an unchecked cast,
+	 * e.g. {@code String -> Number (-> cast Integer)}.
+	 * <br/>
+	 * When combined with {@link #NO_RIGHT_CHAINING} the output can be conformed with an unchecked cast,
+	 * e.g. {@code (cast Object ->) Integer -> String}.
+	 */
+	int ALLOW_UNSAFE_CASTS = 4;
+
 	/**
 	 * A Converter flag declaring that this Converter cannot be a part of a chain.
 	 */
diff --git a/src/main/java/org/skriptlang/skript/lang/converter/ConverterInfo.java b/src/main/java/org/skriptlang/skript/lang/converter/ConverterInfo.java
index 1b00d7041a3..55f112e4c42 100644
--- a/src/main/java/org/skriptlang/skript/lang/converter/ConverterInfo.java
+++ b/src/main/java/org/skriptlang/skript/lang/converter/ConverterInfo.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package org.skriptlang.skript.lang.converter;
 
 /**
diff --git a/src/main/java/org/skriptlang/skript/lang/converter/Converters.java b/src/main/java/org/skriptlang/skript/lang/converter/Converters.java
index 0daeadfc714..b1cc798ed20 100644
--- a/src/main/java/org/skriptlang/skript/lang/converter/Converters.java
+++ b/src/main/java/org/skriptlang/skript/lang/converter/Converters.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package org.skriptlang.skript.lang.converter;
 
 import ch.njol.skript.Skript;
@@ -25,12 +7,7 @@
 import org.jetbrains.annotations.Unmodifiable;
 
 import java.lang.reflect.Array;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * Converters are used to provide Skript with specific instructions for converting an object to a different type.
@@ -304,8 +281,13 @@ private static <F, T extends ParentType, SubType extends F, ParentType> Converte
 
 		// Attempt to find converters that have either 'from' OR 'to' not exactly matching
 		for (ConverterInfo<?, ?> unknownInfo : CONVERTERS) {
+			int flags = unknownInfo.getFlags();
 			if (unknownInfo.getFrom().isAssignableFrom(fromType) && unknownInfo.getTo().isAssignableFrom(toType)) {
 				ConverterInfo<F, ParentType> info = (ConverterInfo<F, ParentType>) unknownInfo;
+				if ((flags & Converter.ALLOW_UNSAFE_CASTS) == 0) {
+					if ((flags & Converter.NO_RIGHT_CHAINING) == Converter.NO_RIGHT_CHAINING)
+						continue;
+				}
 
 				// 'to' doesn't exactly match and needs to be filtered
 				// Basically, this converter might convert 'F' into something that's shares a parent with 'T'
@@ -319,6 +301,10 @@ private static <F, T extends ParentType, SubType extends F, ParentType> Converte
 
 			} else if (fromType.isAssignableFrom(unknownInfo.getFrom()) && toType.isAssignableFrom(unknownInfo.getTo())) {
 				ConverterInfo<SubType, T> info = (ConverterInfo<SubType, T>) unknownInfo;
+				if ((flags & Converter.ALLOW_UNSAFE_CASTS) == 0) {
+					if ((flags & Converter.NO_LEFT_CHAINING) == Converter.NO_LEFT_CHAINING)
+						continue;
+				}
 
 				// 'from' doesn't exactly match and needs to be filtered
 				// Basically, this converter will only convert certain 'F' objects
@@ -336,6 +322,13 @@ private static <F, T extends ParentType, SubType extends F, ParentType> Converte
 		for (ConverterInfo<?, ?> unknownInfo : CONVERTERS) {
 			if (fromType.isAssignableFrom(unknownInfo.getFrom()) && unknownInfo.getTo().isAssignableFrom(toType)) {
 				ConverterInfo<SubType, ParentType> info = (ConverterInfo<SubType, ParentType>) unknownInfo;
+				int flags = unknownInfo.getFlags();
+				if ((flags & Converter.ALLOW_UNSAFE_CASTS) == 0) {
+					if ((flags & Converter.NO_LEFT_CHAINING) == Converter.NO_LEFT_CHAINING)
+						continue;
+					if ((flags & Converter.NO_RIGHT_CHAINING) == Converter.NO_RIGHT_CHAINING)
+						continue;
+				}
 
 				// 'from' and 'to' both don't exactly match and need to be filtered
 				// Basically, this converter will only convert certain 'F' objects
diff --git a/src/main/java/org/skriptlang/skript/lang/entry/EntryContainer.java b/src/main/java/org/skriptlang/skript/lang/entry/EntryContainer.java
index 91d8fc52ba1..6c2dfb59d2d 100644
--- a/src/main/java/org/skriptlang/skript/lang/entry/EntryContainer.java
+++ b/src/main/java/org/skriptlang/skript/lang/entry/EntryContainer.java
@@ -1,26 +1,9 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package org.skriptlang.skript.lang.entry;
 
 import ch.njol.skript.config.Node;
 import ch.njol.skript.config.SectionNode;
 import ch.njol.skript.lang.parser.ParserInstance;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.ArrayList;
@@ -170,4 +153,13 @@ public Object getOptional(String key, boolean useDefaultValue) {
 		return value;
 	}
 
+	/**
+	 * Check to see if an entry data with the key matching {@code key} was used.
+	 * @param key The key to check
+	 * @return true if an entry data with the matching key was used.
+	 */
+	public boolean hasEntry(@NotNull String key) {
+		return handledNodes.containsKey(key);
+	}
+
 }
diff --git a/src/main/java/org/skriptlang/skript/lang/entry/EntryData.java b/src/main/java/org/skriptlang/skript/lang/entry/EntryData.java
index 3787a01e74b..b6dbeecd6b8 100644
--- a/src/main/java/org/skriptlang/skript/lang/entry/EntryData.java
+++ b/src/main/java/org/skriptlang/skript/lang/entry/EntryData.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package org.skriptlang.skript.lang.entry;
 
 import ch.njol.skript.config.Node;
diff --git a/src/main/java/org/skriptlang/skript/lang/entry/EntryValidator.java b/src/main/java/org/skriptlang/skript/lang/entry/EntryValidator.java
index c1966b89aad..f8735b076c2 100644
--- a/src/main/java/org/skriptlang/skript/lang/entry/EntryValidator.java
+++ b/src/main/java/org/skriptlang/skript/lang/entry/EntryValidator.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package org.skriptlang.skript.lang.entry;
 
 import ch.njol.skript.ScriptLoader;
diff --git a/src/main/java/org/skriptlang/skript/lang/entry/KeyValueEntryData.java b/src/main/java/org/skriptlang/skript/lang/entry/KeyValueEntryData.java
index 57c157a9c01..efa814379cd 100644
--- a/src/main/java/org/skriptlang/skript/lang/entry/KeyValueEntryData.java
+++ b/src/main/java/org/skriptlang/skript/lang/entry/KeyValueEntryData.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package org.skriptlang.skript.lang.entry;
 
 import ch.njol.skript.ScriptLoader;
diff --git a/src/main/java/org/skriptlang/skript/lang/entry/SectionEntryData.java b/src/main/java/org/skriptlang/skript/lang/entry/SectionEntryData.java
index d38a703b092..21fc561d250 100644
--- a/src/main/java/org/skriptlang/skript/lang/entry/SectionEntryData.java
+++ b/src/main/java/org/skriptlang/skript/lang/entry/SectionEntryData.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package org.skriptlang.skript.lang.entry;
 
 import ch.njol.skript.ScriptLoader;
diff --git a/src/main/java/org/skriptlang/skript/lang/entry/util/ExpressionEntryData.java b/src/main/java/org/skriptlang/skript/lang/entry/util/ExpressionEntryData.java
index 06bb1f50dcc..166e616ec6c 100644
--- a/src/main/java/org/skriptlang/skript/lang/entry/util/ExpressionEntryData.java
+++ b/src/main/java/org/skriptlang/skript/lang/entry/util/ExpressionEntryData.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package org.skriptlang.skript.lang.entry.util;
 
 import ch.njol.skript.lang.Expression;
@@ -36,7 +18,7 @@ public class ExpressionEntryData<T> extends KeyValueEntryData<Expression<? exten
 
 	private static final Message M_IS = new Message("is");
 
-	private final Class<T> returnType;
+	private final Class<T>[] returnTypes;
 
 	private final int flags;
 
@@ -44,10 +26,9 @@ public class ExpressionEntryData<T> extends KeyValueEntryData<Expression<? exten
 	 * @param returnType The expected return type of the matched expression.
 	 */
 	public ExpressionEntryData(
-		String key, @Nullable Expression<T> defaultValue, boolean optional,
-		Class<T> returnType
+		String key, @Nullable Expression<T> defaultValue, boolean optional, Class<T> returnType
 	) {
-		this(key, defaultValue, optional, returnType, SkriptParser.ALL_FLAGS);
+		this(key, defaultValue, optional, SkriptParser.ALL_FLAGS, returnType);
 	}
 
 	/**
@@ -56,11 +37,32 @@ public ExpressionEntryData(
 	 *              javadoc for more details.
 	 */
 	public ExpressionEntryData(
-		String key, @Nullable Expression<T> defaultValue, boolean optional,
-		Class<T> returnType, int flags
+		String key, @Nullable Expression<T> defaultValue, boolean optional, Class<T> returnType, int flags
+	) {
+		this(key, defaultValue, optional, flags, returnType);
+	}
+
+	/**
+	 * @param returnTypes The expected return types of the matched expression.
+	 */
+	@SafeVarargs
+	public ExpressionEntryData(
+		String key, @Nullable Expression<T> defaultValue, boolean optional, Class<T>... returnTypes
+	) {
+		this(key, defaultValue, optional, SkriptParser.ALL_FLAGS, returnTypes);
+	}
+
+	/**
+	 * @param returnTypes The expected return types of the matched expression.
+	 * @param flags Parsing flags. See {@link SkriptParser#SkriptParser(String, int, ParseContext)}
+	 *              javadoc for more details.
+	 */
+	@SafeVarargs
+	public ExpressionEntryData(
+		String key, @Nullable Expression<T> defaultValue, boolean optional, int flags, Class<T>... returnTypes
 	) {
 		super(key, defaultValue, optional);
-		this.returnType = returnType;
+		this.returnTypes = returnTypes;
 		this.flags = flags;
 	}
 
@@ -71,10 +73,10 @@ protected Expression<? extends T> getValue(String value) {
 		Expression<? extends T> expression;
 		try (ParseLogHandler log = new ParseLogHandler().start()) {
 			expression = new SkriptParser(value, flags, ParseContext.DEFAULT)
-				.parseExpression(returnType);
+				.parseExpression(returnTypes);
 			if (expression == null) // print an error if it couldn't parse
 				log.printError(
-					"'" + value + "' " + M_IS + " " + SkriptParser.notOfType(returnType),
+					"'" + value + "' " + M_IS + " " + SkriptParser.notOfType(returnTypes),
 					ErrorQuality.NOT_AN_EXPRESSION
 				);
 		}
diff --git a/src/main/java/org/skriptlang/skript/lang/entry/util/LiteralEntryData.java b/src/main/java/org/skriptlang/skript/lang/entry/util/LiteralEntryData.java
index 72bdc474c18..9a317a6bc64 100644
--- a/src/main/java/org/skriptlang/skript/lang/entry/util/LiteralEntryData.java
+++ b/src/main/java/org/skriptlang/skript/lang/entry/util/LiteralEntryData.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package org.skriptlang.skript.lang.entry.util;
 
 import ch.njol.skript.lang.ParseContext;
diff --git a/src/main/java/org/skriptlang/skript/lang/entry/util/TriggerEntryData.java b/src/main/java/org/skriptlang/skript/lang/entry/util/TriggerEntryData.java
index a445dc438a4..7cc093e9473 100644
--- a/src/main/java/org/skriptlang/skript/lang/entry/util/TriggerEntryData.java
+++ b/src/main/java/org/skriptlang/skript/lang/entry/util/TriggerEntryData.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package org.skriptlang.skript.lang.entry.util;
 
 import ch.njol.skript.ScriptLoader;
diff --git a/src/main/java/org/skriptlang/skript/lang/entry/util/VariableStringEntryData.java b/src/main/java/org/skriptlang/skript/lang/entry/util/VariableStringEntryData.java
index 150e2098f3b..bf9d834df8c 100644
--- a/src/main/java/org/skriptlang/skript/lang/entry/util/VariableStringEntryData.java
+++ b/src/main/java/org/skriptlang/skript/lang/entry/util/VariableStringEntryData.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package org.skriptlang.skript.lang.entry.util;
 
 import ch.njol.skript.lang.VariableString;
diff --git a/src/main/java/org/skriptlang/skript/lang/experiment/Experiment.java b/src/main/java/org/skriptlang/skript/lang/experiment/Experiment.java
index d4067869507..55422718eb7 100644
--- a/src/main/java/org/skriptlang/skript/lang/experiment/Experiment.java
+++ b/src/main/java/org/skriptlang/skript/lang/experiment/Experiment.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package org.skriptlang.skript.lang.experiment;
 
 import ch.njol.skript.patterns.PatternCompiler;
diff --git a/src/main/java/org/skriptlang/skript/lang/experiment/ExperimentRegistry.java b/src/main/java/org/skriptlang/skript/lang/experiment/ExperimentRegistry.java
index b115f14d57d..ec6a5ae5157 100644
--- a/src/main/java/org/skriptlang/skript/lang/experiment/ExperimentRegistry.java
+++ b/src/main/java/org/skriptlang/skript/lang/experiment/ExperimentRegistry.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package org.skriptlang.skript.lang.experiment;
 
 import ch.njol.skript.Skript;
diff --git a/src/main/java/org/skriptlang/skript/lang/experiment/ExperimentSet.java b/src/main/java/org/skriptlang/skript/lang/experiment/ExperimentSet.java
index bce336ffb55..d543176dead 100644
--- a/src/main/java/org/skriptlang/skript/lang/experiment/ExperimentSet.java
+++ b/src/main/java/org/skriptlang/skript/lang/experiment/ExperimentSet.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package org.skriptlang.skript.lang.experiment;
 
 import org.jetbrains.annotations.NotNull;
diff --git a/src/main/java/org/skriptlang/skript/lang/experiment/Experimented.java b/src/main/java/org/skriptlang/skript/lang/experiment/Experimented.java
index 77c68b5e4bc..8526806f404 100644
--- a/src/main/java/org/skriptlang/skript/lang/experiment/Experimented.java
+++ b/src/main/java/org/skriptlang/skript/lang/experiment/Experimented.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package org.skriptlang.skript.lang.experiment;
 
 import ch.njol.skript.Skript;
diff --git a/src/main/java/org/skriptlang/skript/lang/experiment/LifeCycle.java b/src/main/java/org/skriptlang/skript/lang/experiment/LifeCycle.java
index ff1479464af..be10c90b261 100644
--- a/src/main/java/org/skriptlang/skript/lang/experiment/LifeCycle.java
+++ b/src/main/java/org/skriptlang/skript/lang/experiment/LifeCycle.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package org.skriptlang.skript.lang.experiment;
 
 /**
diff --git a/src/main/java/org/skriptlang/skript/lang/script/Script.java b/src/main/java/org/skriptlang/skript/lang/script/Script.java
index 610609b5e09..a93d459b90b 100644
--- a/src/main/java/org/skriptlang/skript/lang/script/Script.java
+++ b/src/main/java/org/skriptlang/skript/lang/script/Script.java
@@ -1,29 +1,16 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package org.skriptlang.skript.lang.script;
 
 import ch.njol.skript.config.Config;
+import ch.njol.skript.lang.util.common.AnyNamed;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.annotations.ApiStatus;
+import org.jetbrains.annotations.UnknownNullability;
 import org.jetbrains.annotations.Unmodifiable;
+import org.skriptlang.skript.util.event.EventRegistry;
 import org.skriptlang.skript.lang.structure.Structure;
+import org.skriptlang.skript.util.Validated;
 
+import java.io.File;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
@@ -31,7 +18,6 @@
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.Supplier;
-import java.util.stream.Collectors;
 
 /**
  * Scripts are the primary container of all code.
@@ -39,7 +25,7 @@
  * Every script also has its own internal information, such as
  *  custom data, suppressed warnings, and associated event handlers.
  */
-public final class Script {
+public final class Script implements Validated, AnyNamed {
 
 	private final Config config;
 
@@ -158,65 +144,74 @@ public <Value extends ScriptData> Value getData(Class<? extends Value> dataType,
 		return (Value) scriptData.computeIfAbsent(dataType, clazz -> mapper.get());
 	}
 
-	// Script Events
-
-	private final Set<ScriptEvent> eventHandlers = new HashSet<>(5);
+	@Override
+	public String name() {
+		return config.name();
+	}
 
 	/**
-	 * <b>This API is experimental and subject to change.</b>
-	 * Adds the provided event to this Script.
-	 * @param event The event to add.
+	 * This is added to support the legacy script name syntax.
+	 * Script names used to be printed including their directory but excluding their file extension.
+	 *
+	 * @return The script's name, including its path from the script directory, e.g. `games/murder mystery`
 	 */
-	@ApiStatus.Experimental
-	public void registerEvent(ScriptEvent event) {
-		eventHandlers.add(event);
+	public String nameAndPath() {
+		String name = config.getFileName();
+		if (name == null)
+			return null;
+		if (name.contains("."))
+			return name.substring(0, name.lastIndexOf('.'));
+		return name;
 	}
 
+	// Script Events
+
 	/**
-	 * <b>This API is experimental and subject to change.</b>
-	 * Adds the provided event to this Script.
-	 * @param eventType The type of event being added. This is useful for registering the event through lambdas.
-	 * @param event The event to add.
+	 * Used for listening to events involving a Script.
+	 * @see #eventRegistry()
 	 */
-	@ApiStatus.Experimental
-	public <T extends ScriptEvent> void registerEvent(Class<T> eventType, T event) {
-		eventHandlers.add(event);
-	}
+	public interface Event extends org.skriptlang.skript.util.event.Event { }
+
+	private final EventRegistry<Event> eventRegistry = new EventRegistry<>();
 
 	/**
-	 * <b>This API is experimental and subject to change.</b>
-	 * Removes the provided event from this Script.
-	 * @param event The event to remove.
+	 * @return An EventRegistry for this Script's events.
 	 */
-	@ApiStatus.Experimental
-	public void unregisterEvent(ScriptEvent event) {
-		eventHandlers.remove(event);
+	public EventRegistry<Event> eventRegistry() {
+		return eventRegistry;
 	}
 
 	/**
-	 * <b>This API is experimental and subject to change.</b>
-	 * @return An unmodifiable set of all events.
+	 * Marks this script reference as invalid.
+	 * Typically invoked during unloading (when its data is discarded).
 	 */
-	@ApiStatus.Experimental
-	@Unmodifiable
-	public Set<ScriptEvent> getEvents() {
-		return Collections.unmodifiableSet(eventHandlers);
+	@Override
+	public void invalidate() {
+		this.config.invalidate();
 	}
 
 	/**
-	 * <b>This API is experimental and subject to change.</b>
-	 * @param type The type of events to get.
-	 * @return An unmodifiable set of all events of the specified type.
+	 * This is a reference to a script (having been loaded); if the script is reloaded,
+	 * disabled, moved or changed in some way then this object will no longer be a valid
+	 * reference to it.
+	 * <br/>
+	 * If a script reference is not valid, it is not safe to assume that the data in
+	 * this object is an accurate reflection of the program (e.g. the data could have cleared
+	 * during unloading, the user might have edited the file and reloaded it, etc.) and
+	 * it is recommended to obtain a new reference to the script from {@link ch.njol.skript.ScriptLoader}.
+	 *
+	 * @return Whether this script object is a valid reflection of a script
 	 */
-	@ApiStatus.Experimental
-	@Unmodifiable
-	@SuppressWarnings("unchecked")
-	public <T extends ScriptEvent> Set<T> getEvents(Class<T> type) {
-		return Collections.unmodifiableSet(
-			(Set<T>) eventHandlers.stream()
-				.filter(event -> type.isAssignableFrom(event.getClass()))
-				.collect(Collectors.toSet())
-		);
+	@Override
+	public boolean valid() {
+		if (config.valid()) {
+			@Nullable File file = config.getFile();
+			return file == null || file.exists();
+			// If this is file-linked and that file was moved/deleted (e.g. this was disabled)
+			// then we should not assume this is a safe reference to use, unless it was
+			// immediately obtained.
+		}
+		return false;
 	}
 
 }
diff --git a/src/main/java/org/skriptlang/skript/lang/script/ScriptData.java b/src/main/java/org/skriptlang/skript/lang/script/ScriptData.java
index 58c12ac10cf..812f5e068e2 100644
--- a/src/main/java/org/skriptlang/skript/lang/script/ScriptData.java
+++ b/src/main/java/org/skriptlang/skript/lang/script/ScriptData.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package org.skriptlang.skript.lang.script;
 
 /**
diff --git a/src/main/java/org/skriptlang/skript/lang/script/ScriptEvent.java b/src/main/java/org/skriptlang/skript/lang/script/ScriptEvent.java
deleted file mode 100644
index 8c7a192183a..00000000000
--- a/src/main/java/org/skriptlang/skript/lang/script/ScriptEvent.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
-package org.skriptlang.skript.lang.script;
-
-import ch.njol.skript.lang.parser.ParserInstance;
-import org.jetbrains.annotations.Nullable;
-
-/**
- * A ScriptEvent is used for listening to and performing actions for different Script events.
- * @see Script#registerEvent(ScriptEvent)
- */
-public interface ScriptEvent {
-
-	/**
-	 * A ScriptEvent that is called when a Script is made active in a {@link ParserInstance}.
-	 */
-	@FunctionalInterface
-	interface ScriptActiveEvent extends ScriptEvent {
-
-		/**
-		 * Called when this Script is made active in a {@link ParserInstance}.
-		 *
-		 * @param oldScript The Script that was just made inactive.
-		 * Null if the {@link ParserInstance} handling this Script
-		 *  was not {@link ParserInstance#isActive()} (it is becoming active).
-		 */
-		void onActive(@Nullable Script oldScript);
-
-	}
-
-	/**
-	 * A ScriptEvent that is called when a Script is made inactive in a {@link ParserInstance}.
-	 */
-	@FunctionalInterface
-	interface ScriptInactiveEvent extends ScriptEvent {
-
-		/**
-		 * Called when this Script is made inactive in a {@link ParserInstance}.
-		 *
-		 * @param newScript The Script that will be made active after this one is completely inactive.
-		 * Null if the {@link ParserInstance} handling this Script
-		 *  will not be {@link ParserInstance#isActive()} (will become inactive).
-		 */
-		void onInactive(@Nullable Script newScript);
-
-	}
-
-}
diff --git a/src/main/java/org/skriptlang/skript/lang/script/ScriptWarning.java b/src/main/java/org/skriptlang/skript/lang/script/ScriptWarning.java
index 438f2ccfb70..7c02c617eba 100644
--- a/src/main/java/org/skriptlang/skript/lang/script/ScriptWarning.java
+++ b/src/main/java/org/skriptlang/skript/lang/script/ScriptWarning.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package org.skriptlang.skript.lang.script;
 
 import ch.njol.skript.Skript;
@@ -23,34 +5,84 @@
 import ch.njol.skript.lang.SkriptParser;
 import ch.njol.skript.lang.parser.ParserInstance;
 import ch.njol.util.Kleenean;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * An enum containing {@link Script} warnings that can be suppressed.
  */
 public enum ScriptWarning {
 
+	/**
+	 * Possible variable conflict (Deprecated)
+	 */
+	@Deprecated
+	VARIABLE_CONFLICT("conflict", "conflict", "Variable conflict warnings no longer need suppression, as they have been removed altogether"),
+
 	/**
 	 * Variable cannot be saved (the ClassInfo is not serializable)
 	 */
-	VARIABLE_SAVE,
+	VARIABLE_SAVE("variable save"),
 
 	/**
 	 * Missing "and" or "or"
 	 */
-	MISSING_CONJUNCTION,
+	MISSING_CONJUNCTION("missing conjunction", "[missing] conjunction"),
 
 	/**
 	 * Variable starts with an Expression
 	 */
-	VARIABLE_STARTS_WITH_EXPRESSION,
+	VARIABLE_STARTS_WITH_EXPRESSION("starting expression", "starting [with] expression[s]"),
 
 	/**
 	 * This syntax is deprecated and scheduled for future removal
 	 */
-	DEPRECATED_SYNTAX;
+	DEPRECATED_SYNTAX("deprecated syntax"),
+
+	/**
+	 * The code cannot be reached due to a previous statement stopping further execution
+	 */
+	UNREACHABLE_CODE("unreachable code");
+
+	private final String warningName;
+	private final String pattern;
+	private final @Nullable String deprecationMessage;
+
+	ScriptWarning(String warningName) {
+		this(warningName, warningName);
+	}
+
+	ScriptWarning(String warningName, String pattern) {
+		this(warningName, pattern, null);
+	}
+
+	ScriptWarning(String warningName, String pattern, @Nullable String deprecationMessage) {
+		this.warningName = warningName;
+		this.pattern = pattern;
+		this.deprecationMessage = deprecationMessage;
+	}
+
+	public String getWarningName() {
+		return warningName;
+	}
+
+	public String getPattern() {
+		return pattern;
+	}
+
+	public boolean isDeprecated() {
+		return deprecationMessage != null;
+	}
+
+	/**
+	 * @return The deprecation message of this warning, or null if the warning isn't deprecated.
+	 * @see #isDeprecated()
+	 */
+	public String getDeprecationMessage() {
+		return deprecationMessage;
+	}
 
 	/**
-	 * Prints the given message using {@link Skript#warning(String)} iff the current script does not suppress deprecation warnings.
+	 * Prints the given message using {@link Skript#warning(String)} if and only if the current script does not suppress deprecation warnings.
 	 * Intended for use in {@link ch.njol.skript.lang.SyntaxElement#init(Expression[], int, Kleenean, SkriptParser.ParseResult)}.
 	 * The given message is prefixed with {@code "[Deprecated] "} to provide a common link between deprecation warnings.
 	 *
diff --git a/src/main/java/org/skriptlang/skript/lang/structure/Structure.java b/src/main/java/org/skriptlang/skript/lang/structure/Structure.java
index f56cffcfbf0..24be595069b 100644
--- a/src/main/java/org/skriptlang/skript/lang/structure/Structure.java
+++ b/src/main/java/org/skriptlang/skript/lang/structure/Structure.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package org.skriptlang.skript.lang.structure;
 
 import ch.njol.skript.Skript;
@@ -35,7 +17,6 @@
 import ch.njol.util.Kleenean;
 import ch.njol.util.coll.iterator.CheckedIterator;
 import ch.njol.util.coll.iterator.ConsumingIterator;
-import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.skriptlang.skript.lang.entry.EntryContainer;
@@ -96,8 +77,7 @@ public int compareTo(@NotNull Structure.Priority o) {
 	 * If the EntryContainer is needed outside of {@link #init(Literal[], int, ParseResult, EntryContainer)},
 	 * the Structure should keep a reference to it.
 	 */
-	@Deprecated
-	@ApiStatus.ScheduledForRemoval
+	@Deprecated(forRemoval = true)
 	public final EntryContainer getEntryContainer() {
 		if (entryContainer == null)
 			throw new IllegalStateException("This Structure hasn't been initialized!");
@@ -113,7 +93,7 @@ public final boolean init(Expression<?>[] expressions, int matchedPattern, Kleen
 		StructureInfo<? extends Structure> structureInfo = structureData.structureInfo;
 		assert structureInfo != null;
 
-		if (structureInfo.simple) { // simple structures do not have validators
+		if (structureData.node instanceof SimpleNode) { // simple structures do not have validators
 			return init(literals, matchedPattern, parseResult, null);
 		}
 
@@ -195,6 +175,11 @@ public String toString() {
 		return toString(null, false);
 	}
 
+	@Override
+	public @NotNull String getSyntaxTypeName() {
+		return "structure";
+	}
+
 	@Nullable
 	public static Structure parse(String expr, Node node, @Nullable String defaultError) {
 		return parse(expr, node, defaultError, Skript.getStructures().iterator());
@@ -206,10 +191,10 @@ public static Structure parse(String expr, Node node, @Nullable String defaultEr
 			throw new IllegalArgumentException("only simple or section nodes may be parsed as a structure");
 		ParserInstance.get().getData(StructureData.class).node = node;
 
-		if (node instanceof SimpleNode) { // only allow simple structures for simple nodes
-			iterator = new CheckedIterator<>(iterator, item -> item != null && item.simple);
-		} else { // only allow non-simple structures for section nodes
-			iterator = new CheckedIterator<>(iterator, item -> item != null && !item.simple);
+		if (node instanceof SimpleNode) { // filter out section only structures
+			iterator = new CheckedIterator<>(iterator, item -> item != null && item.nodeType.canBeSimple());
+		} else { // filter out simple only structures
+			iterator = new CheckedIterator<>(iterator, item -> item != null && item.nodeType.canBeSection());
 		}
 		iterator = new ConsumingIterator<>(iterator, elementInfo -> ParserInstance.get().getData(StructureData.class).structureInfo = elementInfo);
 
diff --git a/src/main/java/org/skriptlang/skript/lang/structure/StructureInfo.java b/src/main/java/org/skriptlang/skript/lang/structure/StructureInfo.java
index 773c3212af3..21c7e354d16 100644
--- a/src/main/java/org/skriptlang/skript/lang/structure/StructureInfo.java
+++ b/src/main/java/org/skriptlang/skript/lang/structure/StructureInfo.java
@@ -1,26 +1,10 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package org.skriptlang.skript.lang.structure;
 
 import ch.njol.skript.lang.SyntaxElementInfo;
+import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.Nullable;
 import org.skriptlang.skript.lang.entry.EntryValidator;
+import org.skriptlang.skript.registration.SyntaxInfo;
 
 /**
  * Special {@link SyntaxElementInfo} for {@link Structure}s that may contain information such as the {@link EntryValidator}.
@@ -35,20 +19,28 @@ public class StructureInfo<E extends Structure> extends SyntaxElementInfo<E> {
 	 */
 	public final boolean simple;
 
+	@ApiStatus.Experimental
+	public final SyntaxInfo.Structure.NodeType nodeType;
+
 	public StructureInfo(String[] patterns, Class<E> c, String originClassPath) throws IllegalArgumentException {
 		this(patterns, c, originClassPath, false);
 	}
 
-	public StructureInfo(String[] patterns, Class<E> c, String originClassPath, boolean simple) throws IllegalArgumentException {
-		super(patterns, c, originClassPath);
-		this.entryValidator = null;
-		this.simple = simple;
+	public StructureInfo(String[] patterns, Class<E> elementClass, String originClassPath, boolean simple) throws IllegalArgumentException {
+		this(patterns, elementClass, originClassPath, null, simple ? SyntaxInfo.Structure.NodeType.SIMPLE : SyntaxInfo.Structure.NodeType.SECTION);
+	}
+
+	public StructureInfo(String[] patterns, Class<E> elementClass, String originClassPath, @Nullable EntryValidator entryValidator) throws IllegalArgumentException {
+		this(patterns, elementClass, originClassPath, entryValidator, SyntaxInfo.Structure.NodeType.SECTION);
 	}
 
-	public StructureInfo(String[] patterns, Class<E> c, String originClassPath, EntryValidator entryValidator) throws IllegalArgumentException {
-		super(patterns, c, originClassPath);
+	@ApiStatus.Experimental
+	public StructureInfo(String[] patterns, Class<E> elementClass, String originClassPath,
+						 @Nullable EntryValidator entryValidator, SyntaxInfo.Structure.NodeType nodeType) throws IllegalArgumentException {
+		super(patterns, elementClass, originClassPath);
 		this.entryValidator = entryValidator;
-		this.simple = false;
+		this.nodeType = nodeType;
+		this.simple = nodeType.canBeSimple();
 	}
 
 }
diff --git a/src/main/java/org/skriptlang/skript/lang/util/Cyclical.java b/src/main/java/org/skriptlang/skript/lang/util/Cyclical.java
index 7c5def1d96f..81da4411d7b 100644
--- a/src/main/java/org/skriptlang/skript/lang/util/Cyclical.java
+++ b/src/main/java/org/skriptlang/skript/lang/util/Cyclical.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package org.skriptlang.skript.lang.util;
 
 /**
diff --git a/src/main/java/org/skriptlang/skript/lang/util/SkriptQueue.java b/src/main/java/org/skriptlang/skript/lang/util/SkriptQueue.java
new file mode 100644
index 00000000000..d730acf8a99
--- /dev/null
+++ b/src/main/java/org/skriptlang/skript/lang/util/SkriptQueue.java
@@ -0,0 +1,107 @@
+package org.skriptlang.skript.lang.util;
+
+import ch.njol.skript.lang.util.common.AnyAmount;
+import ch.njol.skript.util.Container;
+import ch.njol.yggdrasil.YggdrasilSerializable;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.*;
+
+/**
+ * A queue of elements.
+ * Elements will only be added to the queue if they are not null, with nothing happening if the elements are null.
+ */
+@Container.ContainerType(Object.class)
+public class SkriptQueue extends LinkedList<@NotNull Object>
+	implements Deque<Object>, Queue<Object>, YggdrasilSerializable, AnyAmount, Container<Object> {
+
+	@Override
+	public boolean add(Object element) {
+		if (element == null)
+			return false;
+		return super.add(element);
+	}
+
+	@Override
+	public void add(int index, Object element) {
+		if (element != null)
+			super.add(index, element);
+	}
+
+	@Override
+	public void addFirst(Object element) {
+		if (element != null)
+			super.addFirst(element);
+	}
+
+	@Override
+	public void addLast(Object element) {
+		if (element != null)
+			super.addLast(element);
+	}
+
+	@Override
+	public boolean contains(Object o) {
+		if (o == null)
+			return false;
+		return super.contains(o);
+	}
+
+	@Override
+	public Object set(int index, Object element) {
+		if (element == null)
+			return null;
+		return super.set(index, element);
+	}
+
+	@Override
+	public boolean addAll(int index, Collection<?> list) {
+		List<?> copy = new ArrayList<>(list);
+		copy.removeIf(Objects::isNull);
+		return super.addAll(index, copy);
+	}
+
+	@Override
+	public @NotNull Object @NotNull [] toArray() {
+		return super.toArray();
+	}
+
+	public Object removeSafely(int i) {
+		if (i >= 0 && i < this.size())
+			return this.remove(i);
+		return null;
+	}
+
+	/**
+	 * Removes a range of elements from the queue.
+	 * This will adjust the start/end of the range to be within the bounds of the queue,
+	 * to avoid throwing an error.
+	 *
+	 * @param fromIndex The starting index (inclusive)
+	 * @param toIndex The ending index (exclusive)
+	 * @return The removed entries
+	 */
+	public Object[] removeRangeSafely(int fromIndex, int toIndex) {
+		int from, to;
+		from = Math.min(this.size(), Math.min(fromIndex, toIndex));
+		to = Math.max(0, Math.max(fromIndex, toIndex));
+		ListIterator<Object> it = this.listIterator(from);
+		Object[] elements = new Object[to - from];
+		for (int i = 0, n = to - from; i < n; i++) {
+			elements[i] = it.next();
+			it.remove();
+		}
+		return elements;
+	}
+
+	@Override
+	public @NotNull Number amount() {
+		return this.size();
+	}
+
+	@Override
+	public Iterator<Object> containerIterator() {
+		return this.iterator();
+	}
+
+}
diff --git a/src/main/java/org/skriptlang/skript/localization/Localizer.java b/src/main/java/org/skriptlang/skript/localization/Localizer.java
new file mode 100644
index 00000000000..c237dd20a83
--- /dev/null
+++ b/src/main/java/org/skriptlang/skript/localization/Localizer.java
@@ -0,0 +1,66 @@
+package org.skriptlang.skript.localization;
+
+import org.jetbrains.annotations.ApiStatus;
+import org.jetbrains.annotations.Contract;
+import org.jetbrains.annotations.Nullable;
+import org.skriptlang.skript.addon.SkriptAddon;
+import org.skriptlang.skript.util.ViewProvider;
+
+/**
+ * A Localizer is used for the localization of translatable strings.
+ *
+ * This API is highly experimental and will be subject to change due to pending localization reworks.
+ * In its current state, it acts as a bridge between old and new API.
+ *
+ * @see ch.njol.skript.localization.Language
+ */
+@ApiStatus.Experimental
+public interface Localizer extends ViewProvider<Localizer> {
+
+	/**
+	 * @param addon The addon this localizer is localizing for.
+	 * @return A localizer with no default translations.
+	 */
+	@Contract("_ -> new")
+	static Localizer of(SkriptAddon addon) {
+		return new LocalizerImpl(addon);
+	}
+
+	/**
+	 * Sets the language file directories for this localizer.
+	 * This method will initiate a loading of any language files in the provided directories.
+	 * @param languageFileDirectory The path to the directory on the jar containing language files.
+	 * @param dataFileDirectory The path to the directory on the disk containing language files.
+	 * For example, this may include language files that have been saved to enable user customization.
+	 */
+	void setSourceDirectories(String languageFileDirectory, @Nullable String dataFileDirectory);
+
+	/**
+	 * @return The path to the directory on the jar containing language files.
+	 */
+	@Nullable String languageFileDirectory();
+
+	/**
+	 * @return The path to the directory on the disk containing language files.
+	 */
+	@Nullable String dataFileDirectory();
+
+	/**
+	 * Used for obtaining the translation of a language key.
+	 * @param key The key of the translation to obtain.
+	 * @return The translation represented by the provided key, or null if no translation exists.
+	 */
+	@Nullable String translate(String key);
+
+	/**
+	 * Constructs an unmodifiable view of this localizer.
+	 * That is, no new translations may be added.
+	 * @return An unmodifiable view of this localizer.
+	 */
+	@Override
+	@Contract("-> new")
+	default Localizer unmodifiableView() {
+		return new LocalizerImpl.UnmodifiableLocalizer(this);
+	}
+
+}
diff --git a/src/main/java/org/skriptlang/skript/localization/LocalizerImpl.java b/src/main/java/org/skriptlang/skript/localization/LocalizerImpl.java
new file mode 100644
index 00000000000..f35a9ee8eef
--- /dev/null
+++ b/src/main/java/org/skriptlang/skript/localization/LocalizerImpl.java
@@ -0,0 +1,74 @@
+package org.skriptlang.skript.localization;
+
+import ch.njol.skript.SkriptAPIException;
+import ch.njol.skript.localization.Language;
+import org.jetbrains.annotations.Nullable;
+import org.skriptlang.skript.addon.SkriptAddon;
+
+final class LocalizerImpl implements Localizer {
+
+	private final SkriptAddon addon;
+
+	LocalizerImpl(SkriptAddon addon) {
+		this.addon = addon;
+	}
+
+	private String languageFileDirectory;
+	private String dataFileDirectory;
+
+	@Override
+	public void setSourceDirectories(String languageFileDirectory, @Nullable String dataFileDirectory) {
+		if (this.languageFileDirectory != null) {
+			throw new SkriptAPIException("A localizer's source directories may only be set once.");
+		}
+		this.languageFileDirectory = languageFileDirectory;
+		this.dataFileDirectory = dataFileDirectory;
+		Language.loadDefault(addon);
+	}
+
+	@Override
+	public @Nullable String languageFileDirectory() {
+		return languageFileDirectory;
+	}
+
+	@Override
+	public @Nullable String dataFileDirectory() {
+		return dataFileDirectory;
+	}
+
+	@Override
+	public @Nullable String translate(String key) {
+		return Language.get_(key);
+	}
+
+	static final class UnmodifiableLocalizer implements Localizer {
+
+		private final Localizer localizer;
+
+		UnmodifiableLocalizer(Localizer localizer) {
+			this.localizer = localizer;
+		}
+
+		@Override
+		public void setSourceDirectories(String languageFileDirectory, @Nullable String dataFileDirectory) {
+			throw new UnsupportedOperationException("Cannot set the source directories of an unmodifiable Localizer.");
+		}
+
+		@Override
+		public @Nullable String languageFileDirectory() {
+			return localizer.languageFileDirectory();
+		}
+
+		@Override
+		public @Nullable String dataFileDirectory() {
+			return localizer.dataFileDirectory();
+		}
+
+		@Override
+		public @Nullable String translate(String key) {
+			return localizer.translate(key);
+		}
+
+	}
+
+}
diff --git a/src/main/java/org/skriptlang/skript/log/runtime/ErrorSource.java b/src/main/java/org/skriptlang/skript/log/runtime/ErrorSource.java
new file mode 100644
index 00000000000..df3664303b7
--- /dev/null
+++ b/src/main/java/org/skriptlang/skript/log/runtime/ErrorSource.java
@@ -0,0 +1,59 @@
+package org.skriptlang.skript.log.runtime;
+
+import ch.njol.skript.config.Node;
+import ch.njol.skript.doc.Name;
+import ch.njol.skript.lang.SyntaxElement;
+import org.jetbrains.annotations.Contract;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * A more versatile set of information about the source of an error.
+ * Aims to avoid relying specifically on {@link Node}s for information.
+ *
+ * @param syntaxType A string representing the type of syntax. See {@link SyntaxElement#getSyntaxTypeName()}.
+ * @param syntaxName The name of the syntax emitting the error.
+ * @param lineNumber The line number of the syntax emitting the error.
+ * @param lineText The raw code of the line.
+ * @param script The name of the script in which the line exists.
+ */
+public record ErrorSource(
+	String syntaxType,
+	String syntaxName,
+	int lineNumber,
+	String lineText,
+	String script
+) {
+
+	/**
+	 * Creates an error source using information from a given node and syntax element.
+	 * @param node The node to use for line, line number, and script name.
+	 * @param element The element to use for the type and name.
+	 * @return A new error source.
+	 */
+	public static @NotNull ErrorSource fromNodeAndElement(@Nullable Node node, @NotNull SyntaxElement element) {
+		Name annotation = element.getClass().getAnnotation(Name.class);
+		String elementName = annotation != null ? annotation.value().trim().replaceAll("\n", "") : element.getClass().getSimpleName();
+		if (node == null) {
+			return new ErrorSource(element.getSyntaxTypeName(), elementName, 0, "-unknown-", "-unknown-");
+		}
+		String code = node.save().trim();
+		return new ErrorSource(element.getSyntaxTypeName(), elementName, node.getLine(), code, node.getConfig().getFileName());
+	}
+
+	/**
+	 * @return The code location (line number and script name) of the source of the error.
+	 *         Used for hash maps.
+	 */
+	@Contract(" -> new")
+	public @NotNull Location location() {
+		return new Location(script, lineNumber);
+	}
+
+	/**
+	 * A code location (line number and script name).
+	 * Used for hash maps.
+	 */
+	public record Location(String script, int lineNumber) { }
+
+}
diff --git a/src/main/java/org/skriptlang/skript/log/runtime/Frame.java b/src/main/java/org/skriptlang/skript/log/runtime/Frame.java
new file mode 100644
index 00000000000..b2c909ce817
--- /dev/null
+++ b/src/main/java/org/skriptlang/skript/log/runtime/Frame.java
@@ -0,0 +1,124 @@
+package org.skriptlang.skript.log.runtime;
+
+import org.jetbrains.annotations.Contract;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.UnmodifiableView;
+import org.skriptlang.skript.log.runtime.ErrorSource.Location;
+
+import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
+
+/**
+ * Stores the accumulated runtime errors over a span of time, then prints them.
+ */
+public final class Frame {
+
+	/**
+	 * Store limits for the number of issues a frame can print per frame.
+	 * @param totalLimit total issues printed per frame
+	 * @param lineLimit issues printed by one line per frame
+	 * @param lineTimeoutLimit the limit at which a line will be put in timeout for exceeding.
+	 * @param timeoutDuration the duration a line will stay in timeout, in frames.
+	 */
+	public record FrameLimit(int totalLimit, int lineLimit, int lineTimeoutLimit, int timeoutDuration) { }
+
+	/**
+	 * Stores outputs of a frame.
+	 * @param totalErrors A map of error locations to number of errors produced for this frame.
+	 * @param skippedErrors A map of error locations to number of errors not printed for this frame.
+	 * @param newTimeouts A set of error locations that were timed out this frame.
+	 * @param frameLimits The limits this frame is using.
+	 */
+	public record FrameOutput(
+		@UnmodifiableView Map<Location, Integer> totalErrors,
+		@UnmodifiableView Map<Location, Integer> skippedErrors,
+		@UnmodifiableView Set<Location> newTimeouts,
+		FrameLimit frameLimits
+	) { }
+
+	private final FrameLimit limits;
+
+	private int printed;
+	private final Map<Location, Integer> lineTotals;
+	private final Map<Location, Integer> lineSkipped;
+	private final Map<Location, Integer> timeouts;
+
+	/**
+	 * Creates a blank frame with the given limits
+	 * @param limits The limits to use for when to skip or timeout.
+	 */
+	public Frame(FrameLimit limits) {
+		this.limits = limits;
+		lineTotals = new ConcurrentHashMap<>();
+		lineSkipped = new ConcurrentHashMap<>();
+		timeouts = new ConcurrentHashMap<>();
+	}
+
+	/**
+	 * Adds an error to this frame.
+	 * @param error The error to add.
+	 * @return Whether the error should be printed immediately.
+	 */
+	public boolean add(@NotNull RuntimeError error) {
+		Location location = error.source().location();
+		// increment counter
+		int lineTotal = lineTotals.compute(location, (key, count) -> (count == null ? 1 : count + 1));
+
+		// don't print if in timeout
+		if (timeouts.containsKey(location)) {
+			lineSkipped.compute(location, (key, count) -> (count == null ? 1 : count + 1));
+			return false;
+		}
+
+		// decide whether to print
+		if (printed < limits.totalLimit && lineTotal <= limits.lineLimit) {
+			printed++;
+			return true;
+		} else {
+			lineSkipped.compute(location, (key, count) -> (count == null ? 1 : count + 1));
+			if (lineTotal == limits.lineTimeoutLimit) {
+				timeouts.put(location, limits.timeoutDuration);
+			}
+			return false;
+		}
+	}
+
+	/**
+	 * Advances the frame to the next frame, clearing all stored totals and decrementing timeout counters.
+	 */
+	public void nextFrame() {
+		printed = 0;
+		lineTotals.clear();
+		lineSkipped.clear();
+		for (Iterator<Map.Entry<Location, Integer>> it = timeouts.entrySet().iterator(); it.hasNext(); ) {
+			Map.Entry<Location, Integer> entry = it.next();
+			if (entry.getValue() > 0) {
+				entry.setValue(entry.getValue() - 1);
+			} else {
+				it.remove();
+			}
+		}
+	}
+
+	/**
+	 * Gets the output data for a frame.
+	 * Returned data contains unmodifiable views of frame data, which is not guaranteed to stay valid.
+	 * @return The current output data of this frame.
+	 */
+	@Contract(" -> new")
+	public @NotNull FrameOutput getFrameOutput() {
+		Set<Location> newTimeouts = new HashSet<>();
+		for (Map.Entry<Location, Integer> entry : timeouts.entrySet()) {
+			if (entry.getValue() == limits.timeoutDuration) {
+				newTimeouts.add(entry.getKey());
+			}
+		}
+
+		return new FrameOutput(
+				Collections.unmodifiableMap(lineTotals),
+				Collections.unmodifiableMap(lineSkipped),
+				Collections.unmodifiableSet(newTimeouts),
+				limits);
+	}
+
+}
diff --git a/src/main/java/org/skriptlang/skript/log/runtime/RuntimeError.java b/src/main/java/org/skriptlang/skript/log/runtime/RuntimeError.java
new file mode 100644
index 00000000000..2b99be73382
--- /dev/null
+++ b/src/main/java/org/skriptlang/skript/log/runtime/RuntimeError.java
@@ -0,0 +1,14 @@
+package org.skriptlang.skript.log.runtime;
+
+import org.jetbrains.annotations.Nullable;
+
+import java.util.logging.Level;
+
+/**
+ * Represents a single instance of a runtime error.
+ * @param level The severity (warning or severe)
+ * @param source The source of the error
+ * @param error The message to display as the error
+ * @param toHighlight Optionally, the text within the emitting line to highlight.
+ */
+public record RuntimeError(Level level, ErrorSource source, String error, @Nullable String toHighlight) { }
diff --git a/src/main/java/org/skriptlang/skript/log/runtime/RuntimeErrorConsumer.java b/src/main/java/org/skriptlang/skript/log/runtime/RuntimeErrorConsumer.java
new file mode 100644
index 00000000000..21d271bfaca
--- /dev/null
+++ b/src/main/java/org/skriptlang/skript/log/runtime/RuntimeErrorConsumer.java
@@ -0,0 +1,25 @@
+package org.skriptlang.skript.log.runtime;
+
+import java.util.logging.Level;
+
+/**
+ * Consumes runtime errors. Some use cases include printing errors to console or redirecting to a Discord channel.
+ *
+ * @see org.skriptlang.skript.bukkit.log.runtime.BukkitRuntimeErrorConsumer
+ */
+public interface RuntimeErrorConsumer {
+
+	/**
+	 * Prints a single error with all its information.
+	 * @param error The error to print.
+	 */
+	void printError(RuntimeError error);
+
+	/**
+	 * Prints the output of a frame, including skipped errors, timeouts, and whatever other information required.
+	 * @param output An output object containing unmodifiable views of the frame data.
+	 * @param level The severity of this frame (error vs warning).
+	 */
+	void printFrameOutput(Frame.FrameOutput output, Level level);
+
+}
diff --git a/src/main/java/org/skriptlang/skript/log/runtime/RuntimeErrorManager.java b/src/main/java/org/skriptlang/skript/log/runtime/RuntimeErrorManager.java
new file mode 100644
index 00000000000..b44688da1c0
--- /dev/null
+++ b/src/main/java/org/skriptlang/skript/log/runtime/RuntimeErrorManager.java
@@ -0,0 +1,150 @@
+package org.skriptlang.skript.log.runtime;
+
+import ch.njol.skript.Skript;
+import ch.njol.skript.SkriptConfig;
+import ch.njol.skript.util.Task;
+import ch.njol.skript.util.Timespan;
+import org.jetbrains.annotations.ApiStatus;
+import org.jetbrains.annotations.NotNull;
+import org.skriptlang.skript.log.runtime.Frame.FrameLimit;
+
+import java.io.Closeable;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.logging.Level;
+
+/**
+ * Handles passing runtime errors between producers and consumers via a frame collection system.
+ * <br>
+ * The manager should be treated as a singleton and accessed via {@link #getInstance()}
+ * or {@link Skript#getRuntimeErrorManager()}. Changing the frame length or limits requires edits to the
+ * {@link SkriptConfig} values and a call to {@link #refresh()}. Reloading the config will automatically
+ * call {@link #refresh()}.
+ *
+ * @see RuntimeErrorConsumer
+ * @see RuntimeErrorProducer
+ * @see Frame
+ */
+public class RuntimeErrorManager implements Closeable {
+
+	private static RuntimeErrorManager instance;
+
+	/**
+	 * Prefer using {@link Skript#getRuntimeErrorManager()} instead.
+	 * @return The singleton instance of the runtime error manager.
+	 */
+	@ApiStatus.Internal
+	public static RuntimeErrorManager getInstance() {
+		return instance;
+	}
+
+	/**
+	 * Refreshes the runtime error manager for Skript, pulling from the config values.
+	 * Tracked consumers are maintained during refreshes.
+	 */
+	public static void refresh() {
+		long frameLength = SkriptConfig.runtimeErrorFrameDuration.value().getAs(Timespan.TimePeriod.TICK);
+
+		int errorLimit = SkriptConfig.runtimeErrorLimitTotal.value();
+		int errorLineLimit = SkriptConfig.runtimeErrorLimitLine.value();
+		int errorLineTimeout = SkriptConfig.runtimeErrorLimitLineTimeout.value();
+		int errorTimeoutLength = Math.max(SkriptConfig.runtimeErrorTimeoutDuration.value(), 1);
+		FrameLimit errorFrame = new FrameLimit(errorLimit, errorLineLimit, errorLineTimeout, errorTimeoutLength);
+
+		int warningLimit = SkriptConfig.runtimeWarningLimitTotal.value();
+		int warningLineLimit = SkriptConfig.runtimeWarningLimitLine.value();
+		int warningLineTimeout = SkriptConfig.runtimeWarningLimitLineTimeout.value();
+		int warningTimeoutLength = Math.max(SkriptConfig.runtimeWarningTimeoutDuration.value(), 1);
+		FrameLimit warningFrame = new FrameLimit(warningLimit, warningLineLimit, warningLineTimeout, warningTimeoutLength);
+
+		List<RuntimeErrorConsumer> oldConsumers = List.of();
+		if (instance != null) {
+			instance.close();
+			oldConsumers = instance.consumers;
+		}
+		instance = new RuntimeErrorManager(Math.max((int) frameLength, 1), errorFrame, warningFrame);
+		oldConsumers.forEach(consumer -> instance.addConsumer(consumer));
+	}
+
+	private final Frame errorFrame, warningFrame;
+	private final Task task;
+
+	private final List<RuntimeErrorConsumer> consumers = new ArrayList<>();
+
+	/**
+	 * Creates a new error manager, which also creates its own frames.
+	 * <br>
+	 * Must be closed when no longer being used.
+	 *
+	 * @param frameLength The length of a frame in ticks.
+	 * @param errorLimits The limits to the error frame.
+	 * @param warningLimits The limits to the warning frame.
+	 */
+	public RuntimeErrorManager(int frameLength, FrameLimit errorLimits, FrameLimit warningLimits) {
+		errorFrame = new Frame(errorLimits);
+		warningFrame = new Frame(warningLimits);
+		task = new Task(Skript.getInstance(), frameLength, frameLength, true) {
+			@Override
+			public void run() {
+				consumers.forEach(consumer -> consumer.printFrameOutput(errorFrame.getFrameOutput(), Level.SEVERE));
+				errorFrame.nextFrame();
+
+				consumers.forEach(consumer -> consumer.printFrameOutput(warningFrame.getFrameOutput(), Level.WARNING));
+				warningFrame.nextFrame();
+			}
+		};
+	}
+
+	/**
+	 * Emits a warning or error depending on severity. Errors are passed to their respective {@link Frame}s for processing.
+	 * @param error The error to emit.
+	 */
+	public void error(@NotNull RuntimeError error) {
+		// print if < limit
+		if ((error.level() == Level.SEVERE && errorFrame.add(error))
+			|| (error.level() == Level.WARNING && warningFrame.add(error))) {
+			consumers.forEach((consumer -> consumer.printError(error)));
+		}
+	}
+
+	/**
+	 * @return The frame containing emitted errors.
+	 */
+	public Frame getErrorFrame() {
+		return errorFrame;
+	}
+
+	/**
+	 * @return The frame containing emitted warnings.
+	 */
+	public Frame getWarningFrame() {
+		return warningFrame;
+	}
+
+	/**
+	 * Adds a {@link RuntimeErrorConsumer} that will receive the emitted errors and frame output data.
+	 * Consumers will be maintained when the manager is refreshed.
+	 * @param consumer The consumer to add.
+	 */
+	public void addConsumer(RuntimeErrorConsumer consumer) {
+		synchronized (consumers) {
+			consumers.add(consumer);
+		}
+	}
+
+	/**
+	 * Removes a {@link RuntimeErrorConsumer} from the tracked list.
+	 * @param consumer The consumer to remove.
+	 */
+	public void removeConsumer(RuntimeErrorConsumer consumer) {
+		synchronized (consumers) {
+			consumers.remove(consumer);
+		}
+	}
+
+	@Override
+	public void close() {
+		task.close();
+	}
+
+}
diff --git a/src/main/java/org/skriptlang/skript/log/runtime/RuntimeErrorProducer.java b/src/main/java/org/skriptlang/skript/log/runtime/RuntimeErrorProducer.java
new file mode 100644
index 00000000000..f6a5c02fa03
--- /dev/null
+++ b/src/main/java/org/skriptlang/skript/log/runtime/RuntimeErrorProducer.java
@@ -0,0 +1,92 @@
+package org.skriptlang.skript.log.runtime;
+
+import ch.njol.skript.Skript;
+import org.jetbrains.annotations.Contract;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.logging.Level;
+
+/**
+ * A RuntimeErrorProducer can throw runtime errors in a standardized and controlled manner.
+ */
+public interface RuntimeErrorProducer {
+
+	/**
+	 * Gets the source of the errors produced by the implementing class.
+	 * Most extending interfaces should provide a default implementation of this method for ease of use.
+	 * @see SyntaxRuntimeErrorProducer
+	 * @return The source of the error.
+	 */
+	@Contract(" -> new")
+	@NotNull ErrorSource getErrorSource();
+
+	/**
+	 * Dispatches a runtime error with the given text.
+	 * Metadata will be provided along with the message, including line number, the docs name of the producer,
+	 * and the line content.
+	 * <br>
+	 * Implementations should ensure they call super() to print the error.
+	 *
+	 * @param message The text to display as the error message.
+	 */
+	default void error(String message) {
+		getRuntimeErrorManager().error(
+			new RuntimeError(Level.SEVERE, getErrorSource(), message, null)
+		);
+	}
+
+	/**
+	 * Dispatches a runtime error with the given text and syntax highlighting.
+	 * Metadata will be provided along with the message, including line number, the docs name of the producer,
+	 * and the line content.
+	 * <br>
+	 * Implementations should ensure they call super() to print the error.
+	 *
+	 * @param message The text to display as the error message.
+	 * @param highlight The text to highlight in the parsed syntax.
+	 */
+	default void error(String message, String highlight) {
+		getRuntimeErrorManager().error(
+			new RuntimeError(Level.SEVERE, getErrorSource(), message, highlight)
+		);
+	}
+
+	/**
+	 * Dispatches a runtime warning with the given text.
+	 * Metadata will be provided along with the message, including line number, the docs name of the producer,
+	 * and the line content.
+	 * <br>
+	 * Implementations should ensure they call super() to print the warning.
+	 *
+	 * @param message The text to display as the error message.
+	 */
+	default void warning(String message) {
+		getRuntimeErrorManager().error(
+			new RuntimeError(Level.WARNING, getErrorSource(), message, null)
+		);
+	}
+
+	/**
+	 * Dispatches a runtime warning with the given text and syntax highlighting.
+	 * Metadata will be provided along with the message, including line number, the docs name of the producer,
+	 * and the line content.
+	 * <br>
+	 * Implementations should ensure they call super() to print the warning.
+	 *
+	 * @param message The text to display as the error message.
+	 * @param highlight The text to highlight in the parsed syntax.
+	 */
+	default void warning(String message, String highlight) {
+		getRuntimeErrorManager().error(
+			new RuntimeError(Level.WARNING, getErrorSource(), message, highlight)
+		);
+	}
+
+	/**
+	 * @return The manager this producer will send errors to.
+	 */
+	default RuntimeErrorManager getRuntimeErrorManager() {
+		return Skript.getRuntimeErrorManager();
+	}
+
+}
diff --git a/src/main/java/org/skriptlang/skript/log/runtime/SyntaxRuntimeErrorProducer.java b/src/main/java/org/skriptlang/skript/log/runtime/SyntaxRuntimeErrorProducer.java
new file mode 100644
index 00000000000..6dfe8648700
--- /dev/null
+++ b/src/main/java/org/skriptlang/skript/log/runtime/SyntaxRuntimeErrorProducer.java
@@ -0,0 +1,34 @@
+package org.skriptlang.skript.log.runtime;
+
+import ch.njol.skript.config.Node;
+import ch.njol.skript.lang.Expression;
+import ch.njol.skript.lang.SkriptParser;
+import ch.njol.skript.lang.SyntaxElement;
+import ch.njol.skript.lang.parser.ParserInstance;
+import ch.njol.util.Kleenean;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * A runtime error producer intended for use with {@link SyntaxElement}s. Uses {@link Node}s to determine source.
+ */
+public interface SyntaxRuntimeErrorProducer extends RuntimeErrorProducer {
+
+	/**
+	 * Returns the source {@link Node} for any errors the implementing class emits.
+	 * <br>
+	 * Used for accessing the line contents via {@link Node#getKey()}
+	 * and the line number via {@link Node#getLine()}.
+	 * <br>
+	 * A standard implementation is to store the Node during
+	 * {@link SyntaxElement#init(Expression[], int, Kleenean, SkriptParser.ParseResult)}
+	 * via {@link ParserInstance#getNode()}.
+	 * @return The source that produced a runtime error.
+	 */
+	Node getNode();
+
+	@Override
+	default @NotNull ErrorSource getErrorSource() {
+		return ErrorSource.fromNodeAndElement(getNode(), (SyntaxElement) this);
+	}
+
+}
diff --git a/src/main/java/org/skriptlang/skript/registration/DefaultSyntaxInfos.java b/src/main/java/org/skriptlang/skript/registration/DefaultSyntaxInfos.java
new file mode 100644
index 00000000000..1e019ff4ce4
--- /dev/null
+++ b/src/main/java/org/skriptlang/skript/registration/DefaultSyntaxInfos.java
@@ -0,0 +1,183 @@
+package org.skriptlang.skript.registration;
+
+import org.jetbrains.annotations.ApiStatus;
+import org.jetbrains.annotations.Contract;
+import org.jetbrains.annotations.Nullable;
+import org.skriptlang.skript.lang.entry.EntryValidator;
+import org.skriptlang.skript.registration.DefaultSyntaxInfosImpl.ExpressionImpl;
+import org.skriptlang.skript.registration.DefaultSyntaxInfosImpl.StructureImpl;
+
+/**
+ * This class is not safe to be directly referenced.
+ * Use {@link SyntaxInfo} instead.
+ */
+@ApiStatus.Internal
+@ApiStatus.Experimental
+public interface DefaultSyntaxInfos {
+
+	/**
+	 * A syntax info to be used for {@link ch.njol.skript.lang.Expression}s.
+	 * It differs from a typical info in that it also has a return type.
+	 * @param <E> The class providing the implementation of the Expression this info represents.
+	 * @param <R> The type of the return type of the Expression.
+	 */
+	@ApiStatus.Experimental
+	interface Expression<E extends ch.njol.skript.lang.Expression<R>, R> extends SyntaxInfo<E> {
+
+		/**
+		 * Constructs a builder for an expression syntax info.
+		 * @param expressionClass The Expression class the info will represent.
+		 * @param returnType The class representing the supertype of all values the Expression may return.
+		 * @return An Expression-specific builder for creating a syntax info representing <code>expressionClass</code>.
+		 * @param <E> The class providing the implementation of the Expression this info represents.
+		 * @param <R> The supertype of all values the Expression may return.
+		 */
+		@Contract("_, _ -> new")
+		static <E extends ch.njol.skript.lang.Expression<R>, R> Builder<? extends Builder<?, E, R>, E, R> builder(
+			Class<E> expressionClass, Class<R> returnType) {
+			return new ExpressionImpl.BuilderImpl<>(expressionClass, returnType);
+		}
+
+		/**
+		 * {@inheritDoc}
+		 */
+		@Override
+		@Contract("-> new")
+		Builder<? extends Builder<?, E, R>, E, R> toBuilder();
+
+		/**
+		 * @return The class representing the supertype of all values the Expression may return.
+		 */
+		Class<R> returnType();
+
+		/**
+		 * An Expression-specific builder is used for constructing a new Expression syntax info.
+		 * @see #builder(Class)
+		 * @param <B> The type of builder being used.
+		 * @param <E> The Expression class providing the implementation of the syntax info being built.
+		 * @param <R> The type of the return type of the Expression.
+		 */
+		interface Builder<B extends Builder<B, E, R>, E extends ch.njol.skript.lang.Expression<R>, R> extends SyntaxInfo.Builder<B, E> {
+
+			/**
+			 * {@inheritDoc}
+			 */
+			@Override
+			@Contract("-> new")
+			Expression<E, R> build();
+
+		}
+
+	}
+
+	/**
+	 * A syntax info to be used for {@link org.skriptlang.skript.lang.structure.Structure}s.
+	 * It contains additional details including the {@link EntryValidator} to use, if any.
+	 * @param <E> The class providing the implementation of the Structure this info represents.
+	 */
+	@ApiStatus.Experimental
+	interface Structure<E extends org.skriptlang.skript.lang.structure.Structure> extends SyntaxInfo<E> {
+
+		/**
+		 * Represents type of {@link ch.njol.skript.config.Node}s that can represent a Structure.
+		 */
+		enum NodeType {
+
+			/**
+			 * For Structures that can be represented using a {@link ch.njol.skript.config.SimpleNode}.
+			 */
+			SIMPLE,
+
+			/**
+			 * For Structures that can be represented using a {@link ch.njol.skript.config.SectionNode}.
+			 */
+			SECTION,
+
+			/**
+			 * For Structures that can be represented using a
+			 *  {@link ch.njol.skript.config.SimpleNode} or {@link ch.njol.skript.config.SectionNode}.
+			 */
+			BOTH;
+
+			/**
+			 * @return Whether a Structure of this type can be represented using a {@link ch.njol.skript.config.SimpleNode}.
+			 */
+			public boolean canBeSimple() {
+				return this != SECTION;
+			}
+
+			/**
+			 * @return Whether a Structure of this type can be represented using a {@link ch.njol.skript.config.SectionNode}.
+			 */
+			public boolean canBeSection() {
+				return this != SIMPLE;
+			}
+
+		}
+
+		/**
+		 * Constructs a builder for a structure syntax info.
+		 * @param structureClass The Structure class the info will represent.
+		 * @return A Structure-specific builder for creating a syntax info representing <code>structureClass</code>.
+		 * By default, the {@link #nodeType()} of the builder is {@link NodeType#SECTION}.
+		 * @param <E> The class providing the implementation of the Structure this info represents.
+		 */
+		@Contract("_ -> new")
+		static <E extends org.skriptlang.skript.lang.structure.Structure> Builder<? extends Builder<?, E>, E> builder(Class<E> structureClass) {
+			return new StructureImpl.BuilderImpl<>(structureClass);
+		}
+
+		/**
+		 * {@inheritDoc}
+		 */
+		@Override
+		@Contract("-> new")
+		Builder<? extends Builder<?, E>, E> toBuilder();
+
+		/**
+		 * @return The entry validator to use for handling the Structure's entries.
+		 *  If null, the Structure is expected to manually handle any entries.
+		 */
+		@Nullable EntryValidator entryValidator();
+
+		/**
+		 * @return The type of {@link ch.njol.skript.config.Node}s that can represent the Structure.
+		 */
+		NodeType nodeType();
+
+		/**
+		 * A Structure-specific builder is used for constructing a new Structure syntax info.
+		 * @see #builder(Class)
+		 * @param <B> The type of builder being used.
+		 * @param <E> The Structure class providing the implementation of the syntax info being built.
+		 */
+		interface Builder<B extends Builder<B, E>, E extends org.skriptlang.skript.lang.structure.Structure> extends SyntaxInfo.Builder<B, E> {
+
+			/**
+			 * Sets the entry validator the Structure will use for handling entries.
+			 * @param entryValidator The entry validator to use.
+			 * @return This builder.
+			 * @see Structure#entryValidator()
+			 */
+			@Contract("_ -> this")
+			B entryValidator(EntryValidator entryValidator);
+
+			/**
+			 * Sets the type of {@link ch.njol.skript.config.Node}s that can represent the Structure.
+			 * @return This builder.
+			 * @see Structure#type()
+			 */
+			B nodeType(NodeType type);
+
+			/**
+			 * {@inheritDoc}
+			 */
+			@Override
+			@Contract("-> new")
+			Structure<E> build();
+
+		}
+
+	}
+
+}
diff --git a/src/main/java/org/skriptlang/skript/registration/DefaultSyntaxInfosImpl.java b/src/main/java/org/skriptlang/skript/registration/DefaultSyntaxInfosImpl.java
new file mode 100644
index 00000000000..30350bf75a9
--- /dev/null
+++ b/src/main/java/org/skriptlang/skript/registration/DefaultSyntaxInfosImpl.java
@@ -0,0 +1,200 @@
+package org.skriptlang.skript.registration;
+
+import com.google.common.base.MoreObjects;
+import com.google.common.base.Preconditions;
+import org.jetbrains.annotations.Nullable;
+import org.skriptlang.skript.lang.entry.EntryValidator;
+import org.skriptlang.skript.util.Priority;
+
+import java.util.Collection;
+import java.util.Objects;
+import java.util.function.Supplier;
+
+final class DefaultSyntaxInfosImpl {
+
+	/**
+	 * {@inheritDoc}
+	 */
+	static class ExpressionImpl<E extends ch.njol.skript.lang.Expression<R>, R>
+		extends SyntaxInfoImpl<E> implements DefaultSyntaxInfos.Expression<E, R> {
+
+		private final Class<R> returnType;
+
+		ExpressionImpl(
+			SyntaxOrigin origin, Class<E> type, @Nullable Supplier<E> supplier,
+			Collection<String> patterns, Priority priority, @Nullable Class<R> returnType
+		) {
+			super(origin, type, supplier, patterns, priority);
+			Preconditions.checkNotNull(returnType, "An expression syntax info must have a return type.");
+			this.returnType = returnType;
+		}
+
+		@Override
+		public Expression.Builder<? extends Expression.Builder<?, E, R>, E, R> toBuilder() {
+			var builder = new BuilderImpl<>(type(), returnType);
+			super.toBuilder().applyTo(builder);
+			return builder;
+		}
+
+		@Override
+		public Class<R> returnType() {
+			return returnType;
+		}
+
+		@Override
+		public boolean equals(Object other) {
+			return other instanceof Expression<?, ?> expression &&
+					super.equals(other) &&
+					returnType() == expression.returnType();
+		}
+
+		@Override
+		public int hashCode() {
+			return Objects.hash(super.hashCode(), returnType());
+		}
+
+		@Override
+		public String toString() {
+			return MoreObjects.toStringHelper(this)
+					.add("origin", origin())
+					.add("type", type())
+					.add("patterns", patterns())
+					.add("priority", priority())
+					.add("returnType", returnType())
+					.toString();
+		}
+
+		/**
+		 * {@inheritDoc}
+		 */
+		static final class BuilderImpl<B extends Expression.Builder<B, E, R>, E extends ch.njol.skript.lang.Expression<R>, R>
+			extends SyntaxInfoImpl.BuilderImpl<B, E>
+			implements Expression.Builder<B, E, R> {
+
+			private final Class<R> returnType;
+
+			BuilderImpl(Class<E> expressionClass, Class<R> returnType) {
+				super(expressionClass);
+				this.returnType = returnType;
+			}
+
+			public Expression<E, R> build() {
+				return new ExpressionImpl<>(origin, type, supplier, patterns, priority, returnType);
+			}
+		}
+
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	static class StructureImpl<E extends org.skriptlang.skript.lang.structure.Structure>
+		extends SyntaxInfoImpl<E> implements DefaultSyntaxInfos.Structure<E> {
+
+		private final @Nullable EntryValidator entryValidator;
+		private final NodeType nodeType;
+
+		StructureImpl(
+			SyntaxOrigin origin, Class<E> type, @Nullable Supplier<E> supplier,
+			Collection<String> patterns, Priority priority,
+			@Nullable EntryValidator entryValidator, NodeType nodeType
+		) {
+			super(origin, type, supplier, patterns, priority);
+			if (!nodeType.canBeSection() && entryValidator != null)
+				throw new IllegalArgumentException("Simple Structures cannot have an EntryValidator");
+			this.entryValidator = entryValidator;
+			this.nodeType = nodeType;
+		}
+
+		@Override
+		public Structure.Builder<? extends Structure.Builder<?, E>, E> toBuilder() {
+			var builder = new BuilderImpl<>(type());
+			super.toBuilder().applyTo(builder);
+			if (entryValidator != null) {
+				builder.entryValidator(entryValidator);
+			}
+			builder.nodeType(nodeType);
+			return builder;
+		}
+
+		@Override
+		public @Nullable EntryValidator entryValidator() {
+			return entryValidator;
+		}
+
+		@Override
+		public NodeType nodeType() {
+			return nodeType;
+		}
+
+		@Override
+		public boolean equals(Object other) {
+			return other instanceof Structure<?> structure &&
+					super.equals(other) &&
+					Objects.equals(entryValidator(), structure.entryValidator()) &&
+					Objects.equals(nodeType(), structure.nodeType());
+		}
+
+		@Override
+		public int hashCode() {
+			return Objects.hash(super.hashCode(), entryValidator(), nodeType());
+		}
+
+		@Override
+		public String toString() {
+			return MoreObjects.toStringHelper(this)
+					.add("origin", origin())
+					.add("type", type())
+					.add("patterns", patterns())
+					.add("priority", priority())
+					.add("entryValidator", entryValidator())
+					.toString();
+		}
+
+		/**
+		 * {@inheritDoc}
+		 */
+		@SuppressWarnings("unchecked")
+		static final class BuilderImpl<B extends Structure.Builder<B, E>, E extends org.skriptlang.skript.lang.structure.Structure>
+			extends SyntaxInfoImpl.BuilderImpl<B, E>
+			implements Structure.Builder<B, E> {
+
+			private @Nullable EntryValidator entryValidator;
+			private NodeType nodeType = NodeType.SECTION;
+
+			BuilderImpl(Class<E> structureClass) {
+				super(structureClass);
+			}
+
+			@Override
+			public B entryValidator(EntryValidator entryValidator) {
+				this.entryValidator = entryValidator;
+				return (B) this;
+			}
+
+			@Override
+			public B nodeType(NodeType nodeType) {
+				this.nodeType = nodeType;
+				return (B) this;
+			}
+
+			public Structure<E> build() {
+				return new StructureImpl<>(origin, type, supplier, patterns, priority, entryValidator, nodeType);
+			}
+
+			@Override
+			public void applyTo(SyntaxInfo.Builder<?, ?> builder) {
+				super.applyTo(builder);
+				//noinspection rawtypes - Should be safe, generics will not influence this
+				if (builder instanceof Structure.Builder structureBuilder) {
+					if (entryValidator != null) {
+						structureBuilder.entryValidator(entryValidator);
+					}
+					structureBuilder.nodeType(nodeType);
+				}
+			}
+		}
+
+	}
+
+}
diff --git a/src/main/java/org/skriptlang/skript/registration/SyntaxInfo.java b/src/main/java/org/skriptlang/skript/registration/SyntaxInfo.java
new file mode 100644
index 00000000000..693c294d373
--- /dev/null
+++ b/src/main/java/org/skriptlang/skript/registration/SyntaxInfo.java
@@ -0,0 +1,170 @@
+package org.skriptlang.skript.registration;
+
+import ch.njol.skript.lang.SyntaxElement;
+import org.jetbrains.annotations.ApiStatus;
+import org.jetbrains.annotations.Contract;
+import org.jetbrains.annotations.Unmodifiable;
+import org.skriptlang.skript.registration.SyntaxInfoImpl.BuilderImpl;
+import org.skriptlang.skript.util.Priority;
+
+import java.util.Collection;
+import java.util.function.Supplier;
+
+/**
+ * A syntax info contains the details of a syntax, including its origin and patterns.
+ * @param <E> The class providing the implementation of the syntax this info represents.
+ */
+@ApiStatus.Experimental
+public interface SyntaxInfo<E extends SyntaxElement> extends DefaultSyntaxInfos {
+
+	/**
+	 * A priority for infos with patterns that only match simple text (they do not have any {@link Expression}s).
+	 * Example: "[the] console"
+	 */
+	Priority SIMPLE = Priority.base();
+
+	/**
+	 * A priority for infos with patterns that contain at least one {@link Expression}.
+	 * This is typically the default priority of an info.
+	 * Example: "[the] first %number% characters of %strings%"
+	 */
+	Priority COMBINED = Priority.after(SIMPLE);
+
+	/**
+	 * A priority for infos with patterns that can match almost anything.
+	 * This is likely the case when using regex or multiple expressions next to each other in a pattern.
+	 * Example: "[the] [loop-]<.+>"
+	 */
+	Priority PATTERN_MATCHES_EVERYTHING = Priority.after(COMBINED);
+
+	/**
+	 * Constructs a builder for a syntax info.
+	 * @param type The syntax class the info will represent.
+	 * @return A builder for creating a syntax info representing <code>type</code>.
+	 */
+	@Contract("_ -> new")
+	static <E extends SyntaxElement> Builder<? extends Builder<?, E>, E> builder(Class<E> type) {
+		return new BuilderImpl<>(type);
+	}
+
+	/**
+	 * @return A builder representing this SyntaxInfo.
+	 */
+	@Contract("-> new")
+	Builder<? extends Builder<?, E>, E> toBuilder();
+
+	/**
+	 * @return The origin of this syntax.
+	 */
+	SyntaxOrigin origin();
+
+	/**
+	 * @return The class providing the implementation of this syntax.
+	 */
+	Class<E> type();
+
+	/**
+	 * @return A new instance of the class providing the implementation of this syntax.
+	 */
+	@Contract("-> new")
+	E instance();
+
+	/**
+	 * @return The patterns of this syntax.
+	 */
+	@Unmodifiable Collection<String> patterns();
+
+	/**
+	 * @return The priority of this syntax, which dictates its position for matching during parsing.
+	 */
+	Priority priority();
+
+	/**
+	 * A builder is used for constructing a new syntax info.
+	 * @see #builder(Class)
+	 * @param <B> The type of builder being used.
+	 * @param <E> The class providing the implementation of the syntax info being built.
+	 */
+	interface Builder<B extends Builder<B, E>, E extends SyntaxElement> {
+
+		/**
+		 * Sets the origin the syntax info will use.
+		 * @param origin The origin to use.
+		 * @return This builder.
+		 * @see SyntaxInfo#origin()
+		 */
+		@Contract("_ -> this")
+		B origin(SyntaxOrigin origin);
+
+		/**
+		 * Sets the supplier the syntax info will use to create new instances of the implementing class.
+		 * @param supplier The supplier to use.
+		 * @return This builder.
+		 * @see SyntaxInfo#instance()
+		 */
+		@Contract("_ -> this")
+		B supplier(Supplier<E> supplier);
+
+		/**
+		 * Adds a new pattern to the syntax info.
+		 * @param pattern The pattern to add.
+		 * @return This builder.
+		 * @see SyntaxInfo#patterns()
+		 */
+		@Contract("_ -> this")
+		B addPattern(String pattern);
+
+		/**
+		 * Adds new patterns to the syntax info.
+		 * @param patterns The patterns to add.
+		 * @return This builder.
+		 * @see SyntaxInfo#patterns()
+		 */
+		@Contract("_ -> this")
+		B addPatterns(String... patterns);
+
+		/**
+		 * Adds new patterns to the syntax info.
+		 * @param patterns The patterns to add.
+		 * @return This builder.
+		 * @see SyntaxInfo#patterns()
+		 */
+		@Contract("_ -> this")
+		B addPatterns(Collection<String> patterns);
+
+		/**
+		 * Removes all patterns from the syntax info.
+		 * @return This builder.
+		 * @see SyntaxInfo#patterns()
+		 */
+		@Contract("-> this")
+		B clearPatterns();
+
+		/**
+		 * Sets the priority the syntax info will use, which dictates its position for matching during parsing.
+		 * @param priority The priority to use.
+		 * @return This builder.
+		 */
+		@Contract("_ -> this")
+		B priority(Priority priority);
+
+		/**
+		 * Builds a new syntax info from the set details.
+		 * @return A syntax info representing the class providing the syntax's implementation.
+		 */
+		@Contract("-> new")
+		SyntaxInfo<E> build();
+
+		/**
+		 * Applies the values of this builder onto <code>builder</code>.
+		 * When using this method, it is possible that <b>some values are not safe to copy over</b>.
+		 * For example, when applying a SyntaxInfo for some type to a SyntaxInfo of another type,
+		 * it is *not* safe to copy over {@link #supplier(Supplier)}, but that operation will occur anyway.
+		 * In cases like this, you are expected to correct the values.
+		 * @param builder The builder to apply values onto.
+		 */
+		void applyTo(Builder<?, ?> builder);
+
+	}
+
+}
diff --git a/src/main/java/org/skriptlang/skript/registration/SyntaxInfoImpl.java b/src/main/java/org/skriptlang/skript/registration/SyntaxInfoImpl.java
new file mode 100644
index 00000000000..82c436f48e0
--- /dev/null
+++ b/src/main/java/org/skriptlang/skript/registration/SyntaxInfoImpl.java
@@ -0,0 +1,198 @@
+package org.skriptlang.skript.registration;
+
+import ch.njol.skript.lang.SyntaxElement;
+import com.google.common.base.MoreObjects;
+import com.google.common.base.Preconditions;
+import com.google.common.collect.ImmutableList;
+import org.jetbrains.annotations.Nullable;
+import org.jetbrains.annotations.Unmodifiable;
+import org.skriptlang.skript.util.ClassUtils;
+import org.skriptlang.skript.util.Priority;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.Objects;
+import java.util.function.Supplier;
+
+class SyntaxInfoImpl<T extends SyntaxElement> implements SyntaxInfo<T> {
+
+	private final SyntaxOrigin origin;
+	private final Class<T> type;
+	private final @Nullable Supplier<T> supplier;
+	private final Collection<String> patterns;
+	private final Priority priority;
+
+	protected SyntaxInfoImpl(
+		SyntaxOrigin origin, Class<T> type, @Nullable Supplier<T> supplier,
+		Collection<String> patterns, Priority priority
+	) {
+		Preconditions.checkArgument(supplier != null || ClassUtils.isNormalClass(type),
+				"Failed to register a syntax info for '" + type.getName() + "'."
+				+ " Element classes must be a normal type unless a supplier is provided.");
+		Preconditions.checkArgument(!patterns.isEmpty(),
+				"Failed to register a syntax info for '" + type.getName() + "'."
+				+ " There must be at least one pattern.");
+		this.origin = origin;
+		this.type = type;
+		this.supplier = supplier;
+		this.patterns = ImmutableList.copyOf(patterns);
+		this.priority = priority;
+	}
+
+	@Override
+	public Builder<? extends Builder<?, T>, T> toBuilder() {
+		var builder = new BuilderImpl<>(type);
+		builder.origin(origin);
+		if (supplier != null) {
+			builder.supplier(supplier);
+		}
+		builder.addPatterns(patterns);
+		builder.priority(priority);
+		return builder;
+	}
+
+	@Override
+	public SyntaxOrigin origin() {
+		return origin;
+	}
+
+	@Override
+	public Class<T> type() {
+		return type;
+	}
+
+	@Override
+	public T instance() {
+		try {
+			return supplier == null ? type.getDeclaredConstructor().newInstance() : supplier.get();
+		} catch (ReflectiveOperationException e) {
+			throw new RuntimeException(e);
+		}
+	}
+
+	@Override
+	public @Unmodifiable Collection<String> patterns() {
+		return patterns;
+	}
+
+	@Override
+	public Priority priority() {
+		return priority;
+	}
+
+	@Override
+	public boolean equals(Object other) {
+		if (this == other) {
+			return true;
+		}
+		return other instanceof SyntaxInfo<?> info &&
+				Objects.equals(origin(), info.origin()) &&
+				Objects.equals(type(), info.type()) &&
+				Objects.equals(patterns(), info.patterns()) &&
+				Objects.equals(priority(), info.priority());
+	}
+
+	@Override
+	public int hashCode() {
+		return Objects.hash(origin(), type(), patterns(), priority());
+	}
+
+	@Override
+	public String toString() {
+		return MoreObjects.toStringHelper(this)
+				.add("origin", origin())
+				.add("type", type())
+				.add("patterns", patterns())
+				.add("priority", priority())
+				.toString();
+	}
+
+	@SuppressWarnings("unchecked")
+	static class BuilderImpl<B extends Builder<B, E>, E extends SyntaxElement> implements Builder<B, E> {
+
+		/**
+		 * A default origin that describes the class of a syntax.
+		 */
+		private static final class ClassOrigin implements SyntaxOrigin {
+
+			private final String name;
+
+			ClassOrigin(Class<?> clazz) {
+				this.name = clazz.getName();
+			}
+
+			@Override
+			public String name() {
+				return name;
+			}
+
+		}
+
+		final Class<E> type;
+		SyntaxOrigin origin;
+		@Nullable Supplier<E> supplier;
+		final List<String> patterns = new ArrayList<>();
+		Priority priority = SyntaxInfo.COMBINED;
+
+		BuilderImpl(Class<E> type) {
+			this.type = type;
+			origin = new ClassOrigin(type);
+		}
+
+		public B origin(SyntaxOrigin origin) {
+			this.origin = origin;
+			return (B) this;
+		}
+
+		public B supplier(Supplier<E> supplier) {
+			this.supplier = supplier;
+			return (B) this;
+		}
+
+		public B addPattern(String pattern) {
+			this.patterns.add(pattern);
+			return (B) this;
+		}
+
+		public B addPatterns(String... patterns) {
+			Collections.addAll(this.patterns, patterns);
+			return (B) this;
+		}
+
+		public B addPatterns(Collection<String> patterns) {
+			this.patterns.addAll(patterns);
+			return (B) this;
+		}
+
+		@Override
+		public B clearPatterns() {
+			this.patterns.clear();
+			return (B) this;
+		}
+
+		@Override
+		public B priority(Priority priority) {
+			this.priority = priority;
+			return (B) this;
+		}
+
+		public SyntaxInfo<E> build() {
+			return new SyntaxInfoImpl<>(origin, type, supplier, patterns, priority);
+		}
+
+		@Override
+		public void applyTo(Builder<?, ?> builder) {
+			builder.origin(origin);
+			if (supplier != null) {
+				//noinspection rawtypes - Let's hope the user knows what they are doing...
+				builder.supplier((Supplier) supplier);
+			}
+			builder.addPatterns(patterns);
+			builder.priority(priority);
+		}
+
+	}
+
+}
diff --git a/src/main/java/org/skriptlang/skript/registration/SyntaxOrigin.java b/src/main/java/org/skriptlang/skript/registration/SyntaxOrigin.java
new file mode 100644
index 00000000000..b5e8aa9d552
--- /dev/null
+++ b/src/main/java/org/skriptlang/skript/registration/SyntaxOrigin.java
@@ -0,0 +1,60 @@
+package org.skriptlang.skript.registration;
+
+import org.jetbrains.annotations.ApiStatus;
+import org.jetbrains.annotations.Contract;
+import org.skriptlang.skript.addon.SkriptAddon;
+
+/**
+ * The origin of a syntax, currently only used for documentation purposes.
+ */
+@FunctionalInterface
+@ApiStatus.Experimental
+public interface SyntaxOrigin {
+
+	/**
+	 * Constructs a syntax origin from an addon.
+	 * @param addon The addon to construct this origin from.
+	 * @return An origin pointing to the provided addon.
+	 */
+	@Contract("_ -> new")
+	static SyntaxOrigin of(SkriptAddon addon) {
+		return new AddonOrigin(addon);
+	}
+
+	/**
+	 * A basic origin describing the addon a syntax has originated from.
+	 * @see SyntaxOrigin#of(SkriptAddon)
+	 */
+	final class AddonOrigin implements SyntaxOrigin {
+
+		private final SkriptAddon addon;
+
+		private AddonOrigin(SkriptAddon addon) {
+			this.addon = addon.unmodifiableView();
+		}
+
+		/**
+		 * @return A string representing the name of the addon this origin describes.
+		 * Equivalent to {@link SkriptAddon#name()}.
+		 */
+		@Override
+		public String name() {
+			return addon.name();
+		}
+
+		/**
+		 * @return An unmodifiable view of the addon this origin describes.
+		 * @see SkriptAddon#unmodifiableView()
+		 */
+		public SkriptAddon addon() {
+			return addon;
+		}
+
+	}
+
+	/**
+	 * @return A string representing this origin.
+	 */
+	String name();
+
+}
diff --git a/src/main/java/org/skriptlang/skript/registration/SyntaxRegister.java b/src/main/java/org/skriptlang/skript/registration/SyntaxRegister.java
new file mode 100644
index 00000000000..e8ab2bb3b0b
--- /dev/null
+++ b/src/main/java/org/skriptlang/skript/registration/SyntaxRegister.java
@@ -0,0 +1,41 @@
+package org.skriptlang.skript.registration;
+
+import com.google.common.collect.ImmutableSet;
+
+import java.util.Collection;
+import java.util.Comparator;
+import java.util.Set;
+import java.util.concurrent.ConcurrentSkipListSet;
+
+/**
+ * A syntax register is a collection of registered {@link SyntaxInfo}s of a common type.
+ * @param <I> The type of syntax in this register.
+ */
+final class SyntaxRegister<I extends SyntaxInfo<?>> {
+
+	private static final Comparator<SyntaxInfo<?>> SET_COMPARATOR = (a,b) -> {
+		if (a == b) { // only considered equal if registering the same infos
+			return 0;
+		}
+		int result = a.priority().compareTo(b.priority());
+		// when elements have the same priority, the oldest element comes first
+		return result != 0 ? result : 1;
+	};
+
+	final Set<I> syntaxes = new ConcurrentSkipListSet<>(SET_COMPARATOR);
+
+	public Collection<I> syntaxes() {
+		synchronized (syntaxes) {
+			return ImmutableSet.copyOf(syntaxes);
+		}
+	}
+
+	public void add(I info) {
+		syntaxes.add(info);
+	}
+
+	public void remove(I info) {
+		syntaxes.remove(info);
+	}
+
+}
diff --git a/src/main/java/org/skriptlang/skript/registration/SyntaxRegistry.java b/src/main/java/org/skriptlang/skript/registration/SyntaxRegistry.java
new file mode 100644
index 00000000000..578bf45be27
--- /dev/null
+++ b/src/main/java/org/skriptlang/skript/registration/SyntaxRegistry.java
@@ -0,0 +1,166 @@
+package org.skriptlang.skript.registration;
+
+import ch.njol.skript.lang.Condition;
+import ch.njol.skript.lang.Effect;
+import ch.njol.skript.lang.Expression;
+import ch.njol.skript.lang.Section;
+import ch.njol.skript.lang.Statement;
+import org.jetbrains.annotations.ApiStatus;
+import org.jetbrains.annotations.Contract;
+import org.jetbrains.annotations.Unmodifiable;
+import org.skriptlang.skript.lang.structure.Structure;
+import org.skriptlang.skript.util.Registry;
+import org.skriptlang.skript.util.ViewProvider;
+
+import java.util.Collection;
+
+/**
+ * A syntax registry is a central container for all {@link SyntaxInfo}s.
+ */
+@ApiStatus.Experimental
+public interface SyntaxRegistry extends ViewProvider<SyntaxRegistry>, Registry<SyntaxInfo<?>> {
+
+	/**
+	 * A key representing the built-in {@link Structure} syntax element.
+	 */
+	Key<SyntaxInfo.Structure<?>> STRUCTURE = Key.of("structure");
+
+	/**
+	 * A key representing the built-in {@link Section} syntax element.
+	 */
+	Key<SyntaxInfo<? extends Section>> SECTION = Key.of("section");
+
+	/**
+	 * A key representing all {@link Statement} syntax elements.
+	 * By default, this includes {@link #EFFECT} and {@link #CONDITION}.
+	 */
+	Key<SyntaxInfo<? extends Statement>> STATEMENT = Key.of("statement");
+
+	/**
+	 * A key representing the built-in {@link Effect} syntax element.
+	 */
+	Key<SyntaxInfo<? extends Effect>> EFFECT = ChildKey.of(STATEMENT, "effect");
+
+	/**
+	 * A key representing the built-in {@link Condition} syntax element.
+	 */
+	Key<SyntaxInfo<? extends Condition>> CONDITION = ChildKey.of(STATEMENT, "condition");
+
+	/**
+	 * A key representing the built-in {@link Expression} syntax element.
+	 */
+	Key<SyntaxInfo.Expression<?, ?>> EXPRESSION = Key.of("expression");
+
+	/**
+	 * Constructs a default implementation of a syntax registry.
+	 * This implementation is practically a wrapper around {@code Map<Key<?>, SyntaxRegistry<?>>}.
+	 * @return A syntax registry containing no elements.
+	 */
+	@Contract("-> new")
+	static SyntaxRegistry empty() {
+		return new SyntaxRegistryImpl();
+	}
+
+	/**
+	 * A method to obtain all syntaxes registered under a certain key.
+	 * @param key The key to obtain syntaxes from.
+	 * @return An unmodifiable snapshot of all syntaxes registered under <code>key</code>.
+	 * @param <I> The syntax type.
+	 */
+	<I extends SyntaxInfo<?>> @Unmodifiable Collection<I> syntaxes(Key<I> key);
+
+	/**
+	 * Registers a new syntax under a provided key.
+	 * @param key The key to register <code>info</code> under.
+	 * @param info The syntax info to register.
+	 * @param <I> The syntax type.
+	 */
+	<I extends SyntaxInfo<?>> void register(Key<I> key, I info);
+
+	/**
+	 * Unregisters all registrations of a syntax, regardless of the {@link Key}.
+	 * @param info The syntax info to unregister.
+	 * @see #unregister(Key, SyntaxInfo)
+	 */
+	void unregister(SyntaxInfo<?> info);
+
+	/**
+	 * Unregisters a syntax registered under a provided key.
+	 * @param key The key the <code>info</code> is registered under.
+	 * @param info The syntax info to unregister.
+	 * @param <I> The syntax type.
+	 * @see #unregister(SyntaxInfo)
+	 */
+	<I extends SyntaxInfo<?>> void unregister(Key<I> key, I info);
+
+	/**
+	 * Constructs an unmodifiable view of this syntax registry.
+	 * That is, the returned registry will not allow registrations.
+	 * @return An unmodifiable view of this syntax registry.
+	 */
+	@Override
+	@Contract("-> new")
+	default SyntaxRegistry unmodifiableView() {
+		return new SyntaxRegistryImpl.UnmodifiableRegistry(this);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * There are no guarantees on the ordering of the returned collection.
+	 * @return An unmodifiable snapshot of all syntaxes registered.
+	 */
+	@Override
+	@Unmodifiable Collection<SyntaxInfo<?>> elements();
+
+	/**
+	 * Represents a syntax element type.
+	 * @param <I> The syntax type.
+	 */
+	@ApiStatus.Experimental
+	interface Key<I extends SyntaxInfo<?>> {
+
+		/**
+		 * @param name The name of this key.
+		 * @return A default key implementation.
+		 * @param <I> The syntax type.
+		 */
+		@Contract("_ -> new")
+		static <I extends SyntaxInfo<?>> Key<I> of(String name) {
+			return new SyntaxRegistryImpl.KeyImpl<>(name);
+		}
+
+		/**
+		 * @return The name of the syntax element this key represents.
+		 */
+		String name();
+
+	}
+
+	/**
+	 * Like a {@link Key}, but it has a parent which causes elements to be registered to itself and its parent.
+	 * @param <I> The child key's syntax type.
+	 * @param <P> The parent key's syntax type.
+	 */
+	@ApiStatus.Experimental
+	interface ChildKey<I extends P, P extends SyntaxInfo<?>> extends Key<I> {
+
+		/**
+		 * @param parent The parent of this key.
+		 * @param name The name of this key.
+		 * @return A default child key implementation.
+		 * @param <I> The child key's syntax type.
+		 * @param <P> The parent key's syntax type.
+		 */
+		@Contract("_, _ -> new")
+		static <I extends P, P extends SyntaxInfo<?>> ChildKey<I, P> of(Key<P> parent, String name) {
+			return new SyntaxRegistryImpl.ChildKeyImpl<>(parent, name);
+		}
+
+		/**
+		 * @return The parent key of this child key.
+		 */
+		Key<P> parent();
+
+	}
+
+}
diff --git a/src/main/java/org/skriptlang/skript/registration/SyntaxRegistryImpl.java b/src/main/java/org/skriptlang/skript/registration/SyntaxRegistryImpl.java
new file mode 100644
index 00000000000..8b7c17e6431
--- /dev/null
+++ b/src/main/java/org/skriptlang/skript/registration/SyntaxRegistryImpl.java
@@ -0,0 +1,169 @@
+package org.skriptlang.skript.registration;
+
+import com.google.common.base.MoreObjects;
+import com.google.common.collect.ImmutableSet;
+import org.jetbrains.annotations.Unmodifiable;
+
+import java.util.Collection;
+import java.util.Map;
+import java.util.Objects;
+import java.util.concurrent.ConcurrentHashMap;
+
+final class SyntaxRegistryImpl implements SyntaxRegistry {
+
+	private final Map<Key<?>, SyntaxRegister<?>> registers = new ConcurrentHashMap<>();
+
+	@Override
+	@Unmodifiable
+	public <I extends SyntaxInfo<?>> Collection<I> syntaxes(Key<I> key) {
+		return register(key).syntaxes();
+	}
+
+	@Override
+	public <I extends SyntaxInfo<?>> void register(Key<I> key, I info) {
+		register(key).add(info);
+		if (key instanceof ChildKey) {
+			register(((ChildKey<? extends I, I>) key).parent(), info);
+		}
+	}
+
+	@Override
+	@SuppressWarnings({"unchecked", "rawtypes"})
+	public void unregister(SyntaxInfo info) {
+		for (Key key : registers.keySet()) {
+			unregister(key, info);
+		}
+	}
+
+	@Override
+	public <I extends SyntaxInfo<?>> void unregister(Key<I> key, I info) {
+		register(key).remove(info);
+		if (key instanceof ChildKey) {
+			unregister(((ChildKey<? extends I, I>) key).parent(), info);
+		}
+	}
+
+	@SuppressWarnings("unchecked")
+	private <I extends SyntaxInfo<?>> SyntaxRegister<I> register(Key<I> key) {
+		return (SyntaxRegister<I>) registers.computeIfAbsent(key, k -> new SyntaxRegister<>());
+	}
+
+	@Override
+	public Collection<SyntaxInfo<?>> elements() {
+		ImmutableSet.Builder<SyntaxInfo<?>> builder = ImmutableSet.builder();
+		registers.values().forEach(register -> {
+			synchronized (register.syntaxes) {
+				builder.addAll(register.syntaxes);
+			}
+		});
+		return builder.build();
+	}
+
+	static final class UnmodifiableRegistry implements SyntaxRegistry {
+
+		private final SyntaxRegistry registry;
+
+		UnmodifiableRegistry(SyntaxRegistry registry) {
+			this.registry = registry;
+		}
+
+		@Override
+		public @Unmodifiable Collection<SyntaxInfo<?>> elements() {
+			return registry.elements();
+		}
+
+		@Override
+		public @Unmodifiable <I extends SyntaxInfo<?>> Collection<I> syntaxes(Key<I> key) {
+			return registry.syntaxes(key);
+		}
+
+		@Override
+		public <I extends SyntaxInfo<?>> void register(Key<I> key, I info) {
+			throw new UnsupportedOperationException("Cannot register syntax infos with an unmodifiable syntax registry.");
+		}
+
+		@Override
+		public void unregister(SyntaxInfo<?> info) {
+			throw new UnsupportedOperationException("Cannot unregister syntax infos from an unmodifiable syntax registry.");
+		}
+
+		@Override
+		public <I extends SyntaxInfo<?>> void unregister(Key<I> key, I info) {
+			throw new UnsupportedOperationException("Cannot unregister syntax infos from an unmodifiable syntax registry.");
+		}
+
+	}
+
+	static class KeyImpl<T extends SyntaxInfo<?>> implements Key<T> {
+
+		protected final String name;
+
+		KeyImpl(String name) {
+			this.name = name;
+		}
+
+		@Override
+		public String name() {
+			return name;
+		}
+
+		@Override
+		public boolean equals(Object other) {
+			if (this == other) {
+				return true;
+			}
+			return other instanceof Key<?> key &&
+					name().equals(key.name());
+		}
+
+		@Override
+		public int hashCode() {
+			return name().hashCode();
+		}
+
+		@Override
+		public String toString() {
+			return MoreObjects.toStringHelper(this)
+					.add("name", name())
+					.toString();
+		}
+
+	}
+
+	static final class ChildKeyImpl<T extends P, P extends SyntaxInfo<?>> extends KeyImpl<T> implements ChildKey<T, P> {
+
+		private final Key<P> parent;
+
+		ChildKeyImpl(Key<P> parent, String name) {
+			super(name);
+			this.parent = parent;
+		}
+
+		@Override
+		public Key<P> parent() {
+			return parent;
+		}
+
+		@Override
+		public boolean equals(Object other) {
+			return other instanceof ChildKey<?, ?> key &&
+					super.equals(other) &&
+					parent().equals(key.parent());
+		}
+
+		@Override
+		public int hashCode() {
+			return Objects.hash(super.hashCode(), parent());
+		}
+
+		@Override
+		public String toString() {
+			return MoreObjects.toStringHelper(this)
+					.add("name", name())
+					.add("parent", parent())
+					.toString();
+		}
+
+	}
+
+}
diff --git a/src/main/java/org/skriptlang/skript/util/ClassLoader.java b/src/main/java/org/skriptlang/skript/util/ClassLoader.java
new file mode 100644
index 00000000000..fe3d7ace528
--- /dev/null
+++ b/src/main/java/org/skriptlang/skript/util/ClassLoader.java
@@ -0,0 +1,332 @@
+package org.skriptlang.skript.util;
+
+import ch.njol.skript.Skript;
+import ch.njol.util.StringUtils;
+import com.google.common.base.MoreObjects;
+import com.google.common.reflect.ClassPath;
+import com.google.common.reflect.ClassPath.ResourceInfo;
+import org.jetbrains.annotations.Contract;
+import org.jetbrains.annotations.Nullable;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.TreeSet;
+import java.util.function.Consumer;
+import java.util.function.Predicate;
+import java.util.jar.JarEntry;
+import java.util.jar.JarFile;
+import java.util.stream.Collectors;
+
+/**
+ * A utility class for loading classes contained in specific packages.
+ */
+public class ClassLoader {
+
+	/**
+	 * @return A builder for creating a loader.
+	 */
+	public static Builder builder() {
+		return new Builder();
+	}
+
+	/**
+	 * A utility method for loading <b>and initializing</b> all classes within the base package/subpackages.
+	 * This method will perform a deep search, meaning classes within subpackages of subpackages will be initialized too.
+	 * @param source A class within the resource classes should be loaded from.
+	 * @param jarFile A file representing the jar to search for classes.
+	 * @param basePackage The package within the jar to load classes from.
+	 * @param subPackages The specific subpackages within <code>basePackage</code> to load.
+	 *  If not provided, classes within <code>basePackage</code> and all of its subpackages will be loaded.
+	 */
+	public static void loadClasses(Class<?> source, File jarFile, String basePackage, String... subPackages) {
+		builder()
+				.basePackage(basePackage)
+				.addSubPackages(subPackages)
+				.initialize(true)
+				.deep(true)
+				.build()
+				.loadClasses(source, jarFile);
+	}
+
+	private final String basePackage;
+	private final Collection<String> subPackages;
+	private final @Nullable Predicate<String> filter;
+	private final boolean initialize;
+	private final boolean deep;
+	private final @Nullable Consumer<Class<?>> forEachClass;
+
+	private ClassLoader(String basePackage, Collection<String> subPackages, @Nullable Predicate<String> filter,
+						boolean initialize, boolean deep, @Nullable Consumer<Class<?>> forEachClass) {
+		if (!basePackage.isEmpty()) { // allow empty base package
+			basePackage = basePackage.replace('.', '/') + "/";
+		}
+		this.basePackage = basePackage;
+		this.subPackages = subPackages.stream()
+				.map(subPackage -> subPackage.replace('.', '/') + "/")
+				.collect(Collectors.toSet());
+		this.filter = filter;
+		this.initialize = initialize;
+		this.deep = deep;
+		this.forEachClass = forEachClass;
+	}
+
+	/**
+	 * Loads all classes (from the provided source) meeting the criteria set by this loader.
+	 * It is <b>recommended</b> to use one of the methods that also accept a [jar] file
+	 *  ({@link #loadClasses(Class, File)} and {@link #loadClasses(Class, JarFile)}) for increased reliability.
+	 * @param source A class within the resource classes should be loaded from.
+	 */
+	public void loadClasses(Class<?> source) {
+		loadClasses(source, (JarFile) null);
+	}
+
+	/**
+	 * Loads all classes (from the provided source) meeting the criteria set by this loader.
+	 * @param source A class within the resource classes should be loaded from.
+	 * @param jarFile A file representing the jar to search for classes. While it is possible to load the classes without a jar,
+	 *  it is recommended to provide one for reliability.
+	 * @see #loadClasses(Class, JarFile)                  
+	 */
+	public void loadClasses(Class<?> source, File jarFile) {
+		try (JarFile jar = new JarFile(jarFile)) {
+			loadClasses(source, jar);
+		} catch (IOException e) {
+			// TODO better logging
+			Skript.warning("Failed to access jar file: " + e);
+			loadClasses(source); // try to load using just the source class
+		}
+	}
+
+	/**
+	 * Loads all classes (from the provided source) meeting the criteria set by this loader.
+	 * @param source A class within the resource classes should be loaded from.
+	 * @param jar A jar to search for classes. While it is possible to load the classes without this jar,
+	 *  it is recommended to provide one for reliability.
+	 * @see #loadClasses(Class, File)               
+	 */
+	public void loadClasses(Class<?> source, @Nullable JarFile jar) {
+		final Collection<String> classPaths;
+		try {
+			if (jar != null) { // load from jar if available
+				classPaths = jar.stream()
+						.map(JarEntry::getName)
+						.collect(Collectors.toSet());
+			} else {
+				classPaths = ClassPath.from(source.getClassLoader()).getResources().stream()
+					.map(ResourceInfo::getResourceName)
+					.collect(Collectors.toSet());
+			}
+		} catch (IOException e) {
+			throw new RuntimeException("Failed to load classes: " + e);
+		}
+
+		// Used for tracking valid classes if a non-recursive search is done
+		// Depth is the measure of how "deep" from the head package of 'basePackage' a class is
+		final int expectedDepth = !this.deep ? StringUtils.count(this.basePackage, '/') : 0;
+		final int offset = this.basePackage.length();
+
+		// classes will be loaded in alphabetical order
+		Collection<String> classNames = new TreeSet<>(String::compareToIgnoreCase);
+		for (String name : classPaths) {
+			if (!name.startsWith(this.basePackage) || !name.endsWith(".class") || name.endsWith("package-info.class")) {
+				continue;
+			}
+			boolean load;
+			if (this.subPackages.isEmpty()) {
+				// loaded only if within base package when deep searches are forbidden
+				load = this.deep || StringUtils.count(name, '/') == expectedDepth;
+			} else {
+				load = false;
+				for (String subPackage : this.subPackages) {
+					// if the entry is within the subpackage, ensure it is not any deeper if not permitted
+					if (name.startsWith(subPackage, offset)
+						&& (this.deep || StringUtils.count(name, '/') == expectedDepth + StringUtils.count(subPackage, '/'))) {
+						load = true;
+						break;
+					}
+				}
+			}
+
+			if (load) {
+				// replace separators and .class extension
+				name = name.replace('/', '.').substring(0, name.length() - 6);
+				if (filter == null || filter.test(name)) { // final check for loading
+					classNames.add(name);
+				}
+			}
+		}
+
+		java.lang.ClassLoader loader = source.getClassLoader();
+		for (String className : classNames) {
+			try {
+				Class<?> clazz = Class.forName(className, this.initialize, loader);
+				if (this.forEachClass != null) {
+					this.forEachClass.accept(clazz);
+				}
+			} catch (ClassNotFoundException ex) {
+				throw new RuntimeException("Failed to load class: " + className, ex);
+			} catch (ExceptionInInitializerError err) {
+				throw new RuntimeException(className + " generated an exception while loading", err.getCause());
+			}
+		}
+	}
+
+	/**
+	 * @return A builder representing this ClassLoader.
+	 */
+	@Contract("-> new")
+	public Builder toBuilder() {
+		Builder builder = builder()
+			.basePackage(this.basePackage)
+			.addSubPackages(this.subPackages)
+			.initialize(this.initialize)
+			.deep(this.deep);
+		if (filter != null) {
+			builder.filter(this.filter);
+		}
+		if (forEachClass != null) {
+			builder.forEachClass(this.forEachClass);
+		}
+		return builder;
+	}
+
+	@Override
+	public String toString() {
+		return MoreObjects.toStringHelper(this)
+				.add("basePackage", basePackage)
+				.add("subPackages", subPackages)
+				.add("filter", filter)
+				.add("initialize", initialize)
+				.add("deep", deep)
+				.add("forEachClass", forEachClass)
+				.toString();
+	}
+
+	/**
+	 * A builder for constructing a {@link ClassLoader}.
+	 */
+	public static final class Builder {
+
+		private String basePackage = "";
+		private final Collection<String> subPackages = new HashSet<>();
+		private @Nullable Predicate<String> filter = null;
+		private boolean initialize;
+		private boolean deep;
+		private @Nullable Consumer<Class<?>> forEachClass;
+
+		private Builder() { }
+
+		/**
+		 * Sets the package the loader should start loading classes from.
+		 * This is <b>required</b>.
+		 * @param basePackage A string representing package to start loading classes from.
+		 * @return This builder.
+		 */
+		@Contract("_ -> this")
+		public Builder basePackage(String basePackage) {
+			this.basePackage = basePackage;
+			return this;
+		}
+
+		/**
+		 * Adds a subpackage the loader should start loading classes from.
+		 * This is useful for when you may want to load from some, but not all, of the subpackages of the base package.
+		 * @param subPackage A string representing a subpackage to load from.
+		 * @return This builder.
+		 * @see #addSubPackages(String...)
+		 * @see #addSubPackages(Collection)
+		 */
+		@Contract("_ -> this")
+		public Builder addSubPackage(String subPackage) {
+			this.subPackages.add(subPackage);
+			return this;
+		}
+
+		/**
+		 * Adds subpackages the loader should start loading classes from.
+		 * This is useful for when you may want to load from some, but not all, of the subpackages of the base package.
+		 * @param subPackages Strings representing subpackages to load from.
+		 * @return This builder.
+		 * @see #addSubPackage(String)
+		 * @see #addSubPackages(Collection)
+		 */
+		@Contract("_ -> this")
+		public Builder addSubPackages(String... subPackages) {
+			Collections.addAll(this.subPackages, subPackages);
+			return this;
+		}
+
+		/**
+		 * Adds subpackages the loader should start loading classes from.
+		 * This is useful for when you may want to load from some, but not all, of the subpackages of the base package.
+		 * @param subPackages Strings representing subpackages to load from.
+		 * @return This builder.
+		 * @see #addSubPackage(String)
+		 * @see #addSubPackages(String...)
+		 */
+		@Contract("_ -> this")
+		public Builder addSubPackages(Collection<String> subPackages) {
+			this.subPackages.addAll(subPackages);
+			return this;
+		}
+
+		/**
+		 * A predicate for whether a fully qualified class name should be loaded as a {@link Class}.
+		 * @param filter A predicate for filtering class names.
+		 *  It should return true for class names to load.
+		 * @return This builder.
+		 */
+		@Contract("_ -> this")
+		public Builder filter(Predicate<String> filter) {
+			this.filter = filter;
+			return this;
+		}
+
+		/**
+		 * Sets whether the loader will initialize found classes.
+		 * @param initialize Whether classes should be initialized when found.
+		 * @return This builder.
+		 */
+		@Contract("_ -> this")
+		public Builder initialize(boolean initialize) {
+			this.initialize = initialize;
+			return this;
+		}
+
+		/**
+		 * Sets whether the loader will perform a deep search.
+		 * @param deep Whether subpackages of the provided base package (or subpackages) should be searched.
+		 * @return This builder.
+		 */
+		@Contract("_ -> this")
+		public Builder deep(boolean deep) {
+			this.deep = deep;
+			return this;
+		}
+
+		/**
+		 * Sets a consumer to be run for each found class.
+		 * @param forEachClass A consumer to run for each found class.
+		 * @return This builder.
+		 */
+		@Contract("_ -> this")
+		public Builder forEachClass(Consumer<Class<?>> forEachClass) {
+			this.forEachClass = forEachClass;
+			return this;
+		}
+
+		/**
+		 * Builds a new loader from the set details.
+		 * @return A loader for loading classes through the manner outlined by this builder.
+		 */
+		@Contract("-> new")
+		public ClassLoader build() {
+			return new ClassLoader(basePackage, subPackages, filter, initialize, deep, forEachClass);
+		}
+
+	}
+
+}
diff --git a/src/main/java/org/skriptlang/skript/util/ClassUtils.java b/src/main/java/org/skriptlang/skript/util/ClassUtils.java
new file mode 100644
index 00000000000..9315f9b14b3
--- /dev/null
+++ b/src/main/java/org/skriptlang/skript/util/ClassUtils.java
@@ -0,0 +1,19 @@
+package org.skriptlang.skript.util;
+
+import java.lang.reflect.Modifier;
+
+/**
+ * Utilities for interacting with classes.
+ */
+public final class ClassUtils {
+
+	/**
+	 * @param clazz The class to check.
+	 * @return True if <code>clazz</code> does not represent an annotation, array, primitive, interface, or abstract class.
+	 */
+	public static boolean isNormalClass(Class<?> clazz) {
+		return !clazz.isAnnotation() && !clazz.isArray() && !clazz.isPrimitive()
+				&& !clazz.isInterface() && !Modifier.isAbstract(clazz.getModifiers());
+	}
+
+}
diff --git a/src/main/java/org/skriptlang/skript/util/Executable.java b/src/main/java/org/skriptlang/skript/util/Executable.java
new file mode 100644
index 00000000000..4ecb9f6c89b
--- /dev/null
+++ b/src/main/java/org/skriptlang/skript/util/Executable.java
@@ -0,0 +1,15 @@
+package org.skriptlang.skript.util;
+
+/**
+ * A process that can be executed, which may return its result.
+ * This is an abstraction for general triggers (runnables, tasks, functions, etc.)
+ * without any Bukkit dependency.
+ *
+ * @param <Caller> The source type of this process (e.g. Event, CommandSender, etc.)
+ * @param <Result> The return type of this process.
+ */
+public interface Executable<Caller, Result> {
+
+	Result execute(Caller caller, Object... arguments);
+
+}
diff --git a/src/main/java/org/skriptlang/skript/util/Priority.java b/src/main/java/org/skriptlang/skript/util/Priority.java
new file mode 100644
index 00000000000..a5f71a5c932
--- /dev/null
+++ b/src/main/java/org/skriptlang/skript/util/Priority.java
@@ -0,0 +1,55 @@
+package org.skriptlang.skript.util;
+
+import org.jetbrains.annotations.ApiStatus;
+import org.jetbrains.annotations.Contract;
+import org.jetbrains.annotations.Unmodifiable;
+
+import java.util.Collection;
+
+/**
+ * Priorities are used for things like ordering syntax and loading structures in a specific order.
+ */
+@ApiStatus.Experimental
+public interface Priority extends Comparable<Priority> {
+
+	/**
+	 * @return A base priority for other priorities to build relationships off of.
+	 */
+	@Contract("-> new")
+	static Priority base() {
+		return new PriorityImpl();
+	}
+
+	/**
+	 * Constructs a new priority that is before <code>priority</code>.
+	 * Note that this method will not make any changes to the {@link #after()} of <code>priority</code>.
+	 * @param priority The priority that will be after the returned priority.
+	 * @return A priority that is before <code>priority</code>.
+	 */
+	@Contract("_ -> new")
+	static Priority before(Priority priority) {
+		return new PriorityImpl(priority, true);
+	}
+
+	/**
+	 * Constructs a new priority that is after <code>priority</code>.
+	 * Note that this method will not make any changes to the {@link #before()} of <code>priority</code>.
+	 * @param priority The priority that will be before the returned priority.
+	 * @return A priority that is after <code>priority</code>.
+	 */
+	@Contract("_ -> new")
+	static Priority after(Priority priority) {
+		return new PriorityImpl(priority, false);
+	}
+
+	/**
+	 * @return A collection of all priorities this priority is known to be after.
+	 */
+	@Unmodifiable Collection<Priority> after();
+
+	/**
+	 * @return A collection of all priorities this priority is known to be before.
+	 */
+	@Unmodifiable Collection<Priority> before();
+
+}
diff --git a/src/main/java/org/skriptlang/skript/util/PriorityImpl.java b/src/main/java/org/skriptlang/skript/util/PriorityImpl.java
new file mode 100644
index 00000000000..3272349f865
--- /dev/null
+++ b/src/main/java/org/skriptlang/skript/util/PriorityImpl.java
@@ -0,0 +1,105 @@
+package org.skriptlang.skript.util;
+
+import com.google.common.base.MoreObjects;
+import com.google.common.collect.ImmutableSet;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Objects;
+import java.util.Set;
+
+class PriorityImpl implements Priority {
+
+	private final Set<Priority> after;
+
+	private final Set<Priority> before;
+
+	PriorityImpl() {
+		this.after = ImmutableSet.of();
+		this.before = ImmutableSet.of();
+	}
+
+	PriorityImpl(Priority priority, boolean isBefore) {
+		Set<Priority> after = new HashSet<>();
+		Set<Priority> before = new HashSet<>();
+		if (isBefore) {
+			before.add(priority);
+		} else {
+			after.add(priority);
+		}
+		after.addAll(priority.after());
+		before.addAll(priority.before());
+
+		this.after = ImmutableSet.copyOf(after);
+		this.before = ImmutableSet.copyOf(before);
+	}
+
+	@Override
+	public int compareTo(@NotNull Priority other) {
+		if (this == other) {
+			return 0;
+		}
+
+		Collection<Priority> ourBefore = this.before();
+		Collection<Priority> otherAfter = other.after();
+
+		// check whether this is known to be before other and whether other is known to be after this
+		if (ourBefore.contains(other) || otherAfter.contains(this)) {
+			return -1;
+		}
+
+		Collection<Priority> ourAfter = this.after();
+		Collection<Priority> otherBefore = other.before();
+
+		// check whether this is known to be after other and whether other is known to be before this
+		if (ourAfter.contains(other) || otherBefore.contains(this)) {
+			return 1;
+		}
+
+		// check whether the set of items we are before has common elements with the set of items other is after
+		if (ourBefore.stream().anyMatch(otherAfter::contains)) {
+			return -1;
+		}
+
+		// check whether the set of items we are after has common elements with the set of items other is before
+		if (ourAfter.stream().anyMatch(otherBefore::contains)) {
+			return 1;
+		}
+
+		// there is no meaningful relationship, we consider ourselves the same
+		// however, in cases of a custom implementation, we defer to them to determine the relationship
+		return (other instanceof PriorityImpl) ? 0 : (other.compareTo(this) * -1);
+	}
+
+	@Override
+	public Collection<Priority> after() {
+		return after;
+	}
+
+	@Override
+	public Collection<Priority> before() {
+		return before;
+	}
+
+	@Override
+	public int hashCode() {
+		return Objects.hash(after, before);
+	}
+
+	@Override
+	public boolean equals(Object obj) {
+		if (!(obj instanceof Priority priority))
+			return false;
+		return compareTo(priority) == 0;
+	}
+
+	@Override
+	public String toString() {
+		return MoreObjects.toStringHelper(this)
+				.add("after", after)
+				.add("before", before)
+				.toString();
+	}
+
+}
diff --git a/src/main/java/org/skriptlang/skript/util/Registry.java b/src/main/java/org/skriptlang/skript/util/Registry.java
new file mode 100644
index 00000000000..46e4f859785
--- /dev/null
+++ b/src/main/java/org/skriptlang/skript/util/Registry.java
@@ -0,0 +1,31 @@
+package org.skriptlang.skript.util;
+
+import org.jetbrains.annotations.ApiStatus;
+
+import java.util.Collection;
+import java.util.Iterator;
+
+/**
+ * A registry maintains a collection of elements.
+ * It is up to individual implementations as to how they may be modified.
+ * @param <T> The type of elements stored in a registry.
+ */
+@ApiStatus.Experimental
+public interface Registry<T> extends Iterable<T> {
+
+	/**
+	 * @return A collection of all elements in this registry.
+	 */
+	Collection<T> elements();
+
+	/**
+	 * By default, this is a wrapper for <code>elements().iterator()</code>.
+	 * @return An iterator over all elements in this registry.
+	 * @see Collection#iterator()
+	 */
+	@Override
+	default Iterator<T> iterator() {
+		return elements().iterator();
+	}
+
+}
diff --git a/src/main/java/org/skriptlang/skript/util/Validated.java b/src/main/java/org/skriptlang/skript/util/Validated.java
new file mode 100644
index 00000000000..c9878aad372
--- /dev/null
+++ b/src/main/java/org/skriptlang/skript/util/Validated.java
@@ -0,0 +1,68 @@
+package org.skriptlang.skript.util;
+
+import org.jetbrains.annotations.ApiStatus;
+
+/**
+ * Something that can become invalid due to external conditions, such as:
+ * <ul>
+ *     <li>A newer copy of the same thing becomes available.</li>
+ *     <li>It is a finalised view that no longer reflects the real thing.</li>
+ *     <li>Some backing object has been deleted or irreparably modified.</li>
+ * </ul>
+ * <br/>
+ * Once this has been {@link #invalidate()}d, its {@link #valid()} method should
+ * return {@code false}.
+ * <br/>
+ * When this is no longer {@link #valid()}, it may no longer be safe or accurate to use.
+ * <br/>
+ * Implementations may expose their own (re)validate method, but this is outside
+ * the scope of this interface and so is not provided by default.
+ */
+public interface Validated {
+
+	/**
+	 * Mark a thing as no longer safe to use. This should (typically) not be used by
+	 * external modifiers, but implementations may differ.
+	 * <br/>
+	 * Implementations that do <em>not</em> want to expose an invalidator hook
+	 * may throw an {@link UnsupportedOperationException}, which is protected by
+	 * the internal contract.
+	 *
+	 * @throws UnsupportedOperationException If this is not something that can be
+	 *                                       externally invalidated.
+	 */
+	@ApiStatus.Internal
+	void invalidate() throws UnsupportedOperationException;
+
+	/**
+	 * Implementations ought to specify what 'valid' means locally (e.g. should a new copy be obtained?)
+	 * when overriding this method.
+	 *
+	 * @return Whether this is still valid
+	 */
+	boolean valid();
+
+	/**
+	 * @return A single-use validator marker with thread safety
+	 */
+	static Validated validator() {
+		return new Validator();
+	}
+
+}
+
+class Validator implements Validated {
+
+	private volatile boolean valid = true;
+
+	@Override
+	public synchronized void invalidate() {
+		this.valid = false;
+	}
+
+	@Override
+	public boolean valid() {
+		return valid;
+	}
+
+}
diff --git a/src/main/java/org/skriptlang/skript/util/ViewProvider.java b/src/main/java/org/skriptlang/skript/util/ViewProvider.java
new file mode 100644
index 00000000000..7a9748ad1bb
--- /dev/null
+++ b/src/main/java/org/skriptlang/skript/util/ViewProvider.java
@@ -0,0 +1,22 @@
+package org.skriptlang.skript.util;
+
+import org.jetbrains.annotations.ApiStatus;
+import org.jetbrains.annotations.Contract;
+
+/**
+ * For objects that can provide an unmodifiable view of themselves.
+ * An unmodifiable view means that the object may only be used in a read-only manner (its values may not be changed).
+ * Since it is a view, it will reflect any changes made to the object it was created from.
+ * @param <T> The type being viewed.
+ */
+@ApiStatus.Experimental
+public interface ViewProvider<T> {
+
+	/**
+	 * Constructs an unmodifiable view of <code>this</code>.
+	 * @return An unmodifiable view of <code>this</code>.
+	 */
+	@Contract("-> new")
+	T unmodifiableView();
+
+}
diff --git a/src/main/java/org/skriptlang/skript/util/event/Event.java b/src/main/java/org/skriptlang/skript/util/event/Event.java
new file mode 100644
index 00000000000..8db3744ccf2
--- /dev/null
+++ b/src/main/java/org/skriptlang/skript/util/event/Event.java
@@ -0,0 +1,9 @@
+package org.skriptlang.skript.util.event;
+
+/**
+ * An event is something that happens.
+ * For Skript, this is something such as a script reloading or a context switch.
+ */
+public interface Event {
+
+}
diff --git a/src/main/java/org/skriptlang/skript/util/event/EventRegistry.java b/src/main/java/org/skriptlang/skript/util/event/EventRegistry.java
new file mode 100644
index 00000000000..6110f4d23b6
--- /dev/null
+++ b/src/main/java/org/skriptlang/skript/util/event/EventRegistry.java
@@ -0,0 +1,64 @@
+package org.skriptlang.skript.util.event;
+
+import com.google.common.collect.ImmutableSet;
+import org.jetbrains.annotations.Unmodifiable;
+
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+
+/**
+ * An EventRegistry is a generic container for events.
+ * They are to be used for providing standardized Event functionality wherever deemed useful.
+ * @param <E> The class representing the type of events this register will hold.
+ */
+public class EventRegistry<E extends Event> {
+
+	private final Set<E> events = ConcurrentHashMap.newKeySet();
+
+	/**
+	 * Registers the provided event with this register.
+	 * @param event The event to register.
+	 */
+	public void register(E event) {
+		events.add(event);
+	}
+
+	/**
+	 * Registers the provided event with.
+	 * @param eventType The type of event being registered.
+	 *  This is useful for registering an event that is a {@link FunctionalInterface} using a lambda.
+	 * @param event The event to register.
+	 */
+	public <T extends E> void register(Class<T> eventType, T event) {
+		events.add(event);
+	}
+
+	/**
+	 * Unregisters the provided event.
+	 * @param event The event to unregister.
+	 */
+	public void unregister(E event) {
+		events.remove(event);
+	}
+
+	/**
+	 * @return An unmodifiable set of this register's events.
+	 */
+	public @Unmodifiable Set<E> events() {
+		return ImmutableSet.copyOf(events);
+	}
+
+	/**
+	 * @param type The type of events to get.
+	 * @return An unmodifiable subset (of the specified type) of this register's events
+	 */
+	@SuppressWarnings("unchecked")
+	public <T extends E> @Unmodifiable Set<T> events(Class<T> type) {
+		ImmutableSet.Builder<T> builder = ImmutableSet.builder();
+		events.stream()
+			.filter(event -> type.isAssignableFrom(event.getClass()))
+			.forEach(e -> builder.add((T) e));
+		return builder.build();
+	}
+	
+}
diff --git a/src/main/resources/config.sk b/src/main/resources/config.sk
index 2d7b5ee197f..5364643cfaf 100644
--- a/src/main/resources/config.sk
+++ b/src/main/resources/config.sk
@@ -172,6 +172,9 @@ disable variable missing and/or warnings: false
 disable starting a variable's name with an expression warnings: false
 # Disables the "Starting a variable's name with an expression is discouraged..." warnings
 
+disable unreachable code warnings: false
+# Disables the "Unreachable code. The previous statement stops further execution." warnings.
+
 soft api exceptions: false
 # Allows Skript to ignore certain actions which would normally result in thrown exceptions.
 # If everything works correctly, you should keep this option disabled. It might cause problems in some cases.
@@ -231,6 +234,44 @@ long parse time warning threshold: 0 seconds
 #   stating that the statement has taken a long time to parse.
 # A value of 0 seconds means that this warning should be disabled.
 
+
+# ==== Runtime Errors ====
+
+runtime errors:
+	frame duration: 1 second
+	# Frames are the duration over which runtime errors will be collected before being sent off to console.
+	# If you find runtime errors to be annoying or clogging your console, you should first fix them!
+	# You can also lengthen this duration to reduce the amount of individual errors printed to console.
+
+	# -- Errors --
+	total errors per frame: 8
+	# This controls the maximum number of individual errors that will be printed per frame.
+	# If more errors occur, they will be hidden and the frame will simply display that x number of
+	# errors occurred but were hidden this frame.
+
+	errors from one line per frame: 2
+	# This controls the maximum number of errors a single line can print per frame. This is used to prevent
+	# line from clogging up the frame, like if a syntax was in a 10 iteration loop and errored every time.
+	# It's best to keep this rather low.
+
+	error spam timeout limit: 4
+	# If a line prints more than this many errors in a single frame, it will be put in timeout. This means
+	# any additional errors it creates during the timeout duration will be hidden, rather than printed.
+	# This is also a defense against a syntax in a loop spamming console with errors.
+
+	error timeout length: 10
+	# This is the number of frames before a line in timeout can print errors again.
+	# If you lengthen the frame duration, you may want to lower this proportionally.
+
+	# -- Warnings --
+	# All the above descriptions for errors apply the same here, but for warnings instead.
+
+	total warnings per frame: 8
+	warnings from one line per frame: 2
+	warning spam timeout limit: 4
+	warning timeout length: 10
+
+
 # ==== Variables ====
 
 databases:
@@ -289,6 +330,12 @@ databases:
 		# Variables are saved constantly no matter what is set here, thus a server crash will never make you loose any variables.
 		# Set this to 0 to disable this feature.
 
+		backups to keep: -1
+		# if set to a value greater than -1, Skript will ensure only that many backups are kept.
+		# Backups are removed from oldest to newest.
+		# If disabled (set to -1), no backup files will be deleted.
+		# WARNING: Setting to 0 will delete all files located in the backup directory upon plugin start/reload
+
 
 	MySQL example:
 		# A MySQL database example, with options unrelated to MySQL removed.
@@ -325,6 +372,8 @@ databases:
 		monitor changes: false
 		monitor interval: 20 seconds
 
+		backups to keep: -1
+
 	default:
 		# The default "database" is a simple text file, with each variable on a separate line and the variable's name, type, and value separated by commas.
 		# This is the last database in this list to catch all variables that have not been saved anywhere else.
@@ -338,6 +387,9 @@ databases:
 
 		backup interval: 2 hours
 
+		backups to keep: -1
+
+
 	# PS: If you don't want some variables to be saved in any database (e.g. variables that contain an %entity% which usually despawn when the server is shut down)
 	# you can modify the last database's pattern to not match all variables, e.g. use '(?!x_).*' to match all variables that don't start with 'x_'.
 	# Be very cautious when doing this however as unsaved variables cannot be recovered after the server has been stopped.
diff --git a/src/main/resources/lang/default.lang b/src/main/resources/lang/default.lang
index 4ae3049a85a..e380aef7bcf 100644
--- a/src/main/resources/lang/default.lang
+++ b/src/main/resources/lang/default.lang
@@ -99,19 +99,19 @@ enchantments:
 	breach: Breach
 	wind_burst: Wind Burst
 
-# -- Potion Effects --
-potions:
+# -- Potion Effect Types --
+potion effect types:
 	speed: speed, swiftness
-	slow: slowness, slow
-	fast_digging: haste, fast digging, fast mining
-	slow_digging: mining fatigue, slow digging, slow mining
-	increase_damage: strength, increase damage, increased damage
-	heal: instant health, health
-	harm: instant damage, damage
-	jump: jump boost, jump
-	confusion: nausea, confusion
+	slowness: slowness, slow
+	haste: haste, fast digging, fast mining
+	mining_fatigue: mining fatigue, slow digging, slow mining
+	strength: strength, increase damage, increased damage
+	instant_health: instant health, health
+	instant_damage: instant damage, damage
+	jump_boost: jump boost, jump
+	nausea: nausea, confusion
 	regeneration: regeneration
-	damage_resistance: resistance, damage resistance
+	resistance: resistance, damage resistance
 	fire_resistance: fire resistance, fire immunity
 	water_breathing: water breathing
 	invisibility: invisibility
@@ -345,15 +345,33 @@ tree types:
 
 # -- Time --
 time:
-	millisecond: millisecond¦s
-	tick: tick¦s
-	second: second¦s
-	minute: minute¦s
-	hour: hour¦s
-	day: day¦s
-	week: week¦s
-	month: month¦s
-	year: year¦s
+	millisecond:
+		full: millisecond¦s
+		short: ms
+	tick:
+		full: tick¦s
+		short: t
+	second:
+		full: second¦s
+		short: s
+	minute:
+		full: minute¦s
+		short: m
+	hour:
+		full: hour¦s
+		short: h
+	day:
+		full: day¦s
+		short: d
+	week:
+		full: week¦s
+		short: w
+	month:
+		full: month¦s
+		short: mo
+	year:
+		full: year¦s
+		short: y
 	real: real, rl, irl
 	minecraft: mc, minecraft
 
@@ -484,39 +502,43 @@ entities:
 	bat:
 		name: bat¦s
 		pattern: <age> bat(|1¦s)
+	# boats!
 	boat:
 		name: boat¦s
-		pattern: boat(|1¦s)
+		pattern: boat[1:s]
 	any boat:
 		name: boat¦s
-		pattern: any boat(|1¦s)
+		pattern: any boat[1:s]
 	oak boat:
 		name: oak boat¦s
-		pattern: oak boat(|1¦s)
+		pattern: oak boat[1:s]
 	spruce boat:
 		name: spruce boat¦s
-		pattern: spruce boat(|1¦s)
+		pattern: spruce boat[1:s]
 	birch boat:
 		name: birch boat¦s
-		pattern: birch boat(|1¦s)
+		pattern: birch boat[1:s]
 	jungle boat:
 		name: jungle boat¦s
-		pattern: jungle boat(|1¦s)
+		pattern: jungle boat[1:s]
 	acacia boat:
 		name: acacia boat¦s
-		pattern: acacia boat(|1¦s)
+		pattern: acacia boat[1:s]
 	dark oak boat:
 		name: dark oak boat¦s
-		pattern: dark oak boat(|1¦s)
+		pattern: dark oak boat[1:s]
 	mangrove boat:
 		name: mangrove boat¦s
-		pattern: mangrove boat(|1¦s)
+		pattern: mangrove boat[1:s]
 	bamboo raft:
 		name: bamboo raft¦s
-		pattern: bamboo (boat|raft)(|1¦s)
+		pattern: bamboo (boat|raft)[1:s]
 	cherry boat:
 		name: cherry boat¦s
-		pattern: cherry [blossom] boat(|1¦s)
+		pattern: cherry [blossom] boat[1:s]
+	pale oak boat:
+		name: pale oak boat¦s
+		pattern: pale oak boat[1:s]
 	blaze:
 		name: blaze¦s
 		pattern: blaze(|1¦s)
@@ -797,19 +819,19 @@ entities:
 		pattern: wither skull((|1¦s)| projectile(|1¦s))
 	wolf:
 		name: wol¦f¦ves
-		pattern: <age> wol(f|1¦ves) [[with collar] colo[u]r[ed] %-color%]
+		pattern: <age> [%-wolfvariant%] wol(f|1¦ves) [[with collar] colo[u]r[ed] %-color%]
 	tamed wolf:
 		name: tamed wol¦f¦ves
-		pattern: (<age> dog(|1¦s)|tamed <age> wol(f|1¦ves)|(4¦)pupp(y|1¦ies)) [[with collar] colo[u]r[ed] %-color%]
+		pattern: (<age> [%-wolfvariant%] dog(|1¦s)|tamed <age> [%-wolfvariant%] wol(f|1¦ves)| [%-wolfvariant%] (4¦)pupp(y|1¦ies)) [[with collar] colo[u]r[ed] %-color%]
 	wild wolf:
 		name: wild wol¦f¦ves
-		pattern: (wild|untamed) <age> wol(f|1¦ves) [[with collar] colo[u]r[ed] %-color%]
+		pattern: (wild|untamed) <age> [%-wolfvariant%] wol(f|1¦ves) [[with collar] colo[u]r[ed] %-color%]
 	angry wolf:
 		name: angry wol¦f¦ves @an
-		pattern: (angry|aggressive) <age> wol(f|1¦ves) [[with collar] colo[u]r[ed] %-color%]
+		pattern: (angry|aggressive) <age> [%-wolfvariant%] wol(f|1¦ves) [[with collar] colo[u]r[ed] %-color%]
 	peaceful wolf:
 		name: peaceful wol¦f¦ves
-		pattern: (peaceful|neutral|unaggressive) <age> wol(f|1¦ves) [[with collar] colo[u]r[ed] %-color%]
+		pattern: (peaceful|neutral|unaggressive) <age> [%-wolfvariant%] wol(f|1¦ves) [[with collar] colo[u]r[ed] %-color%]
 	zombie:
 		name: zombie¦s
 		pattern: <age> zombie(|1¦s)|(4¦)zombie (kid(|1¦s)|child(|1¦ren))
@@ -1186,28 +1208,40 @@ entities:
 	# 1.19 Entities
 	chest boat:
 		name: chest boat¦s
-		pattern: chest boat(|1¦s)
+		pattern: chest boat[1:s]
 	any chest boat:
 		name: chest boat¦s
-		pattern: any chest boat(|1¦s)
+		pattern: any chest boat[1:s]
 	oak chest boat:
 		name: oak chest boat¦s
-		pattern: oak chest boat(|1¦s)
+		pattern: oak chest boat[1:s]
 	spruce chest boat:
 		name: spruce chest boat¦s
-		pattern: spruce chest boat(|1¦s)
+		pattern: spruce chest boat[1:s]
 	birch chest boat:
 		name: birch chest boat¦s
-		pattern: birch chest boat(|1¦s)
+		pattern: birch chest boat[1:s]
 	jungle chest boat:
 		name: jungle chest boat¦s
-		pattern: jungle chest boat(|1¦s)
+		pattern: jungle chest boat[1:s]
 	acacia chest boat:
 		name: acacia chest boat¦s
-		pattern: acacia chest boat(|1¦s)
+		pattern: acacia chest boat[1:s]
 	dark oak chest boat:
 		name: dark oak chest boat¦s
-		pattern: dark oak chest boat(|1¦s)
+		pattern: dark oak chest boat[1:s]
+	cherry chest boat:
+		name: cherry chest boat¦s
+		pattern: cherry chest boat[1:s]
+	mangrove chest boat:
+		name: mangrove chest boat¦s
+		pattern: mangrove chest boat[1:s]
+	bamboo chest raft:
+		name: bamboo chest raft¦s
+		pattern: bamboo chest (raft|boat)[1:s]
+	pale oak chest boat:
+		name: pale oak chest boat¦s
+		pattern: pale oak chest boat[1:s]
 	frog:
 		name: frog¦s
 		pattern: <age> frog(|1¦s)|(4¦)frog (kid(|1¦s)|child(|1¦ren))
@@ -1245,16 +1279,16 @@ entities:
 		pattern: interaction(|1¦s)
 	display:
 		name: display¦s
-		pattern: display(|1¦s)
+		pattern: display(1:s| [entit(y|1:ies)])
 	block display:
 		name: block display¦s
-		pattern: block display(|1¦s)
+		pattern: (block display(1:s| [entit(y|1:ies)]) [of %-blockdata/itemtype%]|alt:%-blockdata/itemtype% block display(1:s| [entit(y|1:ies)]))
 	item display:
 		name: item display¦s
-		pattern: item display(|1¦s)
+		pattern: (item display(1:s| [entit(y|1:ies)]) [of %-itemtype%]|alt:%-itemtype% item display(1:s| [entit(y|1:ies)]))
 	text display:
 		name: text display¦s
-		pattern: text display(|1¦s)
+		pattern: text display(1:s| [entit(y|1:ies)])
 	# 1.20.3 Entities
 	breeze:
 		name: breeze¦s
@@ -1269,6 +1303,19 @@ entities:
 	bogged:
 		name: bogged¦s
 		pattern: bogged[1:s]
+	# 1.21.2 Entities
+	any salmon:
+		name: salmon¦s
+		pattern: any salmon[1:s]
+	large salmon:
+		name: large salmon¦s
+		pattern: large salmon[1:s]
+	medium salmon:
+		name: medium salmon¦s
+		pattern: medium salmon[1:s]
+	small salmon:
+		name: small salmon¦s
+		pattern: small salmon[1:s]
 	# 1.21.3 Entities
 	creaking:
 		name: creaking¦s
@@ -1300,6 +1347,18 @@ cat types:
 	jellie: jellie
 	all_black: all black
 
+# -- Wolf Variants --
+wolf variants:
+	ashen: ashen
+	black: black
+	chestnut: chestnut
+	pale: pale
+	rusty: rusty
+	snowy: snowy
+	spotted: spotted
+	striped: striped
+	woods: woods
+
 # -- Damage Causes --
 damage causes:
 	contact: contact
@@ -2283,6 +2342,34 @@ environments:
 	the_end: end, the end
 	custom: custom
 
+# -- Entity Potion Causes --
+entity potion causes:
+	area_effect_cloud: enter area effect cloud
+	arrow: arrow infliction
+	attack: attack
+	axolotl: axolotl
+	warden: warden
+	beacon: beacon effect
+	command: command
+	conduit: conduit effect
+	conversion: conversion, converted
+	death: death
+	dolphin: dolphin boost
+	expiration: expiration, expired
+	food: food
+	illusion: illusion
+	milk: drinking milk
+	plugin: plugin
+	potion_drink: potion drunk, drinking potion
+	potion_splash: potion splash, splash potion
+	spider_spawn: spider spawn, spawned spider
+	totem: removal by resurrection
+	turtle_helmet: turtle helmet effect
+	unknown: unknown
+	villager_trade: villager trade
+	patrol_captain: pillager captain, patrol captain
+	wither_rose: wither rose infliction
+
 # -- Moon Phases --
 moon phases:
 	first_quarter: first quarter
@@ -2314,6 +2401,160 @@ transform reasons:
 	unknown: unknown
 	infection: infection, villager infection
 
+# -- Teleport Flags --
+teleport flags:
+	retain_open_inventory: opened inventory, open inventory, inventory
+	retain_passengers: passengers, passenger
+	retain_vehicle: vehicle
+	retain_direction: directional velocity, pitch and yaw velocity, yaw and pitch velocity
+	retain_pitch: pitch velocity
+	retain_yaw: yaw velocity
+	retain_movement: xyz velocity
+	retain_x: x velocity
+	retain_y: y velocity
+	retain_z: z velocity
+
+# -- Unleash Reasons --
+unleash reasons:
+	distance: distance
+	holder_gone: holder (gone|disappeared)
+	player_unleash: player unleash, player unleashed, unleashed by player
+	unknown: unknown
+
+# -- Item Flags --
+item flags:
+	hide_additional_tooltip: hide additional tooltip, additional tooltip hidden, hidden additional tooltip
+	hide_armor_trim: hide armor trim, armor trim hidden, hidden armor trim
+	hide_attributes: hide attributes, attributes hidden, hidden attributes
+	hide_destroys: hide destroys, hide destroyable blocks, hide breakable blocks, destroys hidden, hidden destroys
+	hide_dye: hide dye, hide dye color, dye hidden, dye color hidden, hidden dye, hidden dye color
+	hide_enchants: hide enchants, hide enchantments, enchants hidden, enchantments hidden, hidden enchants
+	hide_placed_on: hide placed on, placed on hidden, hidden placed on
+	hide_stored_enchants: hide stored enchants, hide stored enchantments, stored enchants hidden, stored enchantments hidden, hidden stored enchants, hidden stored enchantments
+	hide_unbreakable: hide unbreakable, hide unbreakable status, unbreakable hidden, unbreakable status hidden, hidden unbreakable, hidden unbreakable status
+	hide_potion_effects: hide potion effects, hide potions, potion effects hidden, potions hidden, hidden potion effects, hidden potions
+
+# -- Display Billboards --
+billboards:
+	center: center, middle, center pivot
+	fixed: fixed
+	horizontal: horizontal, horizontal pivot
+	vertical: vertical, vertical pivot
+
+# -- Text Display Alignments --
+text alignments:
+	center: centered, center aligned, middle aligned
+	left: left aligned
+	right: right aligned
+
+# -- Item Display Transforms --
+item display transforms:
+	firstperson_lefthand: first person left handed, first person left hand, left handed in first person
+	firstperson_righthand: first person right handed, first person right hand, right handed in first person
+	fixed: fixed, fixed position
+	ground: ground, the ground
+	gui: gui, menu
+	head: head
+	none: no transform
+	thirdperson_lefthand: third person left handed, third person left hand, left handed in third person
+	thirdperson_righthand: third person right handed, third person right hand, right handed in third person
+
+# -- Villager Types/Professions --
+villager types:
+	snow: snow
+	plains: plains
+	jungle: jungle
+	taiga: taiga
+	desert: desert
+	savanna: savanna
+	swamp: swamp
+
+villager professions:
+	# Suffix "profession" options added to help with EntityData conflicts
+	leatherworker: leatherworker, leatherworker profession
+	mason: mason, mason profession
+	fletcher: fletcher, fletcher profession
+	weaponsmith: weaponsmith, weaponsmith profession
+	toolsmith: toolsmith, toolsmith profession
+	librarian: librarian, librarian profession
+	shepherd: shepherd, shepherd profession
+	farmer: farmer, farmer profession
+	cleric: cleric, cleric profession
+	nitwit: nitwit, nitwit profession
+	cartographer: cartographer, cartographer profession
+	armorer: armorer, armorer profession
+	butcher: butcher, butcher profession
+	none: no profession, none profession, unemployed
+	fisherman: fisherman, fisherman profession
+
+# -- Change Reasons --
+experience cooldown change reasons:
+	plugin: plugin
+	pickup_orb: orb pickup, pickup orb
+
+# -- Banner Pattern Types --
+banner pattern types:
+	base: base banner pattern
+	border: border banner pattern, bordure banner pattern, bordure indented banner pattern
+	bricks: bricks banner pattern, field masoned banner pattern
+	circle: circle banner pattern
+	creeper: creeper banner pattern, creeper charged banner pattern
+	cross: cross banner pattern
+	curly_border: curly border banner pattern
+	diagonal_left: left diagonal banner pattern
+	diagonal_right: right diagonal banner pattern
+	diagonal_up_left: diagonal up left banner pattern
+	diagonal_up_right: diagonal up right banner pattern
+	flow: flow banner pattern
+	flower: flower banner pattern
+	globe: globe banner pattern
+	gradient: gradient banner pattern
+	gradient_up: gradient up banner pattern
+	guster: guster banner pattern
+	half_horizontal: horizontal half banner pattern
+	half_horizontal_bottom: horizontal bottom half banner pattern
+	half_vertical: vertical half banner pattern
+	half_vertical_right: right vertical half banner pattern
+	mojang: mojang banner pattern, thing banner pattern
+	piglin: piglin banner pattern, snout banner pattern
+	rhombus: rhombus banner pattern
+	skull: skull banner pattern
+	small_stripes: small stripes banner pattern
+	square_bottom_left: bottom left square banner pattern
+	square_bottom_right: bottom right square banner pattern
+	square_top_left: top left square banner pattern
+	square_top_right: top right square banner pattern
+	straight_cross: straight cross banner pattern
+	stripe_bottom: bottom stripe banner pattern
+	stripe_center: center stripe banner pattern
+	stripe_downleft: down left stripe banner pattern
+	stripe_downright: down right stripe banner pattern
+	stripe_left: left stripe banner pattern
+	stripe_middle: middle stripe banner pattern
+	stripe_right: right stripe banner pattern
+	stripe_top: top stripe banner pattern
+	triangle_bottom: bottom triangle banner pattern
+	triangle_top: top triangle banner pattern
+	triangles_bottom: tbottom triangles banner pattern
+	triangles_top: top triangles banner pattern
+	stripe_small: small stripe banner pattern
+	diagonal_left_mirror: left diagonal mirror banner pattern
+	diagonal_right_mirror: right diagonal mirror banner pattern
+	circle_middle: middle circle banner pattern
+	rhombus_middle: middle rhombus banner pattern
+	half_vertical_mirror: vertical half mirror banner pattern
+	half_horizontal_mirror: horizontal half mirror banner pattern
+
+# -- Input Keys --
+input keys:
+	forward: forward movement key, forward key
+	backward: backward movement key, backward key
+	left: left movement key, left key
+	right: right movement key, right key
+	jump: jump key, jumping key
+	sneak: sneak key, sneaking key
+	sprint: sprint key, sprinting key
+
 # -- Boolean --
 boolean:
 	true:
@@ -2362,9 +2603,11 @@ types:
 	material: material¦s @a
 	itemstack: item stack¦s @an
 	itementity: dropped item¦s @a # same as entities.dropped item.name
+	itemflag: item flag¦s @an
 	biome: biome¦s @a
 	potioneffecttype: potion effect type¦s @a
 	potioneffect: potion effect¦s @a
+	entitypotioncause: entity potion cause¦s @an
 	enchantment: enchantment¦s @an
 	damagecause: damage cause¦s @a
 	teleportcause: teleport cause¦s @a
@@ -2382,6 +2625,7 @@ types:
 	blockdata: block data¦s @a
 	healreason: heal reason¦s @a
 	cattype: cat type¦s @a
+	wolfvariant: wolf variant¦s @a
 	gamerule: gamerule¦s @a
 	attributetype: attribute type¦s @a
 	enchantmentoffer: enchantment offer¦s @an
@@ -2393,6 +2637,22 @@ types:
 	quitreason: quit reason¦s @a
 	inventoryclosereason: inventory close reason¦s @an
 	transformreason: transform reason¦s @a
+	unleashreason: unleash reason¦s @an
+	teleportflag: teleport flag¦s @a
+	display: display¦s @a
+	billboard: billboard¦s @a
+	textalignment: text alignment¦s @a
+	itemdisplaytransform: item display transform¦s @an
+	minecrafttag: minecraft tag¦s @a
+	experiencecooldownchangereason: experience cooldown change reason¦s @a
+	inputkey: input key¦s @an
+	villagertype: villager type¦s @a
+	villagerprofession: villager profession¦s @a
+	entitysnapshot: entity snapshot¦s @an
+	loottable: loot table¦s @a
+	lootcontext: loot context¦s @a
+	bannerpatterntype: banner pattern type¦s @a
+	bannerpattern: banner pattern¦s @a
 
 	# Skript
 	weathertype: weather type¦s @a
@@ -2412,7 +2672,20 @@ types:
 	experience.pattern: (e?xp|experience( points?)?)
 	classinfo: type¦s @a
 	visualeffect: visual effect¦s @a
+	queue: queue¦s @a
+	script: script¦s @a
+	config: config¦s @a
+	node: node¦s @a
+	executable: executable¦s @an
+	function: function¦s @a
+	named: named thing¦s @a
+	numbered: numbered thing¦s @a
+	valued: valued thing¦s @a
+	containing: container¦s @a
 
 	# Hooks
 	money: money
 	region: region¦s
+
+	# Other
+	quaternion: quaternion¦s @a
diff --git a/src/main/resources/lang/dutch.lang b/src/main/resources/lang/dutch.lang
index 8169cc1286b..d1998fce9ab 100644
--- a/src/main/resources/lang/dutch.lang
+++ b/src/main/resources/lang/dutch.lang
@@ -40,10 +40,9 @@ skript command:
 			all: Schakelt alle scripts uit
 			<script>: Schakelt een specifiek script of een folder met scripts uit
 		update:
-			description: Controleert of er updates zijn, laat de lijst met wijzigingen zien of downloadt de nieuwste versie van Skript
+			description: Controleert of er updates zijn, of laat de lijst met wijzigingen zien
 			check: Controleert of er een nieuwe versie is
 			changes: Toont alle wijzigingen sinds de huidige versie
-			download: Downloadt de nieuwste versie
 		info: Toont koppelingen naar de alliassen en documentatie van Skript
 		gen-docs: Genereert documentatie met behulp van docs/templates in de plugin folder
 		test: Gebruikt voor het uitvoeren van interne Skript-tests
diff --git a/src/main/resources/lang/english.lang b/src/main/resources/lang/english.lang
index edc760276d0..9350961b1b4 100644
--- a/src/main/resources/lang/english.lang
+++ b/src/main/resources/lang/english.lang
@@ -17,6 +17,8 @@ skript:
 	no errors: All scripts loaded without errors.
 	scripts loaded: Loaded %s script¦¦s¦ with a total of %s structure¦¦s¦ in %s
 	finished loading: Finished loading.
+	warning message: It appears that /reload or another plugin reloaded Skript. This is not supported behaviour and may cause issues.
+	restart message: Please consider restarting the server instead.
 
 # -- Skript command --
 skript command:
@@ -40,10 +42,10 @@ skript command:
 			all: Disables all scripts
 			<script>: Disables a specific script or a folder of scripts
 		update:
-			description: Check for updates, read the changelog, or download the latest version of Skript
+			description: Check for updates or read the changelog
 			check: Checks for a new version
 			changes: Lists all changes since the current version
-			download: Download the newest version
+		list: Lists all enabled and disabled scripts
 		info: Prints a message with links to Skript's aliases and documentation
 		gen-docs: Generates documentation using docs/templates in plugin folder
 		test: Used for running internal Skript tests
@@ -55,6 +57,7 @@ skript command:
 		error line info: <light red><bold>Line %s:<gray> (%s)<reset>\n
 		reloading: Reloading <gold>%s<reset>...
 		reloaded: <lime>Successfully reloaded <gold>%s<lime>. <gray>(<gold>%2$sms<gray>)
+		player reload: <lime>%s <reset>is reloading <gold>%s<reset>...
 		error: <light red>Encountered <gold>%2$s <light red>error¦¦s¦ while reloading <gold>%1$s<light red>! <gray>(<gold>%3$sms<gray>)
 		script disabled: <gold>%s<reset> is currently disabled. Use <gray>/<gold>skript <cyan>enable <red>%s<reset> to enable it.
 		warning details: <yellow>    %s<reset>\n
@@ -110,6 +113,13 @@ skript command:
 			# invalid version: No changelog for the version <gold>%s<red> available
 			title: <bold><cyan>%s<reset> (%s)
 			next page: <grey>page %s of %s. Type <gold>/skript update changes %s<gray> for the next page (hint: use the up arrow key)
+	list:
+		enabled:
+			header: <white>Enabled scripts:
+			element: <lime green>  %s
+		disabled:
+			header: <white>Disabled scripts:
+			element: <light red>  %s
 	info:
 		aliases: Skript's aliases can be found here: <aqua>https://github.com/SkriptLang/skript-aliases
 		documentation: Skript's documentation can be found here: <aqua>https://docs.skriptlang.org/
@@ -119,6 +129,25 @@ skript command:
 		addons: Installed Skript Addons: <aqua>%s
 		dependencies: Installed dependencies: <aqua>%s
 
+# -- Log Messages --
+log:
+	# runtime errors
+	runtime:
+		error: <light red>The script '<gray>%s<light red>' encountered an error while executing the '<gray>%s<light red>' %s<light red>:\n
+		errors skipped: <gold>%d<light red> runtime error[s] were thrown but not printed in the last frame. From: <gray>%s
+		errors timed out: <gold>Line %d<light red> of script '<gray>%s<light red>' produced too many runtime errors (<gray>%d<light red> allowed per frame). No errors from this line will be printed for %d frames.
+		error notification: <light red>Script '<gray>%s<light red>' produced runtime errors. Please check console logs for details.
+		error notification plural: <light red>Script '<gray>%s<light red>' and %d others produced runtime errors. Please check console logs for details.
+
+		warning: <yellow>The script '<gray>%s<yellow>' encountered a warning while executing the '<gray>%s<yellow>' %s<yellow>:\n
+		warnings skipped: <yellow>%d<yellow> runtime warning[s] were thrown but not printed in the last frame. From: <gray>%s
+		warnings timed out: <gold>Line %d<yellow> of script '<gray>%s<yellow>' produced too many runtime warnings (<gray>%d<yellow> allowed per frame). No warnings from this line will be printed for %d frames.
+		warning notification: <yellow>Script '<gray>%s<yellow>' produced runtime warnings. Please check console logs for details.
+		warning notification plural: <gold>Script '<gray>%s<yellow>' and %d others produced runtime warnings. Please check console logs for details.
+
+		line info: <gold>    Line %s<white>: <gray>%s\n \n
+
+
 # -- Updater --
 updater:
 	not started: Skript has not yet checked for the latest version. Use <gold>/skript update check<reset> to do so.
diff --git a/src/main/resources/lang/french.lang b/src/main/resources/lang/french.lang
index 43204c403d8..56a7beca682 100644
--- a/src/main/resources/lang/french.lang
+++ b/src/main/resources/lang/french.lang
@@ -40,10 +40,9 @@ skript command:
 			all: Désactive tous les scripts
 			<script>: Désactive un script spécifique ou un dossier de scripts
 		update:
-			description: Vérifie les mises à jour, liste le journal des modifications ou télécharge la dernière version de Skript
+			description: Vérifie les mises à jour ou liste le journal des modifications.
 			check: Vérifie la présence d'une nouvelle version
 			changes: Liste toutes les modifications apportées depuis la version actuelle
-			download: Télécharge la dernière version
 		info: Affiche un message contenant les liens vers les alias et la documentation de Skript
 		gen-docs: Génère la documentation en utilisant docs/templates dans le dossier du plugin
 		test: Utilisé pour exécuter les tests Skript
diff --git a/src/main/resources/lang/german.lang b/src/main/resources/lang/german.lang
index adb84ece5d1..7b0dc050344 100644
--- a/src/main/resources/lang/german.lang
+++ b/src/main/resources/lang/german.lang
@@ -40,10 +40,9 @@ skript command:
 			all: Deaktiviert alle Skripte
 			<script>: Deaktiviert ein bestimmtes Skript oder einen Ordner
 		update:
-			description: Überprüft auf eine neue Version, listet Änderungen dieser auf, und kann sie auch gleich herunterladen
+			description: Überprüft auf eine neue Version oder listet Änderungen dieser auf
 			check: Überprüft, ob eine neue Version von Skript verfügbar ist
 			changes: Listet alle Änderungen seit der aktuellen Version auf (auf englisch)
-			download: Lädt die neueste Version herunter
 		info: Druckt eine Nachricht mit Links zu den Aliases und der Dokumentation von Skript.
 		gen-docs: Generiert Dokumentation mithilfe von docs/templates im Plugin-Ordner
 		test: Wird zum Ausführen von Skript-Tests verwendet
diff --git a/src/main/resources/lang/japanese.lang b/src/main/resources/lang/japanese.lang
index 8a7f1b907bc..99b91f7fa87 100644
--- a/src/main/resources/lang/japanese.lang
+++ b/src/main/resources/lang/japanese.lang
@@ -43,7 +43,6 @@ skript command:
 			description: アップデートのチェック, 変更履歴を見る, もしくは最新バージョンのSkriptをダウンロードします。
 			check: 新しいバージョンが存在するか確認します。
 			changes: 現在のバージョンとの変更点を表示します。
-			download: 最新バージョンをダウンロードします。
 		info: Skriptのエイリアスとドキュメントをリンク付きで表示します。
 		gen-docs: pluginフォルダ内にテンプレートを使用してドキュメントを生成します。
 		test: 内部テストを実行するために使用します。
diff --git a/src/main/resources/lang/korean.lang b/src/main/resources/lang/korean.lang
index dbbcb028af6..51161699f2b 100644
--- a/src/main/resources/lang/korean.lang
+++ b/src/main/resources/lang/korean.lang
@@ -43,7 +43,6 @@ skript command:
 			description: 업데이트를 확인하거나, 변경 로그를 읽거나, 최신 버전의 Skript를 다운로드합니다.
 			check: 새 버전을 확인합니다.
 			changes: 현재 버전의 모든 변경 사항을 나열합니다.
-			download: 최신 버전을 다운로드합니다.
 		info: Skript의 별명 및 문서에 대한 링크가있는 메시지를 표시합니다
 		gen-docs: 플러그인 폴더의 문서 템플릿을 사용하여 문서를 생성합니다.
 		test: Skript 테스트를 실행할 때 사용됩니다.
diff --git a/src/main/resources/lang/polish.lang b/src/main/resources/lang/polish.lang
index 6c73f4f3742..238b6d45afb 100644
--- a/src/main/resources/lang/polish.lang
+++ b/src/main/resources/lang/polish.lang
@@ -43,7 +43,6 @@ skript command:
 			description: Sprawdź aktualizację, przeczytaj listę zmian lub pobierz najnowszą wersję Skripta
 			check: Sprawdza dostępność nowszej wersji
 			changes: Wypisuje nowe zmiany od obecnej wersji
-			download: Pobiera najnowszą stabilną wersję
 		info: Wyświetla linki do aliasów i oficjalnej dokumentacji Skripta
 		gen-docs: Generuje dokumentację używając szablonów w folderze Skripta
 		test: Służy do uruchamiania wewnętrznych testów Skripta
diff --git a/src/main/resources/lang/russian.lang b/src/main/resources/lang/russian.lang
index b45880da823..fa139c5ebdf 100644
--- a/src/main/resources/lang/russian.lang
+++ b/src/main/resources/lang/russian.lang
@@ -43,7 +43,6 @@ skript command:
 			description: Проверить наличие обновлений, прочитать список изменений, или скачать последнюю версию Skript
 			check: Проверить наличие обновлений
 			changes: Вывести список всех изменений с текущей версии
-			download: Скачать самую новую версию
 		info: Выводит ссылки на алиасы Skript и документацию
 		gen-docs: Генерирует документацию, используя документации/шаблоны в папке плагина
 		test: Используется для внутреннего тестирования Skript
diff --git a/src/main/resources/lang/simplifiedchinese.lang b/src/main/resources/lang/simplifiedchinese.lang
index 67edca415ba..b5f6e26fef1 100644
--- a/src/main/resources/lang/simplifiedchinese.lang
+++ b/src/main/resources/lang/simplifiedchinese.lang
@@ -43,7 +43,6 @@ skript command:
 			description: 检查更新，阅读更新日志，或下载最新版本的Skript
 			check: 检查新版本
 			changes: 列出自当前版本以来的所有变化
-			download: 下载最新的版本
 		info: 打印一个带有Skript的别名和文档链接的信息
 		gen-docs: 使用插件文件夹中的docs/templates生成文档
 		test: 用于运行内部的Skript测试
diff --git a/src/main/resources/lang/turkish.lang b/src/main/resources/lang/turkish.lang
index 4946c6f5d9e..62329b5c67e 100644
--- a/src/main/resources/lang/turkish.lang
+++ b/src/main/resources/lang/turkish.lang
@@ -41,7 +41,6 @@ skript command:
 			description: Skript eklentisinin güncelliğini yönetmenizi sağlar. 
 			check: Yeni bir sürüm olup olmadığını kontrol eder.
 			changes: Son sürümdeki tüm değişiklikleri listeler.
-			download: En yeni sürümü indirir.
 		info: Skript'in alias ve dökümantasyon bağlantılarını gösterir.
 		gen-docs: Eklenti klasöründeki şablonları kullanarak bir dokümantasyon oluşturur.
 		test: Skript'in dahili testleri için kullanılır.
diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
index 344b536ab87..d5602bc642f 100644
--- a/src/main/resources/plugin.yml
+++ b/src/main/resources/plugin.yml
@@ -29,7 +29,7 @@ website: https://skriptlang.org
 main: ch.njol.skript.Skript
 
 version: @version@
-api-version: 1.13
+api-version: 1.19
 
 commands:
     skript:
@@ -45,14 +45,19 @@ permissions:
         default: false
         children:
             skript.effectcommands: true
+            skript.reloadnotify: true
             skript.admin: true
+            skript.see_runtime_errors: true
             #skript.config: true
     skript.effectcommands:
         default: false
         description: Allows to use effects as commands, e.g. '!set health to 10'
+    skript.reloadnotify:
+        default: false
+        description: Notifies when others are reloading script files.
     skript.admin:
         default: op
-        description: Allows to use administrative commands and to recieve notifications of new versions.
-#    skript.config:
-#        description: allows to modify the configuration files via commands
-#        default: false
+        description: Allows use of administrative commands and receiving notifications of new versions.
+    skript.see_runtime_errors:
+        default: op
+        description: Shows notifications in chat when runtime errors occur.
diff --git a/src/main/resources/scripts/-examples/chest menus.sk b/src/main/resources/scripts/-examples/chest menus.sk
index 42de70edfe3..525f7e805ab 100644
--- a/src/main/resources/scripts/-examples/chest menus.sk	
+++ b/src/main/resources/scripts/-examples/chest menus.sk	
@@ -5,11 +5,11 @@
 #
 
 command /simplechest:
-    permission: skript.example.chest
-    trigger:
-        set {_chest} to a new chest inventory named "Simple Chest"
-        set slot 0 of {_chest} to apple # Slots are numbered 0, 1, 2...
-        open {_chest} to player
+	permission: skript.example.chest
+	trigger:
+		set {_chest} to a new chest inventory named "Simple Chest"
+		set slot 0 of {_chest} to apple # Slots are numbered 0, 1, 2...
+		open {_chest} to player
 
 #
 # An example of listening for click events in a chest inventory.
@@ -17,19 +17,19 @@ command /simplechest:
 #
 
 command /chestmenu:
-    permission: skript.example.menu
-    trigger:
-        set {_menu} to a new chest inventory with 1 row named "Simple Menu"
-        set slot 4 of {_menu} to stone named "Button" # Slots are numbered 0, 1, 2...
-        open {_menu} to player
+	permission: skript.example.menu
+	trigger:
+		set {_menu} to a new chest inventory with 1 row named "Simple Menu"
+		set slot 4 of {_menu} to stone named "Button" # Slots are numbered 0, 1, 2...
+		open {_menu} to player
 
 on inventory click: # Listen for players clicking in an inventory.
-    name of event-inventory is "Simple Menu" # Make sure it's our menu.
-    cancel event
-    if index of event-slot is 4: # The button slot.
-        send "You clicked the button."
-    else:
-        send "You didn't click the button."
+	name of event-inventory is "Simple Menu" # Make sure it's our menu.
+	cancel event
+	if index of event-slot is 4: # The button slot.
+		send "You clicked the button."
+	else:
+		send "You didn't click the button."
 
 #
 # An example of making and filling a fancy inventory with a function.
@@ -37,26 +37,26 @@ on inventory click: # Listen for players clicking in an inventory.
 #
 
 aliases:
-    menu items = TNT, lava bucket, string, coal, oak planks
+	menu items = TNT, lava bucket, string, coal, oak planks
 
-function makeMenu(name: text, rows: number) :: inventory:
-    set {_gui} to a new chest inventory with {_rows} rows with name {_name}
-    loop {_rows} * 9 times: # Fill the inventory with random items.
-        set slot loop-number - 1 of {_gui} to random item out of menu items
-    return {_gui}
+function make_menu(name: text, rows: number) :: inventory:
+	set {_gui} to a new chest inventory with {_rows} rows with name {_name}
+	loop {_rows} * 9 times: # Fill the inventory with random items.
+		set slot loop-number - 1 of {_gui} to random item out of menu items
+	return {_gui}
 
 command /fancymenu:
-    permission: skript.example.menu
-    trigger:
-        set {_menu} to makeMenu("hello", 4)
-        add {_menu} to {my inventories::*} # Prepare to listen to this inventory.
-        open {_menu} to player
+	permission: skript.example.menu
+	trigger:
+		set {_menu} to make_menu("hello", 4)
+		add {_menu} to {my inventories::*} # Prepare to listen to this inventory.
+		open {_menu} to player
 
 on inventory click: # Listen for players clicking in any inventory.
-    if {my inventories::*} contains event-inventory: # Make sure it's our menu.
-        cancel event
-        send "You clicked slot %index of event-slot%!"
+	if {my inventories::*} contains event-inventory: # Make sure it's our menu.
+		cancel event
+		send "You clicked slot %index of event-slot%!"
 
 on inventory close: # No longer need to listen to this inventory.
-    {my inventories::*} contains event-inventory
-    remove event-inventory from {my inventories::*}
+	{my inventories::*} contains event-inventory
+	remove event-inventory from {my inventories::*}
diff --git a/src/main/resources/scripts/-examples/commands.sk b/src/main/resources/scripts/-examples/commands.sk
index 303eb2ee70b..40162adeb4c 100644
--- a/src/main/resources/scripts/-examples/commands.sk
+++ b/src/main/resources/scripts/-examples/commands.sk
@@ -5,10 +5,10 @@
 #
 
 command /broadcast <text>:
-    permission: skript.example.broadcast
-    description: Broadcasts a message to everybody.
-    trigger:
-        broadcast arg-text
+	permission: skript.example.broadcast
+	description: Broadcasts a message to everybody.
+	trigger:
+		broadcast arg-text
 
 #
 # A simple /home command that allows players to set, remove and travel to homes.
@@ -17,29 +17,29 @@ command /broadcast <text>:
 #
 
 command /home <text> [<text>]:
-    description: Set, delete or travel to your home.
-    usage: /home set/remove <name>, /home <name>
-    permission: skript.example.home
-    executable by: players
-    trigger:
-        if arg-1 is "set":
-            if arg-2 is set:
-                set {homes::%uuid of player%::%arg-2%} to player's location
-                send "Set your home <green>%arg-2%<reset> to <grey>%location of player%<reset>" to player
-            else:
-                send "You must specify a name for this home." to player
-        else if arg-1 is "remove":
-            if arg-2 is set:
-                delete {homes::%uuid of player%::%arg-2%}
-                send "Deleted your home <green>%arg-2%<reset>" to player
-            else:
-                send "You must specify the name of this home." to player
-        else if arg-2 is set:
-            send "Correct usage: /home set/remove <name>" to player
-        else if {homes::%uuid of player%::%arg-1%} is set:
-            teleport player to {homes::%uuid of player%::%arg-1%}
-        else:
-            send "You have no home named <green>%arg-1%<reset>." to player
+	description: Set, delete or travel to your home.
+	usage: /home set/remove <name>, /home <name>
+	permission: skript.example.home
+	executable by: players
+	trigger:
+		if arg-1 is "set":
+			if arg-2 is set:
+				set {homes::%uuid of player%::%arg-2%} to player's location
+				send "Set your home <green>%arg-2%<reset> to <grey>%location of player%<reset>" to player
+			else:
+				send "You must specify a name for this home." to player
+		else if arg-1 is "remove":
+			if arg-2 is set:
+				delete {homes::%uuid of player%::%arg-2%}
+				send "Deleted your home <green>%arg-2%<reset>" to player
+			else:
+				send "You must specify the name of this home." to player
+		else if arg-2 is set:
+			send "Correct usage: /home set/remove <name>" to player
+		else if {homes::%uuid of player%::%arg-1%} is set:
+			teleport player to {homes::%uuid of player%::%arg-1%}
+		else:
+			send "You have no home named <green>%arg-1%<reset>." to player
 
 #
 # An /item command that accepts Skript item aliases.
@@ -48,24 +48,24 @@ command /home <text> [<text>]:
 #
 
 aliases:
-    # Creates an alias `blacklisted` for this list of items.
-    blacklisted = TNT, bedrock, obsidian, mob spawner, lava, lava bucket
+	# Creates an alias `blacklisted` for this list of items.
+	blacklisted = TNT, bedrock, obsidian, spawner, lava, lava bucket
 
 command /item <items>:
-    description: Give yourself some items.
-    usage: /item <items...>
-    aliases: /i
-    executable by: players
-    permission: skript.example.item
-    cooldown: 30 seconds
-    cooldown message: You need to wait %remaining time% to use this command again.
-    cooldown bypass: skript.example.cooldown
-    trigger:
-        if player has permission "skript.example.item.all":
-            give argument to player
-        else:
-            loop argument:
-                if loop-item is not blacklisted:
-                    give loop-item to player
-                else:
-                    send "<red>%loop-item%<reset> is blacklisted and cannot be spawned." to player
+	description: Give yourself some items.
+	usage: /item <items...>
+	aliases: /i
+	executable by: players
+	permission: skript.example.item
+	cooldown: 30 seconds
+	cooldown message: You need to wait %remaining time% to use this command again.
+	cooldown bypass: skript.example.cooldown
+	trigger:
+		if player has permission "skript.example.item.all":
+			give argument to player
+		else:
+			loop argument:
+				if loop-item is not blacklisted:
+					give loop-item to player
+				else:
+					send "<red>%loop-item%<reset> is blacklisted and cannot be spawned." to player
diff --git a/src/main/resources/scripts/-examples/events.sk b/src/main/resources/scripts/-examples/events.sk
index 45fbfb2a7d5..6d6aa6d8ad4 100644
--- a/src/main/resources/scripts/-examples/events.sk
+++ b/src/main/resources/scripts/-examples/events.sk
@@ -5,10 +5,10 @@
 #
 
 on join:
-    set the join message to "Oh look, %player% joined! :)"
+	set the join message to "Oh look, %player% joined! :)"
 
 on quit:
-    set the quit message to "Oh no, %player% left! :("
+	set the quit message to "Oh no, %player% left! :("
 
 #
 # This example cancels damage for players if they have a specific permission.
@@ -16,14 +16,14 @@ on quit:
 #
 
 on damage:
-    victim is a player
-    if the victim has permission "skript.example.damage":
-        cancel the event # Stops the default behaviour - the victim taking damage.
-    else:
-        send "Ouch! You took %damage% damage." to the victim
-        add damage to {damage::%uuid of victim%::taken}
-        if the attacker is a player:
-            add damage to {damage::%uuid of attacker%::dealt}
+	victim is a player
+	if the victim has permission "skript.example.damage":
+		cancel the event # Stops the default behaviour - the victim taking damage.
+	else:
+		send "Ouch! You took %damage% damage." to the victim
+		add damage to {damage::%uuid of victim%::taken}
+		if the attacker is a player:
+			add damage to {damage::%uuid of attacker%::dealt}
 
 #
 # This example allows players to wear specified blocks as hats.
@@ -31,14 +31,14 @@ on damage:
 #
 
 aliases: # An alias for our allowed hat items.
-    custom helmets = iron block, gold block, diamond block
+	custom helmets = iron block, gold block, diamond block
 
 on inventory click:
-    event-slot is the helmet slot of player # Check that player clicked their head slot.
-    inventory action is place all or nothing
-    player has permission "skript.example.helmet"
-    cursor slot of player is custom helmets # Check if the item is in our custom alias.
-    cancel the event
-    set {_old helmet} to the helmet of player
-    set the helmet of player to the cursor slot of player
-    set the cursor slot of player to {_old helmet}
+	event-slot is the helmet slot of player # Check that player clicked their head slot.
+	inventory action is place all or nothing
+	player has permission "skript.example.helmet"
+	cursor slot of player is custom helmets # Check if the item is in our custom alias.
+	cancel the event
+	set {_old helmet} to the helmet of player
+	set the helmet of player to the cursor slot of player
+	set the cursor slot of player to {_old helmet}
diff --git a/src/main/resources/scripts/-examples/experimental features/for loops.sk b/src/main/resources/scripts/-examples/experimental features/for loops.sk
new file mode 100644
index 00000000000..a4a7f71ab5d
--- /dev/null
+++ b/src/main/resources/scripts/-examples/experimental features/for loops.sk	
@@ -0,0 +1,50 @@
+using examples
+
+# This flag enables the experimental 'for each loops' feature within this file
+using for loops
+
+
+example: # A simple loop
+
+	# For-loops allow you to extract the loop value directly into a variable
+	for each {_player} in all players:
+		send "Hello!" to {_player}
+
+	# This is exactly the same as using a regular loop and loop-value
+	loop all players:
+		send "Hello!" to loop-value
+
+
+example: # Nested loops
+
+	# For loops are designed to help when nesting multiple loops
+	for each {_word} in {words::*}:
+		for each {_player} in all players:
+			send "The word is %{_word}%" to {_player}
+
+	# This is exactly the same as the following
+	loop {words::*}:
+		loop all players:
+			send "The word is %loop-value-1%" to loop-value-2
+
+
+example: # Keeping the last value
+
+	# Since the loop value is extracted to a variable,
+	# this is still available at the end of the loop
+	for {_player} in all players:
+		send "Hello!" to {_player}
+
+	# The final player to be looped is still in the variable
+	send "(You're my favourite)" to {_player}
+
+
+example: # Index and value
+
+	# For a list with keys, you can extract both the key and the value
+	for index {_number}, value {_value} in {my list::*}:
+		broadcast "%{_number}%. %{_value}%"
+
+	# You can also loop only the indices
+	for index {_key} in {my list::*}:
+		broadcast {_key}
diff --git a/src/main/resources/scripts/-examples/experimental features/queues.sk b/src/main/resources/scripts/-examples/experimental features/queues.sk
new file mode 100644
index 00000000000..a03c8ce956a
--- /dev/null
+++ b/src/main/resources/scripts/-examples/experimental features/queues.sk	
@@ -0,0 +1,175 @@
+using examples
+
+# This flag enables the experimental 'queues' feature within this file
+using queues
+
+example: # Creating queues
+
+	# Queues are a storage container for objects.
+	set {queue} to a queue
+
+	# Queues function like {lists::*} but are a single variable.
+	add "hello" to {queue}
+	remove "hello" from {queue}
+	clear {queue}
+
+	# You can create a queue with some initial items in it
+	set {queue} to a queue of "hello" and "world"
+
+	# You can also create a queue of things from a list
+	# Anything can go in a queue
+	set {my items::*} to potato, apple and carrot
+	set {queue} to a queue of {my items::*}
+
+
+example: # Taking items from a queue
+
+	set {queue} to a queue of "hello" and "world"
+
+	# Asking for an item from the queue also removes it
+	the first element of {queue} is "hello"
+	# 'hello' is gone
+
+	the first element of {queue} is "world"
+	# 'world' is gone
+
+	{queue} is empty
+
+
+example: # Taking items from the end of a queue
+
+	set {queue} to a queue of "hello" and "world"
+
+	the last element of {queue} is "world"
+	# 'world' is gone
+
+	the last element of {queue} is "hello"
+	# 'hello' is gone
+
+	{queue} is empty
+
+
+example: # Processing a queue
+
+	# Queues are First In, First Out (FIFO)
+	# This means new items are added to the END, and removed from the START
+
+	set {queue} to a queue of "hello"
+
+	add "world" to {queue}
+	# Queue is now 'hello', 'world'
+	broadcast the first element of {queue}
+	# 'hello' is gone
+
+	add "hello" to {queue}
+	# Queue is now 'world', 'hello'
+
+
+example: # Looping a queue
+
+	# Looping items in a queue also removes them
+	set {queue} to a queue of all players
+
+	loop {queue}:
+		send "Good morning!" to loop-value
+
+	# All the items were processed
+	{queue} is empty
+
+	# This means queues are good for pausing and resuming a task
+	# without losing your progress!
+	set {queue} to a queue of all players
+	set {count} to 0
+
+	loop {queue}:
+		teleport loop-value to {my cool battle arena}
+		# Each player is removed in this loop
+		add 1 to {count}
+
+		if {count} is 10:
+			# We have too many players in the battle arena for now!
+			exit loop
+
+	wait 1 minute
+	# Only the players we didn't loop before are still in the queue
+	loop {queue}:
+		teleport loop-value to {my cool battle arena}
+
+
+example: # Turning a queue into a list
+
+	set {queue} to a queue of "hello" and "world"
+	# We can copy the items in the queue into a list
+	set {my list::*} to dequeued {queue}
+	{my list::*} is "hello" and "world"
+	# Deconstructing the queue does not remove them from the queue
+
+	the first 2 elements in {queue} are "hello" and "world"
+	# But asking for the elements does!
+	{queue} is empty
+
+
+example: # Peeking at a queue without removing items
+
+	# Sometimes, we want to check what the next item will be, without removing it
+	set {queue} to a queue of "hello" and "world"
+	# We can 'peek' at the first and last elements
+	the start of {queue} is "hello"
+	the end of {queue} is "world"
+
+	# We can also change these values
+	set the end of {queue} to "there"
+	# The queue is now 'hello', 'there'
+
+	# The other change effects (set, add, remove, delete) also work here
+	add "well," to the start of {queue}
+	# The queue is now 'well,', 'hello', 'there'
+
+	delete the end of {queue}
+	# The queue is now 'well,', 'hello'
+
+
+using for loops
+example: # Continuous processing of a queue
+
+	# Create a queue of all players (now) and some items
+	set {players} to a queue of all players
+	set {gifts} to a queue of potato, apple and carrot
+
+	# This will keep cycling through the 'players' and 'gifts' queues
+	# until all of the initial players are no longer online
+	for each {_player} in {players}:
+		{_player} is online
+		set {_item} to the first element of {gifts}
+		give {_item} to {_player}
+
+		# Add the player and item back to their queue
+		add {_player} to {players}
+		add {_item} to {gifts}
+		# As items are added to the END of a queue, this will cycle round in order
+
+		# This will loop forever, so we want a delay
+		wait 30 seconds
+
+
+#
+# A queue for rotating periodical announcements
+#
+
+on script load:
+	# Create an empty queue
+	set {advert messages} to a queue
+
+	# Add some messages to it
+	add "Welcome to my server!" to {advert messages}
+	add "All furniture, 5%% off in store and online!" to {advert messages}
+	add "Discount sale on christmas trees!" to {advert messages}
+	add "Vote for [candidate name]!" to {advert messages}
+
+every 3 minutes:
+	# Take the first message out of the queue
+	set {_message} to the first element of {advert messages}
+	broadcast "<red>" + {_message}
+
+	# Add the message back to the end of the queue
+	add {_message} to {advert messages}
diff --git a/src/main/resources/scripts/-examples/experimental features/script reflection.sk b/src/main/resources/scripts/-examples/experimental features/script reflection.sk
new file mode 100644
index 00000000000..05d2fe1f4eb
--- /dev/null
+++ b/src/main/resources/scripts/-examples/experimental features/script reflection.sk	
@@ -0,0 +1,244 @@
+using examples
+
+# This flag enables the experimental 'script reflection' feature within this file
+# Script reflection is a collection of powerful tools for scripts to inspect themselves
+using script reflection
+
+
+###
+THE BASICS
+=====
+
+'Reflection' is for something to look at itself (like in a mirror).
+
+Script reflection is a collection of powerful tools for scripts to inspect themselves.
+
+We can start with basic access to scripts.
+###
+
+
+example: # Getting a script
+
+	# You can obtain the current script
+	set {_script} to the current script
+	{_script} exists
+
+	# You can also find a script by name
+	set {_script} to the script named "my cool script.sk"
+
+	# Even if it's in a folder
+	set {_script} to the script named "examples/events.sk"
+
+	# Even if it's not enabled
+	set {_script} to the script named "-disabled script.sk"
+
+
+example: # Looping scripts
+
+	# It's possible to find multiple scripts at a time.
+	set {_scripts::*} to all loaded scripts
+	set {_scripts::*} to the scripts named "my script.sk" and "my cooler script.sk"
+	set {_scripts::*} to the scripts in folder "examples/"
+
+	loop all loaded scripts:
+		broadcast name of loop-value
+
+
+example: # The name and path of a script
+
+	# Scripts have a name, which is their file name (without .sk)
+	set {_script} to the script named "my script.sk"
+	the name of {_script} is "my script"
+
+	# This doesn't include their folder name
+	set {_script} to the script named "folder/my script.sk"
+	the name of {_script} is "my script"
+
+	# However, if you just print out a script, it will include the whole path
+	set {_script} to the script named "folder/my script.sk"
+	"%{_script}%" is "folder/my script.sk"
+
+
+example: # Enabling, disabling and loading scripts
+
+	# You can enable a disabled script
+	set {_script} to the script named "-disabled script.sk"
+	# This parses and loads its code
+	enable {_script}
+
+	# Now that it's been enabled, you can disable it again
+	set {_script} to the script named "disabled script.sk"
+	# This unloads its code and renames the script
+	disable {_script}
+
+	# A disabled script is skipped when Skript loads
+	# If you want to remove it temporarily, you can `unload` it
+	set {_script} to the script named "my cool script.sk"
+	unload {_script}
+
+	# You can then load it again, which is the same as enabling
+	load {_script}
+
+	# Or just reload it
+	reload {_script}
+
+
+###
+CONFIGS
+=====
+
+There are also tools provided for reading Skript's built-in configuration files.
+These allow you to check values from these files.
+
+Configs are arranged as a tree of 'nodes', which have values:
+
+regular node: value
+regular node: value
+section node: # This node contains more nodes!
+	regular node: value
+	regular node: value
+	another section node: # Sections can contain sections!
+		regular node: value
+###
+
+
+example: # Get the Skript config
+
+	set {_config} to the skript config
+	{_config} exists
+
+
+example: # Reading a simple node value
+
+	# Since configs are arranged in 'nodes' which have values,
+	# we just need to ask for these nodes, and then ask for their values
+
+	# You can get a node value directly from a config by name
+	set {_value} to the boolean value at "color codes reset formatting" in the skript config
+	broadcast "Do colour codes reset formatting? %{_value}%"
+
+	# You can also get a node specifically
+	set {_node} to the node "number accuracy" of {_config}
+	# And then check its value
+	set {_value} to the number value of {_node}
+	broadcast "Number accuracy: %{_value}%"
+
+
+example: # Value conversion
+
+	set {_node} to the node "number accuracy" of the skript config
+
+	# By specifying the TYPE of value you want, it is automatically parsed and converted
+	set {_value} to the text value of {_node}
+	{_value} is a text
+
+	set {_value} to the number value of {_node}
+	{_value} is a number
+
+	delete {_value}
+
+	# If it is impossible to convert or parse the value to what you asked for,
+	# it will be nothing
+	set {_value} to the player value of {_node}
+	# '0.1' can't be converted to a player
+	{_value} does not exist
+
+
+example: # Looping nodes
+
+	# A config can be treated as a node
+	set {_node} to the skript config
+	# The nodes inside a section (or a config)
+	loop the nodes of {_node}:
+		# Nodes have a name
+		broadcast the name of loop-value
+
+
+###
+MORE CONFIGS
+=====
+
+Scripts themselves are stored as configs, where each line is a node.
+This means that you are able to read the content of a script.
+
+The examples in this section will use a 'my script.sk' which has the following code:
+
+on first join:
+	give apple to the player
+
+on damage:
+	if the attacker exists:
+		teleport the attacker to the victim
+###
+
+
+example: # Reading a script
+
+	# A script is also a config
+	set {_script} to the script named "my script.sk"
+
+	# The code in each line is the node name
+	set {_node} to the node "on first join" in {_script}
+
+	# This event is a section, so we can loop it
+	loop the nodes of {_node}:
+		# There is only one line (node) in the section
+		the name of loop-value is "give apple to the player"
+
+	# You can traverse the node tree like this
+	set {_node} to the node "on damage" in {_script}
+	set {_node} to the node "if the attacker exists" in {_node}
+	# The first line inside that section
+	set {_node} to the first element of nodes of {_node}
+
+	the name of {_node} is "teleport the attacker to the victim"
+
+
+
+###
+FUNCTIONS
+=====
+
+The final part of script reflection is the ability to find and run a function.
+###
+
+example: # Finding a function
+
+	# You can find a function by name
+	set {_my function} to the function "my_function"
+	set {_my function} to the function "my_function()"
+
+	# You can also find a function from a particular script
+	set {_my function} to the function "my_function" from {_my script}
+
+	# You can even get multiple functions at once
+	set {_functions::*} to all functions from the current script
+
+
+example: # Running a function
+
+	set {_my function} to the function "my_function()"
+	# You can now run this function
+	run {_my function}
+
+	# You can also provide the arguments for running this function
+	run {_my function} with arguments "hello" and 7.5
+
+
+example: # The result of a function
+
+	# Some functions return a result
+	set {_my function} to the function "my_function()"
+	# Asking for the result runs the function
+	set {_result} to the result of {_my function}
+
+	# You can also ask for the result with arguments
+	set {_result} to the result of {_my function} with arguments "hello" and 7.5
+
+
+# An example command to run a function by name
+command /func <text>:
+	permission: skript.example.reflection
+	trigger:
+		set {_function} to the function arg-text
+		run {_function}
diff --git a/src/main/resources/scripts/-examples/functions.sk b/src/main/resources/scripts/-examples/functions.sk
index bb743a075dd..723f6d79fb0 100644
--- a/src/main/resources/scripts/-examples/functions.sk
+++ b/src/main/resources/scripts/-examples/functions.sk
@@ -4,52 +4,52 @@
 # This demonstrates how to declare and run a simple function.
 #
 
-function sayMessage(message: text):
-    broadcast {_message} # our message argument is available in `{_message}`.
+function say_message(message: text):
+	broadcast {_message} # our message argument is available in `{_message}`.
 
 on first join:
-    wait 1 second
-    sayMessage("Welcome, %player%!") # Runs the `sayMessage` function.
+	wait 1 second
+	say_message("Welcome, %player%!") # Runs the `say_message` function.
 
 #
 # An example of a function with multiple parameters and a return type.
 # This demonstrates how to return a value and use it.
 #
 
-function giveApple(name: text, amount: number) :: item:
-    set {_item} to an apple
-    set the name of {_item} to {_name}
-    set the item amount of {_item} to {_amount}
-    return {_item} # Gives this value to the code that called the function.
+function give_apple(name: text, amount: number) :: item:
+	set {_item} to an apple
+	set the name of {_item} to {_name}
+	set the item amount of {_item} to {_amount}
+	return {_item} # Gives this value to the code that called the function.
 
 command /appleexample:
-    permission: skript.example.apple
-    trigger:
-        send "Giving you an apple!"
-        set {_item} to giveApple("Banana", 4)
-        give player {_item}
+	permission: skript.example.apple
+	trigger:
+		send "Giving you an apple!"
+		set {_item} to give_apple("Banana", 4)
+		give player {_item}
 
 #
 # An example of a recursive (self-calling) function that is used to repeat a complex task.
 # Please note that self-calling functions can loop infinitely, so use with caution.
 #
 
-function destroyOre(source: block) :: blocks:
-    add {_source} to {_found::*}
-    break {_source} naturally using an iron pickaxe
-    loop blocks in radius 1 of {_source}:
-        loop-block is any ore
-        break loop-block naturally using an iron pickaxe
-        if {_found::*} does not contain loop-block:
-            add destroyOre(loop-block) to {_found::*}
-    return {_found::*}
+function destroy_gold(source: block) :: blocks:
+	add {_source} to {_found::*}
+	break {_source} naturally using an iron pickaxe
+	loop blocks in radius 1 of {_source}:
+		loop-block is a gold ore block
+		break loop-block naturally using an iron pickaxe
+		if {_found::*} does not contain loop-block:
+			add destroy_gold(loop-block) to {_found::*}
+	return {_found::*}
 
 command /oreexample:
-    permission: skript.example.ore
-    trigger:
-        if player's target block is any ore:
-            send "Destroying all connected ore."
-            set {_found::*} to destroyOre(player's target block)
-            send "Destroyed %size of {_found::*}% connected ores!"
-        else:
-            send "<red>You must be looking at an ore block!"
+	permission: skript.example.ore
+	trigger:
+		if the player's target block is a gold ore block:
+			send "Destroying all connected ore."
+			set {_found::*} to destroy_gold(player's target block)
+			send "Destroyed %size of {_found::*}% connected ores!"
+		else:
+			send "<red>You must be looking at an ore block!"
diff --git a/src/main/resources/scripts/-examples/loops.sk b/src/main/resources/scripts/-examples/loops.sk
index 73765868c2c..5448907f815 100644
--- a/src/main/resources/scripts/-examples/loops.sk
+++ b/src/main/resources/scripts/-examples/loops.sk
@@ -5,15 +5,15 @@
 #
 
 command /loopexample:
-    permission: skript.example.loop
-    trigger:
-        set {_number} to 5
-        loop {_number} times: # Runs `{_number}` times.
-            send "The number is %loop-number%."
+	permission: skript.example.loop
+	trigger:
+		set {_number} to 5
+		loop {_number} times: # Runs `{_number}` times.
+			send "The number is %loop-number%."
 
-        set {_list::*} to "apple", "banana" and "orange"
-        loop {_list::*}: # Runs for each value in the list.
-            send "The word is: %loop-value%"
+		set {_list::*} to "apple", "banana" and "orange"
+		loop {_list::*}: # Runs for each value in the list.
+			send "The word is: %loop-value%"
 
 #
 # Examples for while-loops, which run as long as the condition is true.
@@ -21,31 +21,31 @@ command /loopexample:
 #
 
 command /whileexample:
-    permission: skript.example.while
-    trigger:
-        set {_number} to 5
-        while {_number} is greater than 0:
-            send "The number is %{_number}%"
-            remove a random number between 0 and 2 from {_number}
-        send "Finished counting down."
+	permission: skript.example.while
+	trigger:
+		set {_number} to 5
+		while {_number} is greater than 0:
+			send "The number is %{_number}%"
+			remove a random number between 0 and 2 from {_number}
+		send "Finished counting down."
 
-        while true is true: # this will run forever
-            add "banana" to {_list::*}
-            if size of {_list::*} is 10:
-                exit loop
-        send "The list has %size of {_list::*}% bananas."
+		while true is true: # this will run forever
+			add "banana" to {_list::*}
+			if size of {_list::*} is 10:
+				exit loop
+		send "The list has %size of {_list::*}% bananas."
 
 command /dowhileexample:
-    permission: skript.example.dowhile
-    trigger:
-        set {_number} to a random integer between 0 and 6 # The player will get 1 to 3 apples.
-        do while {_number} is greater than 3: # This will always run at least once, even if `{_number} is less than or equal to 3`.
-            give the player an apple
-            remove 1 from {_number}
-        send "Finished giving out apples!"
+	permission: skript.example.dowhile
+	trigger:
+		set {_number} to a random integer between 0 and 6 # The player will get 1 to 3 apples.
+		do while {_number} is greater than 3: # This will always run at least once, even if `{_number} is less than or equal to 3`.
+			give the player an apple
+			remove 1 from {_number}
+		send "Finished giving out apples!"
 
-        do while true is false: # This will run once - the condition is checked AFTER the code is executed.
-            send "I will run only once!"
+		do while true is false: # This will run once - the condition is checked AFTER the code is executed.
+			send "I will run only once!"
 
 #
 # Examples for looping collections of specific types, such as players, blocks and items.
@@ -53,23 +53,22 @@ command /dowhileexample:
 #
 
 command /anotherloopexample:
-    permission: skript.example.loop
-    trigger:
-        send "Listing all players:"
-        loop all players: # Remember - player is the command sender, loop-player is the loop value.
-            send " - %loop-player%"
-            if loop-player has permission "skript.example.apple":
-                give loop-player an apple named "Potato"
+	permission: skript.example.loop
+	trigger:
+		send "Listing all players:"
+		loop all players: # Remember - player is the command sender, loop-player is the loop value.
+			send " - %loop-player%"
+			if loop-player has permission "skript.example.apple":
+				give loop-player an apple named "Potato"
 
-        set {_items::*} to stone, oak planks and an apple
-        loop {_items::*}:
-            send "%loop-index%. %loop-value%"
-            give loop-value to player
+		set {_items::*} to stone, oak planks and an apple
+		loop {_items::*}:
+			send "%loop-index%. %loop-value%"
+			give loop-value to player
 
-        loop blocks in radius 2 of player:
-            loop-block is a chest
-            loop items of types ore and log: # Loop-block comes from the first loop, loop-item from the second.
-                inventory of loop-block contains loop-item
-                remove loop-item from the inventory of loop-block
-                send "Destroyed a %loop-item%!"
-                exit loop # Exits the item loop.
+		loop blocks in radius 2 of player:
+			loop-block is a chest
+			loop items in loop-block: # Loop-block comes from the first loop, loop-item from the second.
+				loop-item is a dirt block # Matches any dirt block item
+				send "%loop-block% contains %loop-item%!"
+				exit loop # Exits the item loop.
diff --git a/src/main/resources/scripts/-examples/options and meta.sk b/src/main/resources/scripts/-examples/options and meta.sk
index 8d0e1c35955..912d7d83729 100644
--- a/src/main/resources/scripts/-examples/options and meta.sk	
+++ b/src/main/resources/scripts/-examples/options and meta.sk	
@@ -4,15 +4,15 @@
 #
 
 options:
-    my server name: Server Name
-    condition: player is alive
-    nice message: "You're alive!"
+	my server name: Server Name
+	condition: player is alive
+	nice message: "You're alive!"
 
 on join:
-    send "Welcome to {@my server name}"
-    # Options don't need `%...%` since they are raw inputs.
-    if {@condition}: # The raw `player is alive` is copied here during parsing.
-        send {@nice message}
+	send "Welcome to {@my server name}"
+	# Options don't need `%...%` since they are raw inputs.
+	if {@condition}: # The raw `player is alive` is copied here during parsing.
+		send {@nice message}
 
 #
 # An example of custom aliases for groups of items.
@@ -20,11 +20,11 @@ on join:
 #
 
 aliases:
-    pretty items = iron ingot, gold ingot, diamond
+	pretty items = iron ingot, gold ingot, diamond
 
 on join:
-    player has permission "skript.example.aliases"
-    give player random item out of pretty items # A random item from our alias.
+	player has permission "skript.example.aliases"
+	give player random item out of pretty items # A random item from our alias.
 
 #
 # An example showing how default variables can be used.
@@ -33,12 +33,12 @@ on join:
 #
 
 variables:
-    score::%player% = 100
-    some variable = "Hello"
+	{score::%player%} = 100
+	{some variable} = "Hello"
 
 command /variabletest:
-    permission: skript.example.variables
-    trigger:
-        add 1 to {score::%player%}
-        send "Your score is now %{score::%player%}%."
-        send {some variable}
+	permission: skript.example.variables
+	trigger:
+		add 1 to {score::%player%}
+		send "Your score is now %{score::%player%}%."
+		send {some variable}
diff --git a/src/main/resources/scripts/-examples/text formatting.sk b/src/main/resources/scripts/-examples/text formatting.sk
index 5163ca116c3..d3771ccc5f4 100644
--- a/src/main/resources/scripts/-examples/text formatting.sk	
+++ b/src/main/resources/scripts/-examples/text formatting.sk	
@@ -8,11 +8,11 @@
 #
 
 command /color:
-    permission: skript.example.color
-    trigger:
-        send "&6This message is golden."
-        send "<light red><bold>This message is light red and bold."
-        send "<#FF0000>This message is red."
+	permission: skript.example.color
+	trigger:
+		send "&6This message is golden."
+		send "<light red><bold>This message is light red and bold."
+		send "<#FF0000>This message is red."
 
 #
 # Other formatting options are also available.
@@ -20,19 +20,19 @@ command /color:
 #
 
 command /forum:
-    permission: skript.example.link
-    trigger:
-        send "To visit the website, [<link:https://google.com><tooltip:click here>click here<reset>]"
+	permission: skript.example.link
+	trigger:
+		send "To visit the website, [<link:https://google.com><tooltip:click here>click here<reset>]"
 
 command /copy <text>:
-    permission: skript.example.copy
-    trigger:
-        # Insertion: when the player shift clicks on the message, it will add the text to their text box.
-        # To use variables and other expressions with these tags, you have to send the text as `formatted`.
-        send formatted "<insertion:%arg-1%>%arg-1%"
+	permission: skript.example.copy
+	trigger:
+		# Insertion: when the player shift clicks on the message, it will add the text to their text box.
+		# To use variables and other expressions with these tags, you have to send the text as `formatted`.
+		send formatted "<insertion:%arg-1%>%arg-1%"
 
 command /suggest:
-    permission: skript.example.suggest
-    trigger:
-        send "<cmd:/say hi>Click here to run the command /say hi"
-        send "<sgt:/say hi>Click here to suggest the command /say hi"
+	permission: skript.example.suggest
+	trigger:
+		send "<cmd:/say hi>Click here to run the command /say hi"
+		send "<sgt:/say hi>Click here to suggest the command /say hi"
diff --git a/src/main/resources/scripts/-examples/timings.sk b/src/main/resources/scripts/-examples/timings.sk
index 18073095e5e..b99e4b70967 100644
--- a/src/main/resources/scripts/-examples/timings.sk
+++ b/src/main/resources/scripts/-examples/timings.sk
@@ -4,7 +4,7 @@
 #
 
 at 18:00:
-    set the time to 7:00
+	set the time to 7:00
 
 #
 # This example schedules a repeating action. Each time the delay elapses, the trigger will be run.
@@ -12,25 +12,25 @@ at 18:00:
 #
 
 every 5 minutes:
-    broadcast "Did you know that five minutes have passed?"
-    loop all players:
-        if loop-player has permission "skript.example.apple":
-            give loop-player an apple
+	broadcast "Did you know that five minutes have passed?"
+	loop all players:
+		if loop-player has permission "skript.example.apple":
+			give loop-player an apple
 
 #
 # This example shows how the `wait` effect can be used to delay code being run.
 #
 
 command /waitexample:
-    permission: skript.example.wait
-    trigger:
-        send "Waiting for two seconds..."
-        wait 2 seconds
-        send "Finished waiting!"
+	permission: skript.example.wait
+	trigger:
+		send "Waiting for two seconds..."
+		wait 2 seconds
+		send "Finished waiting!"
 
-        send "Counting to five."
-        set {_count} to 0
-        while {_count} is less than 5:
-            wait 3 ticks # Minecraft game ticks: 20 ticks = 1 second.
-            add 0.5 to {_count}
-        send "Finished counting!"
+		send "Counting to five."
+		set {_count} to 0
+		while {_count} is less than 5:
+			wait 3 ticks # Minecraft game ticks: 20 ticks = 1 second.
+			add 0.5 to {_count}
+		send "Finished counting!"
diff --git a/src/main/resources/scripts/-examples/variables.sk b/src/main/resources/scripts/-examples/variables.sk
index a39061e1230..1cd6aa4ccce 100644
--- a/src/main/resources/scripts/-examples/variables.sk
+++ b/src/main/resources/scripts/-examples/variables.sk
@@ -7,13 +7,13 @@
 #
 
 command /timer:
-    permission: skript.example.timer
-    trigger:
-        if {timer} is set:
-            send "This command was last run %time since {timer}% ago."
-        else:
-            send "This command has never been run."
-        set {timer} to now
+	permission: skript.example.timer
+	trigger:
+		if {timer} is set:
+			send "This command was last run %time since {timer}% ago."
+		else:
+			send "This command has never been run."
+		set {timer} to now
 
 #
 # This example stores two items in a global list variable `{items::%uuid of player%::*}`.
@@ -21,17 +21,17 @@ command /timer:
 #
 
 on join:
-    set {items::%uuid of player%::helmet} to player's helmet
-    set {items::%uuid of player%::boots} to player's boots
-    send "Stored your helmet and boots."
+	set {items::%uuid of player%::helmet} to player's helmet
+	set {items::%uuid of player%::boots} to player's boots
+	send "Stored your helmet and boots."
 
 command /outfit:
-    executable by: players
-    permission: skript.example.outfit
-    trigger:
-        give player {items::%uuid of player%::*} # gives the contents of the list
-        clear {items::%uuid of player%::*} # clears this list
-        send "Gave you the helmet and boots you joined with."
+	executable by: players
+	permission: skript.example.outfit
+	trigger:
+		give player {items::%uuid of player%::*} # gives the contents of the list
+		clear {items::%uuid of player%::*} # clears this list
+		send "Gave you the helmet and boots you joined with."
 
 #
 # An example of adding, looping and removing the contents of a list variable.
@@ -39,15 +39,15 @@ command /outfit:
 #
 
 command /shoppinglist:
-    permission: skript.example.list
-    trigger:
-        add "bacon" to {_shopping list::*}
-        add "eggs" to {_shopping list::*}
-        add "oats" and "sugar" to {_shopping list::*}
-        send "You have %size of {_shopping list::*}% things in your shopping list:"
-        loop {_shopping list::*}:
-            send "%loop-index%. %loop-value%"
-        send "You bought some %{_shopping list::1}%!"
-        remove "bacon" from {_shopping list::*}
-        send "Removing bacon from your list."
-        send "You now have %size of {_shopping list::*}% things in your shopping list."
+	permission: skript.example.list
+	trigger:
+		add "bacon" to {_shopping list::*}
+		add "eggs" to {_shopping list::*}
+		add "oats" and "sugar" to {_shopping list::*}
+		send "You have %size of {_shopping list::*}% things in your shopping list:"
+		loop {_shopping list::*}:
+			send "%loop-index%. %loop-value%"
+		send "You bought some %{_shopping list::1}%!"
+		remove "bacon" from {_shopping list::*}
+		send "Removing bacon from your list."
+		send "You now have %size of {_shopping list::*}% things in your shopping list."
diff --git a/src/test/java/ch/njol/skript/config/ConfigTest.java b/src/test/java/ch/njol/skript/config/ConfigTest.java
new file mode 100644
index 00000000000..171d503856c
--- /dev/null
+++ b/src/test/java/ch/njol/skript/config/ConfigTest.java
@@ -0,0 +1,61 @@
+package ch.njol.skript.config;
+
+import org.junit.Test;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Set;
+
+import static org.junit.Assert.*;
+
+public class ConfigTest {
+
+	@Test
+	public void testUpdateNodes() {
+		Config old = getConfig("old-config");
+		Config newer = getConfig("new-config");
+
+		boolean updated = old.updateNodes(newer);
+
+		assertTrue("updateNodes did not update any nodes", updated);
+
+		Set<Node> newNodes = Config.discoverNodes(newer.getMainNode());
+		Set<Node> updatedNodes = Config.discoverNodes(old.getMainNode());
+
+		for (Node node : newNodes) {
+			assertTrue("Node " + node + " was not updated", updatedNodes.contains(node));
+		}
+
+		// keeps removed/user-added nodes
+		assertEquals("true", old.get(new String[] {"outdated value"}));
+		assertEquals("true", old.get("a", "outdated value"));
+
+		// adds new nodes
+		assertEquals("true", old.get("h", "c"));
+		assertEquals("true", old.get(new String[] {"l"}));
+
+		// keeps values of nodes
+		assertEquals("false", old.get(new String[] {"j"}));
+		assertEquals("false", old.get(new String[] {"k"}));
+
+		// doesnt duplicate nested
+		SectionNode node = (SectionNode) old.get("h");
+		assertNotNull(node);
+
+		int size = 0;
+		for (Node ignored : node) { // count non-void nodes
+			size++;
+		}
+
+		assertEquals(2, size);
+	}
+
+	private Config getConfig(String name) {
+		try (InputStream resource = getClass().getResourceAsStream("/" + name + ".sk")) {
+			return new Config(resource, name + ".sk", false, false, ":");
+		} catch (IOException ex) {
+			throw new RuntimeException(ex);
+		}
+	}
+
+}
diff --git a/src/test/java/org/skriptlang/skript/test/tests/config/NodeTest.java b/src/test/java/ch/njol/skript/config/NodeTest.java
similarity index 51%
rename from src/test/java/org/skriptlang/skript/test/tests/config/NodeTest.java
rename to src/test/java/ch/njol/skript/config/NodeTest.java
index b0a7ff2b606..5f9bceed039 100644
--- a/src/test/java/org/skriptlang/skript/test/tests/config/NodeTest.java
+++ b/src/test/java/ch/njol/skript/config/NodeTest.java
@@ -1,32 +1,36 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
-package org.skriptlang.skript.test.tests.config;
-
-import static org.junit.Assert.assertArrayEquals;
+package ch.njol.skript.config;
 
 import org.junit.Test;
 
-import ch.njol.skript.config.Node;
 import ch.njol.util.NonNullPair;
 
+import java.io.IOException;
+import java.io.InputStream;
+
+import static org.junit.Assert.*;
+import static org.junit.Assert.assertFalse;
+
 public class NodeTest {
 
+	@Test
+	public void testGetPathSteps() {
+		Config newer = getConfig("new-config");
+
+		Node node = newer.getNodeAt("a", "b", "c");
+
+		assertNotNull(node);
+		assertArrayEquals(new String[] {"a", "b", "c"}, node.getPathSteps());
+	}
+
+	@Test
+	public void testIsValid() {
+		Config valid = getConfig("new-config");
+		Config invalid = getConfig("invalid-config");
+
+		assertTrue(valid.getMainNode().isValid());
+		assertFalse(invalid.getMainNode().isValid());
+	}
+
 	@Test
 	public void splitLineTest() {
 		String[][] data = {
@@ -56,4 +60,12 @@ public void splitLineTest() {
 
 	}
 
+	private Config getConfig(String name) {
+		try (InputStream resource = getClass().getResourceAsStream("/" + name + ".sk")) {
+			return new Config(resource, name + ".sk", false, false, ":");
+		} catch (IOException ex) {
+			throw new RuntimeException(ex);
+		}
+	}
+
 }
diff --git a/src/test/java/ch/njol/skript/variables/FlatFileStorageTest.java b/src/test/java/ch/njol/skript/variables/FlatFileStorageTest.java
index 3868358459c..cb9e25f89fc 100644
--- a/src/test/java/ch/njol/skript/variables/FlatFileStorageTest.java
+++ b/src/test/java/ch/njol/skript/variables/FlatFileStorageTest.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.variables;
 
 import static org.junit.Assert.assertEquals;
diff --git a/src/test/java/org/skriptlang/skript/SkriptTest.java b/src/test/java/org/skriptlang/skript/SkriptTest.java
new file mode 100644
index 00000000000..ef4168ced0f
--- /dev/null
+++ b/src/test/java/org/skriptlang/skript/SkriptTest.java
@@ -0,0 +1,46 @@
+package org.skriptlang.skript;
+
+import ch.njol.skript.SkriptAPIException;
+import org.junit.Test;
+import org.skriptlang.skript.addon.SkriptAddon;
+import org.skriptlang.skript.addon.BaseSkriptAddonTests;
+
+import static org.junit.Assert.*;
+
+public class SkriptTest extends BaseSkriptAddonTests {
+
+	@Override
+	public Skript addon() {
+		return Skript.of(source(), name());
+	}
+
+	@Override
+	public Class<?> source() {
+		return SkriptTest.class;
+	}
+
+	@Override
+	public String name() {
+		return "TestSkript";
+	}
+
+	@Test
+	public void testAddonRegistration() {
+		Skript skript = addon();
+		Skript unmodifiable = skript.unmodifiableView();
+
+		// should have no addons by default
+		assertTrue(skript.addons().isEmpty());
+		assertTrue(unmodifiable.addons().isEmpty());
+
+		SkriptAddon addon = skript.registerAddon(SkriptTest.class, "TestAddon");
+		assertThrows(UnsupportedOperationException.class, () -> unmodifiable.registerAddon(SkriptTest.class, "TestAddon"));
+		assertThrows(SkriptAPIException.class, () -> skript.registerAddon(SkriptAddon.class, "TestAddon"));
+
+		assertTrue(skript.addons().contains(addon));
+		// unmodifiable addons list would contain an unmodifiable addon
+		assertEquals(1, skript.addons().size());
+		assertEquals(1, unmodifiable.addons().size());
+	}
+
+}
diff --git a/src/test/java/org/skriptlang/skript/addon/BaseSkriptAddonTests.java b/src/test/java/org/skriptlang/skript/addon/BaseSkriptAddonTests.java
new file mode 100644
index 00000000000..cf6dee49c7f
--- /dev/null
+++ b/src/test/java/org/skriptlang/skript/addon/BaseSkriptAddonTests.java
@@ -0,0 +1,102 @@
+package org.skriptlang.skript.addon;
+
+import org.junit.Test;
+import org.skriptlang.skript.registration.SyntaxRegistry;
+import org.skriptlang.skript.util.Registry;
+
+import java.util.Collection;
+
+import static org.junit.Assert.*;
+
+public abstract class BaseSkriptAddonTests {
+
+	private static class MockRegistry implements Registry<Object> {
+
+		@Override
+		public Collection<Object> elements() {
+			throw new UnsupportedOperationException();
+		}
+
+	}
+
+	public abstract SkriptAddon addon();
+
+	public abstract Class<?> source();
+
+	public abstract String name();
+
+	@Test
+	public void testSource() {
+		final SkriptAddon addon = addon();
+
+		assertEquals(source(), addon.source());
+		assertEquals(source(), addon.unmodifiableView().source());
+	}
+
+	@Test
+	public void testName() {
+		final SkriptAddon addon = addon();
+
+		assertEquals(name(), addon.name());
+		assertEquals(name(), addon.unmodifiableView().name());
+	}
+
+	@Test
+	public void testRegistry() {
+		final SkriptAddon addon = addon();
+		final SkriptAddon unmodifiable = addon.unmodifiableView();
+		final MockRegistry registry = new MockRegistry();
+
+		// storing a registry
+		addon.storeRegistry(MockRegistry.class, registry);
+		assertThrows(UnsupportedOperationException.class, () -> unmodifiable.storeRegistry(MockRegistry.class, registry));
+
+		// get a registry
+		assertEquals(registry, addon.registry(MockRegistry.class));
+		assertEquals(registry, unmodifiable.registry(MockRegistry.class));
+
+		// has a registry
+		assertTrue(addon.hasRegistry(MockRegistry.class));
+		assertTrue(unmodifiable.hasRegistry(MockRegistry.class));
+
+		// remove a registry
+		addon.removeRegistry(MockRegistry.class);
+		assertThrows(UnsupportedOperationException.class, () -> unmodifiable.removeRegistry(MockRegistry.class));
+
+		// get a registry
+		assertThrows(NullPointerException.class, () -> addon.registry(MockRegistry.class));
+		assertThrows(NullPointerException.class, () -> unmodifiable.registry(MockRegistry.class));
+
+		// has a registry
+		assertFalse(addon.hasRegistry(MockRegistry.class));
+		assertFalse(unmodifiable.hasRegistry(MockRegistry.class));
+
+		// get a registry (alternate)
+		addon.registry(MockRegistry.class, () -> registry);
+		assertEquals(registry, addon.registry(MockRegistry.class));
+		assertEquals(registry, unmodifiable.registry(MockRegistry.class));
+		assertTrue(addon.hasRegistry(MockRegistry.class));
+		assertTrue(unmodifiable.hasRegistry(MockRegistry.class));
+	}
+
+	@Test
+	public void testSyntaxRegistry() {
+		final SkriptAddon addon = addon();
+		final SkriptAddon unmodifiable = addon.unmodifiableView();
+
+		assertNotNull(addon.syntaxRegistry());
+		assertNotNull(unmodifiable.syntaxRegistry());
+		// unmodifiable's syntax registry should be unmodifiable (different)
+		assertNotEquals(addon.syntaxRegistry(), unmodifiable.syntaxRegistry());
+		assertEquals(addon.registry(SyntaxRegistry.class), addon.syntaxRegistry());
+	}
+
+	@Test
+	public void testLocalizer() {
+		final SkriptAddon addon = addon();
+
+		assertNotNull(addon.localizer());
+		assertNotNull(addon.unmodifiableView().localizer());
+	}
+
+}
diff --git a/src/test/java/org/skriptlang/skript/addon/SkriptAddonTest.java b/src/test/java/org/skriptlang/skript/addon/SkriptAddonTest.java
new file mode 100644
index 00000000000..ffd5407d855
--- /dev/null
+++ b/src/test/java/org/skriptlang/skript/addon/SkriptAddonTest.java
@@ -0,0 +1,23 @@
+package org.skriptlang.skript.addon;
+
+import org.skriptlang.skript.Skript;
+
+public class SkriptAddonTest extends BaseSkriptAddonTests {
+
+	@Override
+	public SkriptAddon addon() {
+		return Skript.of(source(), name())
+				.registerAddon(source(), name());
+	}
+
+	@Override
+	public Class<?> source() {
+		return SkriptAddonTest.class;
+	}
+
+	@Override
+	public String name() {
+		return "TestAddon";
+	}
+
+}
diff --git a/src/test/java/org/skriptlang/skript/bukkit/registration/EventSyntaxInfoTest.java b/src/test/java/org/skriptlang/skript/bukkit/registration/EventSyntaxInfoTest.java
new file mode 100644
index 00000000000..b2575924ccb
--- /dev/null
+++ b/src/test/java/org/skriptlang/skript/bukkit/registration/EventSyntaxInfoTest.java
@@ -0,0 +1,204 @@
+package org.skriptlang.skript.bukkit.registration;
+
+import ch.njol.skript.lang.Literal;
+import ch.njol.skript.lang.SkriptEvent;
+import ch.njol.skript.lang.SkriptEvent.ListeningBehavior;
+import ch.njol.skript.lang.SkriptParser.ParseResult;
+import ch.njol.util.coll.CollectionUtils;
+import org.bukkit.event.Event;
+import org.bukkit.event.block.BlockEvent;
+import org.bukkit.event.entity.EntityEvent;
+import org.bukkit.event.player.PlayerEvent;
+import org.jetbrains.annotations.Nullable;
+import org.junit.Test;
+import org.skriptlang.skript.bukkit.registration.BukkitSyntaxInfos.Event.Builder;
+import org.skriptlang.skript.bukkit.registration.EventSyntaxInfoTest.MockSkriptEvent;
+import org.skriptlang.skript.registration.BaseSyntaxInfoTests;
+
+import java.util.List;
+import java.util.function.Supplier;
+
+import static org.junit.Assert.*;
+
+public class EventSyntaxInfoTest extends BaseSyntaxInfoTests<MockSkriptEvent, BukkitSyntaxInfos.Event.Builder<?, MockSkriptEvent>> {
+
+	public static final class MockSkriptEvent extends SkriptEvent {
+
+		@Override
+		public boolean init(Literal<?>[] args, int matchedPattern, ParseResult parseResult) {
+			throw new UnsupportedOperationException();
+		}
+
+		@Override
+		public boolean check(Event event) {
+			throw new UnsupportedOperationException();
+		}
+
+		@Override
+		public String toString(@Nullable Event event, boolean debug) {
+			throw new UnsupportedOperationException();
+		}
+
+	}
+
+	@Override
+	public Builder<?, MockSkriptEvent> builder(boolean addPattern) {
+		var info = BukkitSyntaxInfos.Event.builder(MockSkriptEvent.class, "mock event");
+		if (addPattern) {
+			info.addPattern("default");
+		}
+		return info;
+	}
+
+	@Override
+	public Class<MockSkriptEvent> type() {
+		return MockSkriptEvent.class;
+	}
+
+	@Override
+	public Supplier<MockSkriptEvent> supplier() {
+		return MockSkriptEvent::new;
+	}
+
+	@Test
+	public void testListeningBehavior() {
+		for (final var behavior : ListeningBehavior.values()) {
+			var info = builder(true)
+					.listeningBehavior(behavior)
+					.build();
+			assertEquals(behavior, info.listeningBehavior());
+			assertEquals(behavior, info.toBuilder().build().listeningBehavior());
+
+			var info2 = builder(true);
+			info.toBuilder().applyTo(info2);
+			assertEquals(behavior, info2.build().listeningBehavior());
+		}
+	}
+
+	@Test
+	public void testSince() {
+		var info = builder(true)
+				.since("since")
+				.build();
+		assertEquals("since", info.since());
+		assertEquals("since", info.toBuilder().build().since());
+
+		var info2 = builder(true);
+		info.toBuilder().applyTo(info2);
+		assertEquals("since", info2.build().since());
+	}
+
+	@Test
+	public void testDocumentationId() {
+		var info = builder(true)
+			.documentationId("id")
+			.build();
+		assertEquals("id", info.documentationId());
+		assertEquals("id", info.toBuilder().build().documentationId());
+
+		var info2 = builder(true);
+		info.toBuilder().applyTo(info2);
+		assertEquals("id", info2.build().documentationId());
+	}
+
+	@Test
+	public void testDescription() {
+		var info = builder(true)
+			.addDescription("1")
+			.addDescription(new String[]{"2"})
+			.addDescription(List.of("3"))
+			.build();
+		assertArrayEquals(new String[]{"1", "2", "3"}, info.description().toArray());
+
+		var info2 = info.toBuilder()
+			.clearDescription()
+			.addDescription("4")
+			.build();
+		assertArrayEquals(new String[]{"4"}, info2.description().toArray());
+
+		var info3 = info.toBuilder();
+		info2.toBuilder().applyTo(info3);
+		assertArrayEquals(new String[]{"1", "2", "3", "4"}, info3.build().description().toArray());
+	}
+
+	@Test
+	public void testExamples() {
+		var info = builder(true)
+			.addExample("1")
+			.addExamples("2")
+			.addExamples(List.of("3"))
+			.build();
+		assertArrayEquals(new String[]{"1", "2", "3"}, info.examples().toArray());
+
+		var info2 = info.toBuilder()
+			.clearExamples()
+			.addExample("4")
+			.build();
+		assertArrayEquals(new String[]{"4"}, info2.examples().toArray());
+
+		var info3 = info.toBuilder();
+		info2.toBuilder().applyTo(info3);
+		assertArrayEquals(new String[]{"1", "2", "3", "4"}, info3.build().examples().toArray());
+	}
+
+	@Test
+	public void testKeywords() {
+		var info = builder(true)
+			.addKeyword("1")
+			.addKeywords("2")
+			.addKeywords(List.of("3"))
+			.build();
+		assertArrayEquals(new String[]{"1", "2", "3"}, info.keywords().toArray());
+
+		var info2 = info.toBuilder()
+			.clearKeywords()
+			.addKeyword("4")
+			.build();
+		assertArrayEquals(new String[]{"4"}, info2.keywords().toArray());
+
+		var info3 = info.toBuilder();
+		info2.toBuilder().applyTo(info3);
+		assertArrayEquals(new String[]{"1", "2", "3", "4"}, info3.build().keywords().toArray());
+	}
+
+	@Test
+	public void testRequiredPlugins() {
+		var info = builder(true)
+			.addRequiredPlugin("1")
+			.addRequiredPlugins("2")
+			.addRequiredPlugins(List.of("3"))
+			.build();
+		assertArrayEquals(new String[]{"1", "2", "3"}, info.requiredPlugins().toArray());
+
+		var info2 = info.toBuilder()
+			.clearRequiredPlugins()
+			.addRequiredPlugin("4")
+			.build();
+		assertArrayEquals(new String[]{"4"}, info2.requiredPlugins().toArray());
+
+		var info3 = info.toBuilder();
+		info2.toBuilder().applyTo(info3);
+		assertArrayEquals(new String[]{"1", "2", "3", "4"}, info3.build().requiredPlugins().toArray());
+	}
+
+	@Test
+	public void testEvents() {
+		var info = builder(true)
+			.addEvent(Event.class)
+			.addEvents(CollectionUtils.array(PlayerEvent.class))
+			.addEvents(List.of(EntityEvent.class))
+			.build();
+		assertArrayEquals(new Class[]{Event.class, PlayerEvent.class, EntityEvent.class}, info.events().toArray());
+
+		var info2 = info.toBuilder()
+			.clearEvents()
+			.addEvent(BlockEvent.class)
+			.build();
+		assertArrayEquals(new Class[]{BlockEvent.class}, info2.events().toArray());
+
+		var info3 = info.toBuilder();
+		info2.toBuilder().applyTo(info3);
+		assertArrayEquals(new Class[]{Event.class, PlayerEvent.class, EntityEvent.class, BlockEvent.class}, info3.build().events().toArray());
+	}
+
+}
diff --git a/src/test/java/org/skriptlang/skript/registration/BaseSyntaxInfoTests.java b/src/test/java/org/skriptlang/skript/registration/BaseSyntaxInfoTests.java
new file mode 100644
index 00000000000..dfbcd77573d
--- /dev/null
+++ b/src/test/java/org/skriptlang/skript/registration/BaseSyntaxInfoTests.java
@@ -0,0 +1,102 @@
+package org.skriptlang.skript.registration;
+
+import ch.njol.skript.lang.SyntaxElement;
+import org.junit.Test;
+import org.skriptlang.skript.util.Priority;
+
+import java.util.List;
+import java.util.function.Supplier;
+
+import static org.junit.Assert.*;
+
+/**
+ * Contains base tests for SyntaxInfos.
+ */
+public abstract class BaseSyntaxInfoTests<E extends SyntaxElement, T extends SyntaxInfo.Builder<?, E>> {
+
+	public abstract T builder(boolean addPattern);
+
+	public abstract Class<E> type();
+
+	public abstract Supplier<E> supplier();
+
+	@Test
+	public void testOrigin() {
+		var info = builder(true)
+				.origin(() -> "Hello World!")
+				.build();
+		assertEquals("Hello World!", info.origin().name());
+		assertEquals("Hello World!", info.toBuilder().build().origin().name());
+
+		var info2 = builder(true);
+		info.toBuilder().applyTo(info2);
+		assertEquals("Hello World!", info2.build().origin().name());
+	}
+
+	@Test
+	public void testType() {
+		var info = builder(true)
+				.build();
+		assertEquals(type(), info.type());
+		assertEquals(type(), info.toBuilder().build().type());
+	}
+
+	@Test
+	public void testInstance() {
+		var info = builder(true)
+				.build();
+		assertNotNull(info.instance());
+
+		info = builder(true)
+				.supplier(supplier())
+				.build();
+		assertNotNull(info.instance());
+
+		info = builder(true)
+				.supplier(() -> {
+					throw new UnsupportedOperationException();
+				})
+				.build();
+		assertThrows(UnsupportedOperationException.class, info::instance);
+
+		var info2 = builder(true);
+		info.toBuilder().applyTo(info2);
+		assertThrows(UnsupportedOperationException.class, () -> info2.build().instance());
+	}
+
+	@Test
+	public void testPatterns() {
+		var info = builder(false)
+				.addPattern("1")
+				.addPatterns("2")
+				.addPatterns(List.of("3"))
+				.build();
+		assertArrayEquals(new String[]{"1", "2", "3"}, info.patterns().toArray());
+
+		var info2 = info.toBuilder()
+				.clearPatterns()
+				.addPattern("4")
+				.build();
+		assertArrayEquals(new String[]{"4"}, info2.patterns().toArray());
+
+		var info3 = info.toBuilder();
+		info2.toBuilder().applyTo(info3);
+		assertArrayEquals(new String[]{"1", "2", "3", "4"}, info3.build().patterns().toArray());
+	}
+
+	@Test
+	public void testPriority() {
+		final Priority base = Priority.base();
+
+		var info = builder(true)
+				.priority(base)
+				.build();
+		assertEquals(base, info.priority());
+		assertEquals(base, info.toBuilder().build().priority());
+
+		var info2 = builder(true);
+		info.toBuilder().applyTo(info2);
+		assertEquals(base, info2.build().priority());
+	}
+
+}
diff --git a/src/test/java/org/skriptlang/skript/registration/ExpressionSyntaxInfoTest.java b/src/test/java/org/skriptlang/skript/registration/ExpressionSyntaxInfoTest.java
new file mode 100644
index 00000000000..0437fe7df9b
--- /dev/null
+++ b/src/test/java/org/skriptlang/skript/registration/ExpressionSyntaxInfoTest.java
@@ -0,0 +1,152 @@
+package org.skriptlang.skript.registration;
+
+import ch.njol.skript.classes.Changer.ChangeMode;
+import ch.njol.skript.lang.Expression;
+import ch.njol.skript.lang.SkriptParser.ParseResult;
+import ch.njol.util.Kleenean;
+import org.bukkit.event.Event;
+import org.jetbrains.annotations.Nullable;
+import org.junit.Test;
+import org.skriptlang.skript.registration.ExpressionSyntaxInfoTest.MockExpression;
+
+import java.util.Iterator;
+import java.util.function.Predicate;
+import java.util.function.Supplier;
+
+import static org.junit.Assert.*;
+
+public class ExpressionSyntaxInfoTest extends BaseSyntaxInfoTests<MockExpression, SyntaxInfo.Expression.Builder<?, MockExpression, String>> {
+
+	public static final class MockExpression implements Expression<String> {
+
+		@Override
+		public String getSingle(Event event) {
+			throw new UnsupportedOperationException();
+		}
+
+		@Override
+		public String[] getArray(Event event) {
+			throw new UnsupportedOperationException();
+		}
+
+		@Override
+		public String[] getAll(Event event) {
+			throw new UnsupportedOperationException();
+		}
+
+		@Override
+		public boolean isSingle() {
+			throw new UnsupportedOperationException();
+		}
+
+		@Override
+		public boolean check(Event event, Predicate<? super String> checker, boolean negated) {
+			throw new UnsupportedOperationException();
+		}
+
+		@Override
+		public boolean check(Event event, Predicate<? super String> checker) {
+			throw new UnsupportedOperationException();
+		}
+
+		@Override
+		@SafeVarargs
+		public final <R> Expression<? extends R> getConvertedExpression(Class<R>... to) {
+			throw new UnsupportedOperationException();
+		}
+
+		@Override
+		public Class<? extends String> getReturnType() {
+			throw new UnsupportedOperationException();
+		}
+
+		@Override
+		public boolean getAnd() {
+			throw new UnsupportedOperationException();
+		}
+
+		@Override
+		public boolean setTime(int time) {
+			throw new UnsupportedOperationException();
+		}
+
+		@Override
+		public int getTime() {
+			throw new UnsupportedOperationException();
+		}
+
+		@Override
+		public boolean isDefault() {
+			throw new UnsupportedOperationException();
+		}
+
+		@Override
+		public Expression<?> getSource() {
+			throw new UnsupportedOperationException();
+		}
+
+		@Override
+		public Expression<? extends String> simplify() {
+			throw new UnsupportedOperationException();
+		}
+
+		@Override
+		public Class<?>[] acceptChange(ChangeMode mode) {
+			throw new UnsupportedOperationException();
+		}
+
+		@Override
+		public void change(Event event, Object @Nullable [] delta, ChangeMode mode) {
+			throw new UnsupportedOperationException();
+		}
+
+		@Override
+		public String toString(@Nullable Event event, boolean debug) {
+			throw new UnsupportedOperationException();
+		}
+
+		@Override
+		public Iterator<? extends String> iterator(Event event) {
+			throw new UnsupportedOperationException();
+		}
+
+		@Override
+		public boolean isLoopOf(String input) {
+			throw new UnsupportedOperationException();
+		}
+
+		@Override
+		public boolean init(Expression<?>[] expressions, int matchedPattern, Kleenean isDelayed, ParseResult parseResult) {
+			throw new UnsupportedOperationException();
+		}
+
+	}
+
+	@Override
+	public SyntaxInfo.Expression.Builder<?, MockExpression, String> builder(boolean addPattern) {
+		var info = SyntaxInfo.Expression.builder(MockExpression.class, String.class);
+		if (addPattern) {
+			info.addPattern("default");
+		}
+		return info;
+	}
+
+	@Override
+	public Class<MockExpression> type() {
+		return MockExpression.class;
+	}
+
+	@Override
+	public Supplier<MockExpression> supplier() {
+		return MockExpression::new;
+	}
+
+	@Test
+	public void testReturnType() {
+		var info = builder(true)
+				.build();
+		assertEquals(String.class, info.returnType());
+		assertEquals(String.class, info.toBuilder().build().returnType());
+	}
+
+}
diff --git a/src/test/java/org/skriptlang/skript/registration/KeyTest.java b/src/test/java/org/skriptlang/skript/registration/KeyTest.java
new file mode 100644
index 00000000000..702ddbf79e1
--- /dev/null
+++ b/src/test/java/org/skriptlang/skript/registration/KeyTest.java
@@ -0,0 +1,25 @@
+package org.skriptlang.skript.registration;
+
+import org.junit.Test;
+import org.skriptlang.skript.registration.SyntaxRegistry.ChildKey;
+import org.skriptlang.skript.registration.SyntaxRegistry.Key;
+
+import static org.junit.Assert.*;
+
+public class KeyTest {
+
+	@Test
+	public void testKey() {
+		assertEquals("TestKey", Key.of("TestKey").name());
+	}
+
+	@Test
+	public void testChildKey() {
+		final Key<?> key = Key.of("TestKey");
+		final ChildKey<?, ?> child = ChildKey.of(key, "TestChildKey");
+
+		assertEquals(key, child.parent());
+		assertEquals("TestChildKey", child.name());
+	}
+
+}
diff --git a/src/test/java/org/skriptlang/skript/registration/StructureSyntaxInfoTest.java b/src/test/java/org/skriptlang/skript/registration/StructureSyntaxInfoTest.java
new file mode 100644
index 00000000000..4dacb2cd860
--- /dev/null
+++ b/src/test/java/org/skriptlang/skript/registration/StructureSyntaxInfoTest.java
@@ -0,0 +1,87 @@
+package org.skriptlang.skript.registration;
+
+import ch.njol.skript.lang.Literal;
+import ch.njol.skript.lang.SkriptParser.ParseResult;
+import org.bukkit.event.Event;
+import org.jetbrains.annotations.Nullable;
+import org.junit.Test;
+import org.skriptlang.skript.lang.entry.EntryContainer;
+import org.skriptlang.skript.lang.entry.EntryValidator;
+import org.skriptlang.skript.lang.structure.Structure;
+import org.skriptlang.skript.registration.StructureSyntaxInfoTest.MockStructure;
+
+import java.util.function.Supplier;
+
+import static org.junit.Assert.*;
+
+public class StructureSyntaxInfoTest extends BaseSyntaxInfoTests<MockStructure, SyntaxInfo.Structure.Builder<?, MockStructure>> {
+
+	public static final class MockStructure extends Structure {
+
+		@Override
+		public boolean init(Literal<?>[] args, int matchedPattern, ParseResult parseResult, @Nullable EntryContainer entryContainer) {
+			throw new UnsupportedOperationException();
+		}
+
+		@Override
+		public boolean load() {
+			throw new UnsupportedOperationException();
+		}
+
+		@Override
+		public String toString(@Nullable Event event, boolean debug) {
+			throw new UnsupportedOperationException();
+		}
+
+	}
+
+	@Override
+	public SyntaxInfo.Structure.Builder<?, MockStructure> builder(boolean addPattern) {
+		var info = SyntaxInfo.Structure.builder(MockStructure.class);
+		if (addPattern) {
+			info.addPattern("default");
+		}
+		return info;
+	}
+
+	@Override
+	public Class<MockStructure> type() {
+		return MockStructure.class;
+	}
+
+	@Override
+	public Supplier<MockStructure> supplier() {
+		return MockStructure::new;
+	}
+
+	@Test
+	public void testEntryValidator() {
+		final EntryValidator validator = EntryValidator.builder().build();
+
+		var info = builder(true)
+				.entryValidator(validator)
+				.build();
+		assertEquals(validator, info.entryValidator());
+		assertEquals(validator, info.toBuilder().build().entryValidator());
+
+		var info2 = builder(true);
+		info.toBuilder().applyTo(info2);
+		assertEquals(validator, info2.build().entryValidator());
+	}
+
+	@Test
+	public void testNodeType() {
+		for (final var type : SyntaxInfo.Structure.NodeType.values()) {
+			var info = builder(true)
+					.nodeType(type)
+					.build();
+			assertEquals(type, info.nodeType());
+			assertEquals(type, info.toBuilder().build().nodeType());
+
+			var info2 = builder(true);
+			info.toBuilder().applyTo(info2);
+			assertEquals(type, info2.build().nodeType());
+		}
+	}
+
+}
diff --git a/src/test/java/org/skriptlang/skript/registration/SyntaxInfoTest.java b/src/test/java/org/skriptlang/skript/registration/SyntaxInfoTest.java
new file mode 100644
index 00000000000..bf71e3df7f4
--- /dev/null
+++ b/src/test/java/org/skriptlang/skript/registration/SyntaxInfoTest.java
@@ -0,0 +1,48 @@
+package org.skriptlang.skript.registration;
+
+import ch.njol.skript.lang.Expression;
+import ch.njol.skript.lang.SkriptParser.ParseResult;
+import ch.njol.skript.lang.SyntaxElement;
+import ch.njol.util.Kleenean;
+import org.jetbrains.annotations.NotNull;
+import org.skriptlang.skript.registration.SyntaxInfo.Builder;
+import org.skriptlang.skript.registration.SyntaxInfoTest.MockSyntaxElement;
+
+import java.util.function.Supplier;
+
+public class SyntaxInfoTest extends BaseSyntaxInfoTests<MockSyntaxElement, Builder<?, MockSyntaxElement>> {
+
+	public static final class MockSyntaxElement implements SyntaxElement {
+
+		@Override
+		public boolean init(Expression<?>[] expressions, int matchedPattern, Kleenean isDelayed, ParseResult parseResult) {
+			throw new UnsupportedOperationException();
+		}
+
+		@Override
+		public @NotNull String getSyntaxTypeName() {
+			throw new UnsupportedOperationException();
+		}
+
+	}
+
+	@Override
+	public SyntaxInfo.Builder<?, MockSyntaxElement> builder(boolean addPattern) {
+		var info = SyntaxInfo.builder(MockSyntaxElement.class);
+		if (addPattern) { // sometimes required as infos must have at least one pattern
+			info.addPattern("default");
+		}
+		return info;
+	}
+
+	@Override
+	public Class<MockSyntaxElement> type() {
+		return MockSyntaxElement.class;
+	}
+
+	@Override
+	public Supplier<MockSyntaxElement> supplier() {
+		return MockSyntaxElement::new;
+	}
+
+}
diff --git a/src/test/java/org/skriptlang/skript/registration/SyntaxRegistryTest.java b/src/test/java/org/skriptlang/skript/registration/SyntaxRegistryTest.java
new file mode 100644
index 00000000000..298a96121fd
--- /dev/null
+++ b/src/test/java/org/skriptlang/skript/registration/SyntaxRegistryTest.java
@@ -0,0 +1,93 @@
+package org.skriptlang.skript.registration;
+
+import ch.njol.skript.lang.SyntaxElement;
+import org.junit.Test;
+import org.skriptlang.skript.registration.SyntaxRegistry.Key;
+import org.skriptlang.skript.util.Priority;
+
+import static org.junit.Assert.*;
+
+public class SyntaxRegistryTest {
+
+	private static SyntaxRegistry syntaxRegistry() {
+		return SyntaxRegistry.empty();
+	}
+
+	private static SyntaxInfo<?> info() {
+		return SyntaxInfo.builder(SyntaxElement.class)
+			.supplier(() -> {
+				throw new UnsupportedOperationException();
+			})
+			.addPattern("default")
+			.build();
+	}
+
+	private static Key<SyntaxInfo<?>> key() {
+		return key("TestKey");
+	}
+
+	private static Key<SyntaxInfo<?>> key(String name) {
+		return Key.of(name);
+	}
+
+	@Test
+	public void testBasic() {
+		final SyntaxRegistry registry = syntaxRegistry();
+		final SyntaxRegistry unmodifiable = registry.unmodifiableView();
+		final var info = info();
+
+		// test registration
+		registry.register(key(), info);
+		assertThrows(UnsupportedOperationException.class, () -> unmodifiable.register(key(), info));
+		assertArrayEquals(new SyntaxInfo[]{info}, registry.syntaxes(key()).toArray());
+		assertArrayEquals(new SyntaxInfo[]{info}, unmodifiable.syntaxes(key()).toArray());
+		assertArrayEquals(new SyntaxInfo[]{info}, registry.elements().toArray());
+		assertArrayEquals(new SyntaxInfo[]{info}, unmodifiable.elements().toArray());
+
+		// test unregistration
+		registry.unregister(key(), info);
+		assertThrows(UnsupportedOperationException.class, () -> unmodifiable.unregister(key(), info));
+		assertTrue(registry.syntaxes(key()).isEmpty());
+		assertTrue(unmodifiable.syntaxes(key()).isEmpty());
+		assertTrue(registry.elements().isEmpty());
+		assertTrue(unmodifiable.elements().isEmpty());
+	}
+
+	@Test
+	public void testKeylessUnregistration() {
+		final SyntaxRegistry registry = syntaxRegistry();
+		final SyntaxRegistry unmodifiable = registry.unmodifiableView();
+		final var info = info();
+
+		registry.register(key(), info);
+		registry.register(key("OtherKey"), info);
+		// should not contain duplicates
+		assertArrayEquals(new SyntaxInfo[]{info}, registry.elements().toArray());
+
+		registry.unregister(info);
+		assertThrows(UnsupportedOperationException.class, () -> unmodifiable.unregister(info));
+		assertTrue(registry.elements().isEmpty());
+		assertTrue(unmodifiable.elements().isEmpty());
+	}
+
+	@Test
+	public void testOrdering() {
+		final SyntaxRegistry registry = syntaxRegistry();
+		final SyntaxRegistry unmodifiable = registry.unmodifiableView();
+		final Priority priority = Priority.base();
+
+		// ordering should be info2, info1, info3
+		final var info1 = info().toBuilder().priority(priority).build();
+		final var info2 = info().toBuilder().priority(Priority.before(priority)).build();
+		final var info3 = info().toBuilder().priority(Priority.after(priority)).build();
+
+		// test multiple registrations (differing order)
+		registry.register(key(), info3);
+		registry.register(key(), info2);
+		registry.register(key(), info1);
+
+		assertArrayEquals(new SyntaxInfo[]{info2, info1, info3}, registry.syntaxes(key()).toArray());
+		assertArrayEquals(new SyntaxInfo[]{info2, info1, info3}, unmodifiable.syntaxes(key()).toArray());
+	}
+
+}
diff --git a/src/test/java/org/skriptlang/skript/test/junit/registration/ExprJUnitTest.java b/src/test/java/org/skriptlang/skript/test/junit/registration/ExprJUnitTestName.java
similarity index 57%
rename from src/test/java/org/skriptlang/skript/test/junit/registration/ExprJUnitTest.java
rename to src/test/java/org/skriptlang/skript/test/junit/registration/ExprJUnitTestName.java
index 341adde13eb..5635e417d28 100644
--- a/src/test/java/org/skriptlang/skript/test/junit/registration/ExprJUnitTest.java
+++ b/src/test/java/org/skriptlang/skript/test/junit/registration/ExprJUnitTestName.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package org.skriptlang.skript.test.junit.registration;
 
 import org.bukkit.event.Event;
@@ -37,11 +19,11 @@
 @Name("JUnit Test Name")
 @Description("Returns the currently running JUnit test name otherwise nothing.")
 @NoDoc
-public class ExprJUnitTest extends SimpleExpression<String>  {
+public class ExprJUnitTestName extends SimpleExpression<String>  {
 
 	static {
 		if (TestMode.JUNIT)
-			Skript.registerExpression(ExprJUnitTest.class, String.class, ExpressionType.SIMPLE, "[the] [current[[ly] running]] junit test [name]");
+			Skript.registerExpression(ExprJUnitTestName.class, String.class, ExpressionType.SIMPLE, "[the] [current[[ly] running]] junit test [name]");
 	}
 
 	@Override
diff --git a/src/test/java/org/skriptlang/skript/test/junit/registration/package-info.java b/src/test/java/org/skriptlang/skript/test/junit/registration/package-info.java
index a5287d55b8d..afb25dd1c3e 100644
--- a/src/test/java/org/skriptlang/skript/test/junit/registration/package-info.java
+++ b/src/test/java/org/skriptlang/skript/test/junit/registration/package-info.java
@@ -15,7 +15,8 @@
  *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
  *
  * Copyright Peter Güttinger, SkriptLang team and contributors
- * 
+ */
+/**
  * Place any and all custom syntaxes relating to the JUnit testJar in here to be exclusively ran on the test runner.
  */
 package org.skriptlang.skript.test.junit.registration;
diff --git a/src/test/java/org/skriptlang/skript/test/tests/aliases/AliasesTest.java b/src/test/java/org/skriptlang/skript/test/tests/aliases/AliasesTest.java
index c2ad1a61918..05c30cb3955 100644
--- a/src/test/java/org/skriptlang/skript/test/tests/aliases/AliasesTest.java
+++ b/src/test/java/org/skriptlang/skript/test/tests/aliases/AliasesTest.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package org.skriptlang.skript.test.tests.aliases;
 
 import org.bukkit.Color;
diff --git a/src/test/java/org/skriptlang/skript/test/tests/classes/ClassesTest.java b/src/test/java/org/skriptlang/skript/test/tests/classes/ClassesTest.java
index 385078a5701..edda38d818d 100644
--- a/src/test/java/org/skriptlang/skript/test/tests/classes/ClassesTest.java
+++ b/src/test/java/org/skriptlang/skript/test/tests/classes/ClassesTest.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package org.skriptlang.skript.test.tests.classes;
 
 import org.bukkit.GameMode;
diff --git a/src/test/java/org/skriptlang/skript/test/tests/config/package-info.java b/src/test/java/org/skriptlang/skript/test/tests/config/package-info.java
deleted file mode 100644
index 7681cb07cc2..00000000000
--- a/src/test/java/org/skriptlang/skript/test/tests/config/package-info.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
-package org.skriptlang.skript.test.tests.config;
-
-
diff --git a/src/test/java/org/skriptlang/skript/test/tests/files/BackupPurgeTest.java b/src/test/java/org/skriptlang/skript/test/tests/files/BackupPurgeTest.java
new file mode 100644
index 00000000000..a75ed1e760f
--- /dev/null
+++ b/src/test/java/org/skriptlang/skript/test/tests/files/BackupPurgeTest.java
@@ -0,0 +1,77 @@
+package org.skriptlang.skript.test.tests.files;
+
+import ch.njol.skript.util.FileUtils;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.stream.Stream;
+
+import static org.junit.Assert.*;
+
+public class BackupPurgeTest {
+
+	private static final Path FOLDER = Path.of("plugins", "Skript", "backups");
+	private static final Path VARIABLES = Path.of("plugins", "Skript", "variables.csv");
+
+	@Before
+	public void setup() throws IOException {
+		if (Files.exists(FOLDER)) {
+			clearFolder();
+		} else {
+			Files.createDirectory(FOLDER);
+		}
+
+		for (int i = 0; i < 100; i++) {
+			Files.createFile(FOLDER.resolve("purge test " + i));
+		}
+
+		if (!Files.exists(VARIABLES)) {
+			Files.createFile(VARIABLES);
+		}
+	}
+
+	@Test
+	public void testPurge() throws IOException {
+		try (Stream<Path> files = Files.list(FOLDER)) {
+			assertEquals(100, files.count());
+		}
+
+		testBackupPurge(50);
+		testBackupPurge(20);
+		testBackupPurge(0);
+
+		assertThrows(IllegalArgumentException.class, () -> FileUtils.backupPurge(VARIABLES.toFile(), -1));
+	}
+
+	@After
+	public void cleanUp() throws IOException {
+		clearFolder();
+	}
+
+	private static void clearFolder() throws IOException {
+		try (Stream<Path> list = Files.list(FOLDER)) {
+			list.forEach(path -> {
+				try {
+					Files.delete(path);
+				} catch (IOException ignored) {
+
+				}
+			});
+		}
+	}
+
+	private static void testBackupPurge(int toKeep) throws IOException {
+		FileUtils.backupPurge(VARIABLES.toFile(), toKeep);
+
+		try (Stream<Path> files = Files.list(FOLDER)) {
+			long count = files.count();
+			assertNotNull(files);
+			assertEquals("backup purge did not delete all files", toKeep, count);
+		}
+	}
+
+}
diff --git a/src/test/java/org/skriptlang/skript/test/tests/files/FilesGenerate.java b/src/test/java/org/skriptlang/skript/test/tests/files/FilesGenerate.java
deleted file mode 100644
index a6bcabcea71..00000000000
--- a/src/test/java/org/skriptlang/skript/test/tests/files/FilesGenerate.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
-package org.skriptlang.skript.test.tests.files;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-import java.io.File;
-
-import org.junit.Test;
-
-import ch.njol.skript.Skript;
-import ch.njol.skript.SkriptConfig;
-
-/**
- * Ensures that the default files from Skript are generated.
- */
-public class FilesGenerate {
-
-	@Test
-	public void checkFiles() {
-		Skript skript = Skript.getInstance();
-		File dataFolder = skript.getDataFolder();
-		assertTrue(skript.getScriptsFolder().exists());
-		assertTrue(skript.getScriptsFolder().isDirectory());
-		assertTrue(new File(dataFolder, "config.sk").exists());
-		assertTrue(new File(dataFolder, "features.sk").exists());
-		File lang = new File(dataFolder, "lang");
-		assertTrue(lang.exists());
-		assertTrue(lang.isDirectory());
-	}
-
-	@Test
-	@SuppressWarnings("deprecation")
-	public void checkConfigurationVersion() {
-		assertEquals(SkriptConfig.getConfig().get("version"), Skript.getInstance().getDescription().getVersion());
-	}
-
-}
diff --git a/src/test/java/org/skriptlang/skript/test/tests/files/FilesGenerateTest.java b/src/test/java/org/skriptlang/skript/test/tests/files/FilesGenerateTest.java
new file mode 100644
index 00000000000..da69b9a9fcf
--- /dev/null
+++ b/src/test/java/org/skriptlang/skript/test/tests/files/FilesGenerateTest.java
@@ -0,0 +1,37 @@
+package org.skriptlang.skript.test.tests.files;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import java.io.File;
+
+import org.junit.Test;
+
+import ch.njol.skript.Skript;
+import ch.njol.skript.SkriptConfig;
+
+/**
+ * Ensures that the default files from Skript are generated.
+ */
+public class FilesGenerateTest {
+
+	@Test
+	public void checkFiles() {
+		Skript skript = Skript.getInstance();
+		File dataFolder = skript.getDataFolder();
+		assertTrue(skript.getScriptsFolder().exists());
+		assertTrue(skript.getScriptsFolder().isDirectory());
+		assertTrue(new File(dataFolder, "config.sk").exists());
+		assertTrue(new File(dataFolder, "features.sk").exists());
+		File lang = new File(dataFolder, "lang");
+		assertTrue(lang.exists());
+		assertTrue(lang.isDirectory());
+	}
+
+	@Test
+	@SuppressWarnings("deprecation")
+	public void checkConfigurationVersion() {
+		assertEquals(SkriptConfig.getConfig().getValue("version"), Skript.getInstance().getDescription().getVersion());
+	}
+
+}
diff --git a/src/test/java/org/skriptlang/skript/test/tests/lang/CancelledEventsTest.java b/src/test/java/org/skriptlang/skript/test/tests/lang/CancelledEventsTest.java
index 75bddb12e21..e8b1c303b27 100644
--- a/src/test/java/org/skriptlang/skript/test/tests/lang/CancelledEventsTest.java
+++ b/src/test/java/org/skriptlang/skript/test/tests/lang/CancelledEventsTest.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package org.skriptlang.skript.test.tests.lang;
 
 import ch.njol.skript.test.runner.SkriptJUnitTest;
diff --git a/src/test/java/org/skriptlang/skript/test/tests/lang/ConditionalTest.java b/src/test/java/org/skriptlang/skript/test/tests/lang/ConditionalTest.java
new file mode 100644
index 00000000000..a61fef5c433
--- /dev/null
+++ b/src/test/java/org/skriptlang/skript/test/tests/lang/ConditionalTest.java
@@ -0,0 +1,372 @@
+package org.skriptlang.skript.test.tests.lang;
+
+import ch.njol.util.Kleenean;
+import org.bukkit.event.Event;
+import org.jetbrains.annotations.Nullable;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Ignore;
+import org.junit.Test;
+import org.skriptlang.skript.lang.condition.Conditional;
+
+public class ConditionalTest {
+
+	TestConditional condTrue;
+	TestConditional condFalse;
+	TestConditional condUnknown;
+	TestContext context;
+
+	@Before
+	public void setup() {
+		condTrue = new TestConditional(Kleenean.TRUE);
+		condFalse = new TestConditional(Kleenean.FALSE);
+		condUnknown = new TestConditional(Kleenean.UNKNOWN);
+		context = new TestContext();
+	}
+
+	@Test
+	public void testBasicConditionals() {
+		Assert.assertEquals(Kleenean.TRUE, condTrue.evaluate(context));
+		Assert.assertEquals(1, condTrue.timesEvaluated);
+		condTrue.reset();
+
+		Assert.assertEquals(Kleenean.FALSE, condFalse.evaluate(context));
+		Assert.assertEquals(1, condFalse.timesEvaluated);
+		condFalse.reset();
+
+		Assert.assertEquals(Kleenean.UNKNOWN, condUnknown.evaluate(context));
+		Assert.assertEquals(1, condUnknown.timesEvaluated);
+		condUnknown.reset();
+	}
+
+	private void assertBasic(TestConditional conditional, Kleenean expected, Kleenean actual, int expectedEvals) {
+		Assert.assertEquals("Incorrect evaluation!", expected, actual);
+		assertEvals(conditional, expectedEvals);
+	}
+
+	private void assertEvals(TestConditional conditional, int expectedEvals) {
+		Assert.assertEquals("Wrong number of evaluations!", expectedEvals, conditional.timesEvaluated);
+		conditional.reset();
+	}
+
+	@Test
+	public void testBasicAndKnown() {
+		// true AND known x
+		assertBasic(condTrue, Kleenean.TRUE, condTrue.evaluateAnd(Kleenean.TRUE, context), 1);
+		assertBasic(condTrue, Kleenean.FALSE, condTrue.evaluateAnd(Kleenean.FALSE, context), 0);
+		assertBasic(condTrue, Kleenean.UNKNOWN, condTrue.evaluateAnd(Kleenean.UNKNOWN, context), 1);
+
+		// false AND known x
+		assertBasic(condFalse, Kleenean.FALSE, condFalse.evaluateAnd(Kleenean.TRUE, context), 1);
+		assertBasic(condFalse, Kleenean.FALSE, condFalse.evaluateAnd(Kleenean.FALSE, context), 0);
+		assertBasic(condFalse, Kleenean.FALSE, condFalse.evaluateAnd(Kleenean.UNKNOWN, context), 1);
+
+		// unknown AND known x
+		assertBasic(condUnknown, Kleenean.UNKNOWN, condUnknown.evaluateAnd(Kleenean.TRUE, context), 1);
+		assertBasic(condUnknown, Kleenean.FALSE, condUnknown.evaluateAnd(Kleenean.FALSE, context), 0);
+		assertBasic(condUnknown, Kleenean.UNKNOWN, condUnknown.evaluateAnd(Kleenean.UNKNOWN, context), 1);
+	}
+
+	@Test
+	public void testBasicOrKnown() {
+		// true OR known x
+		assertBasic(condTrue, Kleenean.TRUE, condTrue.evaluateOr(Kleenean.TRUE, context), 0);
+		assertBasic(condTrue, Kleenean.TRUE, condTrue.evaluateOr(Kleenean.FALSE, context), 1);
+		assertBasic(condTrue, Kleenean.TRUE, condTrue.evaluateOr(Kleenean.UNKNOWN, context), 1);
+
+		// false OR known x
+		assertBasic(condFalse, Kleenean.TRUE, condFalse.evaluateOr(Kleenean.TRUE, context), 0);
+		assertBasic(condFalse, Kleenean.FALSE, condFalse.evaluateOr(Kleenean.FALSE, context), 1);
+		assertBasic(condFalse, Kleenean.UNKNOWN, condFalse.evaluateOr(Kleenean.UNKNOWN, context), 1);
+
+		// unknown OR known x
+		assertBasic(condUnknown, Kleenean.TRUE, condUnknown.evaluateOr(Kleenean.TRUE, context), 0);
+		assertBasic(condUnknown, Kleenean.UNKNOWN, condUnknown.evaluateOr(Kleenean.FALSE, context), 1);
+		assertBasic(condUnknown, Kleenean.UNKNOWN, condUnknown.evaluateOr(Kleenean.UNKNOWN, context), 1);
+	}
+
+	@Test
+	public void testBasicNot() {
+		assertBasic(condTrue, Kleenean.FALSE, condTrue.evaluateNot(context), 1);
+		assertBasic(condFalse, Kleenean.TRUE, condFalse.evaluateNot(context), 1);
+		assertBasic(condUnknown, Kleenean.UNKNOWN, condUnknown.evaluateNot(context), 1);
+	}
+
+	@Test
+	public void testBasicAndBasic() {
+
+		TestConditional condTrueB = new TestConditional(Kleenean.TRUE);
+		TestConditional condFalseB = new TestConditional(Kleenean.FALSE);
+		TestConditional condUnknownB = new TestConditional(Kleenean.UNKNOWN);
+
+		// true AND x
+		Assert.assertEquals(Kleenean.TRUE, condTrue.evaluateAnd(condTrueB, context));
+		assertEvals(condTrue, 1);
+		assertEvals(condTrueB, 1);
+
+		Assert.assertEquals(Kleenean.FALSE, condTrue.evaluateAnd(condFalse, context));
+		assertEvals(condTrue, 0);
+		assertEvals(condFalse, 1);
+
+		Assert.assertEquals(Kleenean.UNKNOWN, condTrue.evaluateAnd(condUnknown, context));
+		assertEvals(condTrue, 1);
+		assertEvals(condUnknown, 1);
+
+		// false AND x
+		Assert.assertEquals(Kleenean.FALSE, condFalse.evaluateAnd(condFalseB, context));
+		assertEvals(condFalse, 0);
+		assertEvals(condFalseB, 1);
+
+		Assert.assertEquals(Kleenean.FALSE, condFalse.evaluateAnd(condTrue, context));
+		assertEvals(condFalse, 1);
+		assertEvals(condTrue, 1);
+
+		Assert.assertEquals(Kleenean.FALSE, condFalse.evaluateAnd(condUnknown, context));
+		assertEvals(condFalse, 1);
+		assertEvals(condUnknown, 1);
+
+		// unknown AND x
+		Assert.assertEquals(Kleenean.UNKNOWN, condUnknown.evaluateAnd(condUnknownB, context));
+		assertEvals(condUnknown, 1);
+		assertEvals(condUnknownB, 1);
+
+		Assert.assertEquals(Kleenean.UNKNOWN, condUnknown.evaluateAnd(condTrue, context));
+		assertEvals(condUnknown, 1);
+		assertEvals(condTrue, 1);
+
+		Assert.assertEquals(Kleenean.FALSE, condUnknown.evaluateAnd(condFalse, context));
+		assertEvals(condUnknown, 0);
+		assertEvals(condFalse, 1);
+	}
+
+	@Test
+	public void testCombinedAnd() {
+
+		TestConditional condTrueB = new TestConditional(Kleenean.TRUE);
+		TestConditional condFalseB = new TestConditional(Kleenean.FALSE);
+		TestConditional condUnknownB = new TestConditional(Kleenean.UNKNOWN);
+
+		Conditional<TestContext> trueAndTrue = Conditional.builderDNF(TestContext.class)
+			.and(condTrue, condTrueB)
+			.build();
+
+		Assert.assertEquals(Kleenean.TRUE, trueAndTrue.evaluate(context));
+		assertEvals(condTrue, 1);
+		assertEvals(condTrueB, 1);
+
+
+		Conditional<TestContext> trueAndFalse = Conditional.builderDNF(TestContext.class)
+			.and(condTrue, condFalse)
+			.build();
+
+		Assert.assertEquals(Kleenean.FALSE, trueAndFalse.evaluate(context));
+		assertEvals(condTrue, 1);
+		assertEvals(condFalse, 1);
+
+
+		Conditional<TestContext> falseAndTrueAndFalse = Conditional.builderDNF(TestContext.class)
+			.and(condFalse, condTrue, condFalse)
+			.build();
+
+		Assert.assertEquals(Kleenean.FALSE, falseAndTrueAndFalse.evaluate(context));
+		assertEvals(condTrue, 0);
+		assertEvals(condFalse, 1);
+
+
+		Conditional<TestContext> trueAndUnknown = Conditional.builderDNF(TestContext.class)
+			.and(condTrue, condUnknown)
+			.build();
+
+		Assert.assertEquals(Kleenean.UNKNOWN, trueAndUnknown.evaluate(context));
+		assertEvals(condTrue, 1);
+		assertEvals(condUnknown, 1);
+
+
+		Conditional<TestContext> falseAndFalse = Conditional.builderDNF(TestContext.class)
+			.and(condFalse, condFalseB)
+			.build();
+
+		Assert.assertEquals(Kleenean.FALSE, falseAndFalse.evaluate(context));
+		assertEvals(condFalseB, 0);
+		assertEvals(condFalse, 1);
+
+		Conditional<TestContext> falseAndUnknown = Conditional.builderDNF(TestContext.class)
+			.and(condFalse, condUnknown)
+			.build();
+
+		Assert.assertEquals(Kleenean.FALSE, falseAndUnknown.evaluate(context));
+		assertEvals(condUnknown, 0);
+		assertEvals(condFalse, 1);
+
+		Conditional<TestContext> unknownAndUnknown = Conditional.builderDNF(TestContext.class)
+			.and(condUnknown, condUnknownB)
+			.build();
+
+		Assert.assertEquals(Kleenean.UNKNOWN, unknownAndUnknown.evaluate(context));
+		assertEvals(condUnknown, 1);
+		assertEvals(condUnknownB, 1);
+	}
+
+	@Test
+	public void testCombinedOr() {
+
+		TestConditional condTrueB = new TestConditional(Kleenean.TRUE);
+		TestConditional condFalseB = new TestConditional(Kleenean.FALSE);
+		TestConditional condUnknownB = new TestConditional(Kleenean.UNKNOWN);
+
+		Conditional<TestContext> trueOrTrue = Conditional.builderDNF(TestContext.class)
+			.or(condTrue, condTrueB)
+			.build();
+
+		Assert.assertEquals(Kleenean.TRUE, trueOrTrue.evaluate(context));
+		assertEvals(condTrue, 1);
+		assertEvals(condTrueB, 0);
+
+
+		Conditional<TestContext> trueOrFalse = Conditional.builderDNF(TestContext.class)
+			.or(condTrue, condFalse)
+			.build();
+
+		Assert.assertEquals(Kleenean.TRUE, trueOrFalse.evaluate(context));
+		assertEvals(condTrue, 1);
+		assertEvals(condFalse, 0);
+
+
+		Conditional<TestContext> falseOrTrueOrFalse = Conditional.builderDNF(TestContext.class)
+			.or(condFalse, condTrue, condFalseB)
+			.build();
+
+		Assert.assertEquals(Kleenean.TRUE, falseOrTrueOrFalse.evaluate(context));
+		assertEvals(condTrue, 1);
+		assertEvals(condFalse, 1);
+		assertEvals(condFalseB, 0);
+
+
+		Conditional<TestContext> trueOrUnknown = Conditional.builderDNF(TestContext.class)
+			.or(condTrue, condUnknown)
+			.build();
+
+		Assert.assertEquals(Kleenean.TRUE, trueOrUnknown.evaluate(context));
+		assertEvals(condTrue, 1);
+		assertEvals(condUnknown, 0);
+
+
+		Conditional<TestContext> falseOrFalse = Conditional.builderDNF(TestContext.class)
+			.or(condFalse, condFalseB)
+			.build();
+
+		Assert.assertEquals(Kleenean.FALSE, falseOrFalse.evaluate(context));
+		assertEvals(condFalseB, 1);
+		assertEvals(condFalse, 1);
+
+		Conditional<TestContext> falseOrUnknown = Conditional.builderDNF(TestContext.class)
+			.or(condFalse, condUnknown)
+			.build();
+
+		Assert.assertEquals(Kleenean.UNKNOWN, falseOrUnknown.evaluate(context));
+		assertEvals(condUnknown, 1);
+		assertEvals(condFalse, 1);
+
+		Conditional<TestContext> unknownAndUnknown = Conditional.builderDNF(TestContext.class)
+			.or(condUnknown, condUnknownB)
+			.build();
+
+		Assert.assertEquals(Kleenean.UNKNOWN, unknownAndUnknown.evaluate(context));
+		assertEvals(condUnknown, 1);
+		assertEvals(condUnknownB, 1);
+	}
+
+	@Test
+	public void testComplexCombined() {
+		Conditional<TestContext> trueAndFalseOrUnknownOrTrue = Conditional.builderDNF(TestContext.class)
+			.and(condTrue, condFalse)
+			.or(condUnknown, condTrue)
+			.build();
+
+		Assert.assertEquals(Kleenean.TRUE, trueAndFalseOrUnknownOrTrue.evaluate(context));
+		assertEvals(condTrue, 1);
+		assertEvals(condFalse, 1);
+		assertEvals(condUnknown, 1);
+
+		Conditional<TestContext> trueOrTrueAndFalseOrUnknown = Conditional.builderDNF(TestContext.class)
+			.or(condTrue)
+			.or(Conditional.compound(Conditional.Operator.AND, condTrue, condFalse))
+			.or(condUnknown)
+			.build();
+
+		Assert.assertEquals(Kleenean.TRUE, trueOrTrueAndFalseOrUnknown.evaluate(context));
+		assertEvals(condTrue, 1);
+		assertEvals(condFalse, 0);
+		assertEvals(condUnknown, 0);
+
+		// should compose to (U && T && F) || (T && T && F)
+		Conditional<TestContext> unknownOrTrueAndTrueAndFalse = Conditional.builderDNF(TestContext.class)
+			.or(condUnknown, condTrue)
+			.and(condTrue, condFalse)
+			.build();
+
+		Assert.assertEquals(Kleenean.FALSE, unknownOrTrueAndTrueAndFalse.evaluate(context));
+		assertEvals(condTrue, 1);
+		assertEvals(condFalse, 1);
+		assertEvals(condUnknown, 1);
+	}
+
+	@Test
+	public void testCombinedAndOrNot() {
+		TestConditional condFalseB = new TestConditional(Kleenean.FALSE);
+
+		Conditional<TestContext> falseOrNotTrueAndFalse = Conditional.builderDNF(condFalse)
+			.orNot(Conditional.compound(Conditional.Operator.AND, condTrue, condFalseB))
+			.build();
+
+		Assert.assertEquals(Kleenean.TRUE, falseOrNotTrueAndFalse.evaluate(context));
+		assertEvals(condTrue, 1);
+		assertEvals(condFalse, 1);
+		assertEvals(condFalseB, 1);
+
+
+		Conditional<TestContext> unknownAndNotTrueOrFalseOrNotFalse = Conditional.builderDNF(TestContext.class)
+			.and(condUnknown)
+			.andNot(Conditional.compound(Conditional.Operator.OR, condTrue, condFalse))
+			.orNot(condFalseB)
+			.build();
+
+		Assert.assertEquals(Kleenean.TRUE, unknownAndNotTrueOrFalseOrNotFalse.evaluate(context));
+		assertEvals(condUnknown, 1);
+		assertEvals(condTrue, 1);
+		assertEvals(condFalse, 0);
+		assertEvals(condFalseB, 1);
+	}
+
+	@Ignore
+	private static class TestContext {
+		
+	}
+	
+	@Ignore
+	private static class TestConditional implements Conditional<TestContext> {
+
+		public int timesEvaluated;
+		public final Kleenean value;
+
+		TestConditional(Kleenean value) {
+			this.value = value;
+		}
+
+		@Override
+		public Kleenean evaluate(TestContext context) {
+			++timesEvaluated;
+			return value;
+		}
+
+		public void reset() {
+			timesEvaluated = 0;
+		}
+
+		@Override
+		public String toString(@Nullable Event context, boolean debug) {
+			return value.toString();
+		}
+	}
+
+}
diff --git a/src/test/java/org/skriptlang/skript/test/tests/lang/EntryContainerTest.java b/src/test/java/org/skriptlang/skript/test/tests/lang/EntryContainerTest.java
new file mode 100644
index 00000000000..433950a5145
--- /dev/null
+++ b/src/test/java/org/skriptlang/skript/test/tests/lang/EntryContainerTest.java
@@ -0,0 +1,11 @@
+package org.skriptlang.skript.test.tests.lang;
+
+import ch.njol.skript.test.runner.SkriptJUnitTest;
+import org.junit.Test;
+
+public class EntryContainerTest extends SkriptJUnitTest {
+
+	@Test
+	public void test() {}
+
+}
diff --git a/src/test/java/org/skriptlang/skript/test/tests/localization/NounTest.java b/src/test/java/org/skriptlang/skript/test/tests/localization/NounTest.java
index 0c9cd31de11..d569aec4f7d 100644
--- a/src/test/java/org/skriptlang/skript/test/tests/localization/NounTest.java
+++ b/src/test/java/org/skriptlang/skript/test/tests/localization/NounTest.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package org.skriptlang.skript.test.tests.localization;
 
 import static org.junit.Assert.assertEquals;
diff --git a/src/test/java/org/skriptlang/skript/test/tests/localization/UtilsPlurals.java b/src/test/java/org/skriptlang/skript/test/tests/localization/UtilsPluralsTest.java
similarity index 56%
rename from src/test/java/org/skriptlang/skript/test/tests/localization/UtilsPlurals.java
rename to src/test/java/org/skriptlang/skript/test/tests/localization/UtilsPluralsTest.java
index e6ac6861c75..ea705c08805 100644
--- a/src/test/java/org/skriptlang/skript/test/tests/localization/UtilsPlurals.java
+++ b/src/test/java/org/skriptlang/skript/test/tests/localization/UtilsPluralsTest.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package org.skriptlang.skript.test.tests.localization;
 
 import static org.junit.Assert.assertEquals;
@@ -24,7 +6,7 @@
 
 import ch.njol.skript.util.Utils;
 
-public class UtilsPlurals {
+public class UtilsPluralsTest {
 
 	/**
 	 * Testing method {@link Utils#getEnglishPlural(String)}
diff --git a/src/test/java/org/skriptlang/skript/test/tests/parsing/StaticParseTest.java b/src/test/java/org/skriptlang/skript/test/tests/parsing/StaticParseTest.java
index b4589f63ccf..55a4ea18ec0 100644
--- a/src/test/java/org/skriptlang/skript/test/tests/parsing/StaticParseTest.java
+++ b/src/test/java/org/skriptlang/skript/test/tests/parsing/StaticParseTest.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package org.skriptlang.skript.test.tests.parsing;
 
 import ch.njol.skript.lang.ParseContext;
diff --git a/src/test/java/org/skriptlang/skript/test/tests/regression/BlockDataNotCloned6829.java b/src/test/java/org/skriptlang/skript/test/tests/regression/BlockDataNotCloned6829Test.java
similarity index 59%
rename from src/test/java/org/skriptlang/skript/test/tests/regression/BlockDataNotCloned6829.java
rename to src/test/java/org/skriptlang/skript/test/tests/regression/BlockDataNotCloned6829Test.java
index b621734958d..86bbebab5ac 100644
--- a/src/test/java/org/skriptlang/skript/test/tests/regression/BlockDataNotCloned6829.java
+++ b/src/test/java/org/skriptlang/skript/test/tests/regression/BlockDataNotCloned6829Test.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package org.skriptlang.skript.test.tests.regression;
 
 import ch.njol.skript.lang.Effect;
@@ -30,7 +12,7 @@
 
 import java.util.Objects;
 
-public class BlockDataNotCloned6829 extends SkriptJUnitTest {
+public class BlockDataNotCloned6829Test extends SkriptJUnitTest {
 
 	public void run(String unparsedEffect, Event event) {
 		Effect effect = Effect.parse(unparsedEffect, "Can't understand this effect: " + unparsedEffect);
diff --git a/src/test/java/org/skriptlang/skript/test/tests/regression/ExprPlainAliasTest.java b/src/test/java/org/skriptlang/skript/test/tests/regression/ExprPlainAliasTest.java
index d5c4a3653ef..6c742aa64da 100644
--- a/src/test/java/org/skriptlang/skript/test/tests/regression/ExprPlainAliasTest.java
+++ b/src/test/java/org/skriptlang/skript/test/tests/regression/ExprPlainAliasTest.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package org.skriptlang.skript.test.tests.regression;
 
 import ch.njol.skript.aliases.ItemType;
diff --git a/src/test/java/org/skriptlang/skript/test/tests/regression/SimpleJUnitTest.java b/src/test/java/org/skriptlang/skript/test/tests/regression/SimpleJUnitTest.java
index 0f8f78b33b7..15c345d7f43 100644
--- a/src/test/java/org/skriptlang/skript/test/tests/regression/SimpleJUnitTest.java
+++ b/src/test/java/org/skriptlang/skript/test/tests/regression/SimpleJUnitTest.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package org.skriptlang.skript.test.tests.regression;
 
 import org.bukkit.entity.Pig;
diff --git a/src/test/java/org/skriptlang/skript/test/tests/syntaxes/InventoryMoveItemEventTest.java b/src/test/java/org/skriptlang/skript/test/tests/syntaxes/InventoryMoveItemEventTest.java
index fc486687f85..e8a56fbe24d 100644
--- a/src/test/java/org/skriptlang/skript/test/tests/syntaxes/InventoryMoveItemEventTest.java
+++ b/src/test/java/org/skriptlang/skript/test/tests/syntaxes/InventoryMoveItemEventTest.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package org.skriptlang.skript.test.tests.syntaxes;
 
 import ch.njol.skript.test.runner.SkriptJUnitTest;
diff --git a/src/test/java/org/skriptlang/skript/test/tests/syntaxes/conditions/CondCanSeeTest.java b/src/test/java/org/skriptlang/skript/test/tests/syntaxes/conditions/CondCanSeeTest.java
new file mode 100644
index 00000000000..453db435aba
--- /dev/null
+++ b/src/test/java/org/skriptlang/skript/test/tests/syntaxes/conditions/CondCanSeeTest.java
@@ -0,0 +1,81 @@
+package org.skriptlang.skript.test.tests.syntaxes.conditions;
+
+import ch.njol.skript.Skript;
+import ch.njol.skript.lang.Condition;
+import ch.njol.skript.lang.util.ContextlessEvent;
+import ch.njol.skript.test.runner.SkriptJUnitTest;
+import ch.njol.skript.util.Version;
+import ch.njol.skript.variables.Variables;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.Player;
+import org.easymock.EasyMock;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
+import java.util.UUID;
+
+public class CondCanSeeTest extends SkriptJUnitTest {
+
+	static {
+		setShutdownDelay(1);
+	}
+
+	private Player testPlayer;
+	private Entity testEntity;
+	private Condition canSeeCondition;
+	private Set<UUID> hiddenEntities;
+
+	@Before
+	public void setup() {
+		testPlayer = EasyMock.niceMock(Player.class);
+		testEntity = spawnTestPig();
+		canSeeCondition = Condition.parse("{_player} can see {_entity}", null);
+		hiddenEntities = new HashSet<>();
+	}
+
+	@Test
+	public void test() {
+		if (Skript.getMinecraftVersion().isSmallerThan(new Version(1, 19)))
+			return;
+		if (canSeeCondition == null)
+			Assert.fail("Hide entity effect is null");
+
+		ContextlessEvent event = ContextlessEvent.get();
+		Variables.setVariable("player", testPlayer, event, true);
+		Variables.setVariable("entity", testEntity, event, true);
+
+		// entity not in hiddenEntities
+		EasyMock.expect(testPlayer.canSee(testEntity))
+			.andAnswer(() -> !hiddenEntities.contains(((Entity) EasyMock.getCurrentArgument(0)).getUniqueId()));
+		EasyMock.replay(testPlayer);
+		assert canSeeCondition.check(event);
+		EasyMock.verify(testPlayer);
+
+		hiddenEntities.add(testEntity.getUniqueId());
+		EasyMock.resetToNice(testPlayer);
+		EasyMock.expect(testPlayer.canSee(testEntity))
+			.andAnswer(() -> !hiddenEntities.contains(((Entity) EasyMock.getCurrentArgument(0)).getUniqueId()));
+		EasyMock.replay(testPlayer);
+		assert !canSeeCondition.check(event);
+		EasyMock.verify(testPlayer);
+
+		hiddenEntities.remove(testEntity.getUniqueId());
+		EasyMock.resetToNice(testPlayer);
+		EasyMock.expect(testPlayer.canSee(testEntity))
+			.andAnswer(() -> !hiddenEntities.contains(((Entity) EasyMock.getCurrentArgument(0)).getUniqueId()));
+		EasyMock.replay(testPlayer);
+		assert canSeeCondition.check(event);
+		EasyMock.verify(testPlayer);
+	}
+
+	@After
+	public void removeEntity() {
+		testEntity.remove();
+	}
+
+}
diff --git a/src/test/java/org/skriptlang/skript/test/tests/syntaxes/conditions/CondChatVisibilityTest.java b/src/test/java/org/skriptlang/skript/test/tests/syntaxes/conditions/CondChatVisibilityTest.java
new file mode 100644
index 00000000000..1dbcdc98c19
--- /dev/null
+++ b/src/test/java/org/skriptlang/skript/test/tests/syntaxes/conditions/CondChatVisibilityTest.java
@@ -0,0 +1,48 @@
+package org.skriptlang.skript.test.tests.syntaxes.conditions;
+
+import ch.njol.skript.Skript;
+import ch.njol.skript.test.runner.SkriptJUnitTest;
+import com.destroystokyo.paper.ClientOption;
+import org.bukkit.Bukkit;
+import org.bukkit.entity.Player;
+import org.bukkit.event.player.PlayerJoinEvent;
+import org.easymock.EasyMock;
+import org.junit.Before;
+import org.junit.Test;
+
+public class CondChatVisibilityTest extends SkriptJUnitTest {
+
+	private static final boolean SUPPORTS_CHAT_VISIBILITY =
+		Skript.classExists("com.destroystokyo.paper.ClientOption$ChatVisibility");
+
+	static {
+		setShutdownDelay(1);
+	}
+
+	private Player player;
+
+	@Before
+	public void setup() {
+		if (!SUPPORTS_CHAT_VISIBILITY)
+			return;
+
+		player = EasyMock.niceMock(Player.class);
+
+		EasyMock.expect(player.getClientOption(ClientOption.CHAT_VISIBILITY))
+			.andReturn(ClientOption.ChatVisibility.SYSTEM);
+		EasyMock.expect(player.getClientOption(ClientOption.TEXT_FILTERING_ENABLED))
+			.andReturn(false);
+		EasyMock.expect(player.getClientOption(ClientOption.CHAT_COLORS_ENABLED))
+			.andReturn(true);
+		EasyMock.replay(player);
+	}
+
+	@Test
+	public void test() {
+		if (!SUPPORTS_CHAT_VISIBILITY)
+			return;
+
+		Bukkit.getPluginManager().callEvent(new PlayerJoinEvent(player, "hi"));
+	}
+
+}
diff --git a/src/test/java/org/skriptlang/skript/test/tests/syntaxes/conditions/CondIsPressingKeyTest.java b/src/test/java/org/skriptlang/skript/test/tests/syntaxes/conditions/CondIsPressingKeyTest.java
new file mode 100644
index 00000000000..8461d01954d
--- /dev/null
+++ b/src/test/java/org/skriptlang/skript/test/tests/syntaxes/conditions/CondIsPressingKeyTest.java
@@ -0,0 +1,74 @@
+package org.skriptlang.skript.test.tests.syntaxes.conditions;
+
+import ch.njol.skript.Skript;
+import ch.njol.skript.lang.Condition;
+import ch.njol.skript.lang.util.ContextlessEvent;
+import ch.njol.skript.test.runner.SkriptJUnitTest;
+import ch.njol.skript.variables.Variables;
+import org.bukkit.entity.Player;
+import org.easymock.EasyMock;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.skriptlang.skript.bukkit.input.InputKey;
+import org.skriptlang.skript.test.utils.InputHelper;
+
+public class CondIsPressingKeyTest extends SkriptJUnitTest {
+
+	private static final boolean SUPPORTS_INPUT = Skript.classExists("org.bukkit.Input");
+
+	static {
+		setShutdownDelay(1);
+	}
+
+	private Player testPlayer;
+	private InputKey[] testInputKeys;
+	private Condition isPressingKeyCondition;
+
+	@Before
+	public void setup() {
+		if (!SUPPORTS_INPUT)
+			return;
+		testPlayer = EasyMock.niceMock(Player.class);
+		testInputKeys = new InputKey[]{InputKey.FORWARD, InputKey.JUMP};
+		isPressingKeyCondition = Condition.parse("{_player} is pressing {_input-keys::*}", null);
+	}
+
+	@Test
+	public void test() {
+		if (!SUPPORTS_INPUT)
+			return;
+		if (isPressingKeyCondition == null)
+			Assert.fail("Is pressing key condition is null");
+
+		ContextlessEvent event = ContextlessEvent.get();
+		Variables.setVariable("player", testPlayer, event, true);
+		Variables.setVariable("input-keys::1", testInputKeys[0], event, true);
+
+		EasyMock.expect(testPlayer.getCurrentInput()).andReturn(InputHelper.fromKeys(testInputKeys));
+		EasyMock.replay(testPlayer);
+		assert isPressingKeyCondition.check(event);
+		EasyMock.verify(testPlayer);
+
+		EasyMock.resetToNice(testPlayer);
+		EasyMock.expect(testPlayer.getCurrentInput()).andReturn(InputHelper.fromKeys(testInputKeys[1]));
+		EasyMock.replay(testPlayer);
+		assert !isPressingKeyCondition.check(event);
+		EasyMock.verify(testPlayer);
+
+		EasyMock.resetToNice(testPlayer);
+		Variables.setVariable("input-keys::2", testInputKeys[1], event, true);
+		EasyMock.expect(testPlayer.getCurrentInput()).andReturn(InputHelper.fromKeys(testInputKeys));
+		EasyMock.replay(testPlayer);
+		assert isPressingKeyCondition.check(event);
+		EasyMock.verify(testPlayer);
+
+		EasyMock.resetToNice(testPlayer);
+		Variables.setVariable("input-keys::3", InputKey.SNEAK, event, true);
+		EasyMock.expect(testPlayer.getCurrentInput()).andReturn(InputHelper.fromKeys(testInputKeys));
+		EasyMock.replay(testPlayer);
+		assert !isPressingKeyCondition.check(event);
+		EasyMock.verify(testPlayer);
+	}
+
+}
diff --git a/src/test/java/org/skriptlang/skript/test/tests/syntaxes/effects/EffActionBarTest.java b/src/test/java/org/skriptlang/skript/test/tests/syntaxes/effects/EffActionBarTest.java
index 125f22e86e8..0d7e598d967 100644
--- a/src/test/java/org/skriptlang/skript/test/tests/syntaxes/effects/EffActionBarTest.java
+++ b/src/test/java/org/skriptlang/skript/test/tests/syntaxes/effects/EffActionBarTest.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package org.skriptlang.skript.test.tests.syntaxes.effects;
 
 
diff --git a/src/test/java/org/skriptlang/skript/test/tests/syntaxes/effects/EffApplyBoneMealTest.java b/src/test/java/org/skriptlang/skript/test/tests/syntaxes/effects/EffApplyBoneMealTest.java
index 5b7a5b8aa1f..3f4ed672220 100644
--- a/src/test/java/org/skriptlang/skript/test/tests/syntaxes/effects/EffApplyBoneMealTest.java
+++ b/src/test/java/org/skriptlang/skript/test/tests/syntaxes/effects/EffApplyBoneMealTest.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package org.skriptlang.skript.test.tests.syntaxes.effects;
 
 
diff --git a/src/test/java/org/skriptlang/skript/test/tests/syntaxes/effects/EffEntityVisibilityTest.java b/src/test/java/org/skriptlang/skript/test/tests/syntaxes/effects/EffEntityVisibilityTest.java
new file mode 100644
index 00000000000..0c3f84b34ce
--- /dev/null
+++ b/src/test/java/org/skriptlang/skript/test/tests/syntaxes/effects/EffEntityVisibilityTest.java
@@ -0,0 +1,68 @@
+package org.skriptlang.skript.test.tests.syntaxes.effects;
+
+import ch.njol.skript.Skript;
+import ch.njol.skript.lang.Effect;
+import ch.njol.skript.lang.TriggerItem;
+import ch.njol.skript.lang.util.ContextlessEvent;
+import ch.njol.skript.test.runner.SkriptJUnitTest;
+import ch.njol.skript.util.Version;
+import ch.njol.skript.variables.Variables;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.Player;
+import org.easymock.EasyMock;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+public class EffEntityVisibilityTest extends SkriptJUnitTest {
+
+	static {
+		setShutdownDelay(1);
+	}
+
+	private Player testPlayer;
+	private Entity testEntity;
+	private Effect hideEntityEffect;
+	private Effect revealEntityEffect;
+
+	@Before
+	public void setup() {
+		testPlayer = EasyMock.niceMock(Player.class);
+		testEntity = spawnTestPig();
+		hideEntityEffect = Effect.parse("hide {_entity} from {_player}", null);
+		revealEntityEffect = Effect.parse("reveal {_entity} to {_player}", null);
+	}
+
+	@Test
+	public void test() {
+		if (Skript.getMinecraftVersion().isSmallerThan(new Version(1, 19)))
+			return;
+		if (hideEntityEffect == null)
+			Assert.fail("Hide entity effect is null");
+		if (revealEntityEffect == null)
+			Assert.fail("Reveal player effect is null");
+
+		ContextlessEvent event = ContextlessEvent.get();
+		Variables.setVariable("player", testPlayer, event, true);
+		Variables.setVariable("entity", testEntity, event, true);
+
+		testPlayer.hideEntity(Skript.getInstance(), testEntity);
+		EasyMock.expectLastCall();
+		EasyMock.replay(testPlayer);
+		TriggerItem.walk(hideEntityEffect, event);
+		EasyMock.verify(testPlayer);
+
+		EasyMock.resetToNice(testPlayer);
+		testPlayer.showEntity(Skript.getInstance(), testEntity);
+		EasyMock.expectLastCall();
+		EasyMock.replay(testPlayer);
+		TriggerItem.walk(revealEntityEffect, event);
+		EasyMock.verify(testPlayer);
+	}
+
+	@After
+	public void removeEntity() {
+		testEntity.remove();
+	}
+}
diff --git a/src/test/java/org/skriptlang/skript/test/tests/syntaxes/effects/EffFeedTest.java b/src/test/java/org/skriptlang/skript/test/tests/syntaxes/effects/EffFeedTest.java
index 1235eea38ab..54a8fb2d98f 100644
--- a/src/test/java/org/skriptlang/skript/test/tests/syntaxes/effects/EffFeedTest.java
+++ b/src/test/java/org/skriptlang/skript/test/tests/syntaxes/effects/EffFeedTest.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package org.skriptlang.skript.test.tests.syntaxes.effects;
 
 import ch.njol.skript.lang.Effect;
diff --git a/src/test/java/org/skriptlang/skript/test/tests/syntaxes/effects/EffMakeFlyTest.java b/src/test/java/org/skriptlang/skript/test/tests/syntaxes/effects/EffMakeFlyTest.java
index 28497059e53..f7b047f5ef3 100644
--- a/src/test/java/org/skriptlang/skript/test/tests/syntaxes/effects/EffMakeFlyTest.java
+++ b/src/test/java/org/skriptlang/skript/test/tests/syntaxes/effects/EffMakeFlyTest.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package org.skriptlang.skript.test.tests.syntaxes.effects;
 
 import ch.njol.skript.lang.Effect;
diff --git a/src/test/java/org/skriptlang/skript/test/tests/syntaxes/effects/EffOpTest.java b/src/test/java/org/skriptlang/skript/test/tests/syntaxes/effects/EffOpTest.java
index 69b237292d9..c77dd520741 100644
--- a/src/test/java/org/skriptlang/skript/test/tests/syntaxes/effects/EffOpTest.java
+++ b/src/test/java/org/skriptlang/skript/test/tests/syntaxes/effects/EffOpTest.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package org.skriptlang.skript.test.tests.syntaxes.effects;
 
 import ch.njol.skript.lang.Effect;
diff --git a/src/test/java/org/skriptlang/skript/test/tests/syntaxes/effects/EffSwingHandTest.java b/src/test/java/org/skriptlang/skript/test/tests/syntaxes/effects/EffSwingHandTest.java
index 1b5da4d1a46..babfa30a0d8 100644
--- a/src/test/java/org/skriptlang/skript/test/tests/syntaxes/effects/EffSwingHandTest.java
+++ b/src/test/java/org/skriptlang/skript/test/tests/syntaxes/effects/EffSwingHandTest.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package org.skriptlang.skript.test.tests.syntaxes.effects;
 
 import ch.njol.skript.Skript;
diff --git a/src/test/java/org/skriptlang/skript/test/tests/syntaxes/events/BellEventsTest.java b/src/test/java/org/skriptlang/skript/test/tests/syntaxes/events/BellEventsTest.java
index 07163771783..d6e17ac4f1b 100644
--- a/src/test/java/org/skriptlang/skript/test/tests/syntaxes/events/BellEventsTest.java
+++ b/src/test/java/org/skriptlang/skript/test/tests/syntaxes/events/BellEventsTest.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package org.skriptlang.skript.test.tests.syntaxes.events;
 
 import ch.njol.skript.Skript;
diff --git a/src/test/java/org/skriptlang/skript/test/tests/syntaxes/events/EvtBeaconTest.java b/src/test/java/org/skriptlang/skript/test/tests/syntaxes/events/EvtBeaconTest.java
new file mode 100644
index 00000000000..20d94e275dc
--- /dev/null
+++ b/src/test/java/org/skriptlang/skript/test/tests/syntaxes/events/EvtBeaconTest.java
@@ -0,0 +1,64 @@
+package org.skriptlang.skript.test.tests.syntaxes.events;
+
+import ch.njol.skript.Skript;
+import ch.njol.skript.test.runner.SkriptJUnitTest;
+import com.destroystokyo.paper.event.block.BeaconEffectEvent;
+import io.papermc.paper.event.block.BeaconActivatedEvent;
+import io.papermc.paper.event.block.BeaconDeactivatedEvent;
+import io.papermc.paper.event.player.PlayerChangeBeaconEffectEvent;
+import org.bukkit.Bukkit;
+import org.bukkit.Material;
+import org.bukkit.block.Beacon;
+import org.bukkit.block.Block;
+import org.bukkit.entity.Player;
+import org.bukkit.potion.PotionEffect;
+import org.bukkit.potion.PotionEffectType;
+import org.easymock.EasyMock;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+public class EvtBeaconTest extends SkriptJUnitTest {
+
+	private Block beacon;
+	private Beacon state;
+	private final PotionEffectType effectType = PotionEffectType.HEALTH_BOOST;
+	private final PotionEffectType effectType2 = PotionEffectType.REGENERATION;
+	private final PotionEffect effect = new PotionEffect(effectType, 300, 1);
+	private final PotionEffect effect2 = new PotionEffect(effectType2, 300, 1);
+
+	private Player easyMockPlayer;
+
+	@Before
+	public void setUp() {
+		beacon = setBlock(Material.BEACON);
+		beacon.setType(Material.BEACON);
+		state = (Beacon) beacon.getState();
+		state.setPrimaryEffect(effectType);
+		state.setSecondaryEffect(effectType2);
+		state.update(true);
+		easyMockPlayer = EasyMock.niceMock(Player.class);
+	}
+
+	@Test
+	public void callEvents() {
+		BeaconEffectEvent beaconEffectEvent = new BeaconEffectEvent(beacon, effect, easyMockPlayer, true);
+		BeaconEffectEvent beaconEffectEvent2 = new BeaconEffectEvent(beacon, effect2, easyMockPlayer, false);
+		BeaconActivatedEvent beaconActivatedEvent = new BeaconActivatedEvent(beacon);
+		BeaconDeactivatedEvent beaconDeactivatedEvent = new BeaconDeactivatedEvent(beacon);
+		PlayerChangeBeaconEffectEvent playerChangeBeaconEffectEvent = new PlayerChangeBeaconEffectEvent(easyMockPlayer, effectType, effectType2, beacon);
+
+		Bukkit.getPluginManager().callEvent(beaconEffectEvent);
+		Bukkit.getPluginManager().callEvent(beaconEffectEvent2);
+		Bukkit.getPluginManager().callEvent(beaconActivatedEvent);
+		Bukkit.getPluginManager().callEvent(beaconDeactivatedEvent);
+		Bukkit.getPluginManager().callEvent(playerChangeBeaconEffectEvent);
+	}
+
+	@After
+	public void cleanup() {
+		if (beacon != null)
+			beacon.setType(Material.AIR);
+	}
+
+}
diff --git a/src/test/java/org/skriptlang/skript/test/tests/syntaxes/events/EvtBreedTest.java b/src/test/java/org/skriptlang/skript/test/tests/syntaxes/events/EvtBreedTest.java
new file mode 100644
index 00000000000..be6eb6da784
--- /dev/null
+++ b/src/test/java/org/skriptlang/skript/test/tests/syntaxes/events/EvtBreedTest.java
@@ -0,0 +1,53 @@
+package org.skriptlang.skript.test.tests.syntaxes.events;
+
+import ch.njol.skript.test.runner.SkriptJUnitTest;
+import org.bukkit.Bukkit;
+import org.bukkit.Material;
+import org.bukkit.entity.Pig;
+import org.bukkit.entity.Player;
+import org.bukkit.inventory.ItemStack;
+import org.easymock.EasyMock;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+public class EvtBreedTest extends SkriptJUnitTest {
+
+	static {
+		setShutdownDelay(1);
+	}
+
+	private Pig child;
+	private Pig mother;
+	private Pig father;
+	private Player player;
+
+	@Before
+	public void before() {
+		child = spawnTestPig();
+		child.setCustomName("child");
+		mother = spawnTestPig();
+		mother.setCustomName("mother");
+		father = spawnTestPig();
+		father.setCustomName("father");
+
+		player = EasyMock.niceMock(Player.class);
+		EasyMock.expect(player.getName()).andReturn("Efnilite");
+		EasyMock.replay(player);
+	}
+
+	@Test
+	public void test() {
+		Bukkit.getPluginManager().callEvent(
+			new org.bukkit.event.entity.EntityBreedEvent(
+				child, mother, father, player, new ItemStack(Material.CARROT), 0));
+	}
+
+	@After
+	public void after() {
+		child.remove();
+		mother.remove();
+		father.remove();
+	}
+
+}
diff --git a/src/test/java/org/skriptlang/skript/test/tests/syntaxes/events/EvtBroadcastTest.java b/src/test/java/org/skriptlang/skript/test/tests/syntaxes/events/EvtBroadcastTest.java
new file mode 100644
index 00000000000..b3ef3d18b9f
--- /dev/null
+++ b/src/test/java/org/skriptlang/skript/test/tests/syntaxes/events/EvtBroadcastTest.java
@@ -0,0 +1,23 @@
+package org.skriptlang.skript.test.tests.syntaxes.events;
+
+import ch.njol.skript.test.runner.SkriptAsyncJUnitTest;
+import org.bukkit.Bukkit;
+import org.bukkit.event.server.BroadcastMessageEvent;
+import org.junit.Test;
+
+import java.util.Set;
+
+public class EvtBroadcastTest extends SkriptAsyncJUnitTest {
+
+	static {
+		setShutdownDelay(1);
+	}
+
+	@Test
+	public void test() {
+		Bukkit.getPluginManager().callEvent(
+			new BroadcastMessageEvent(true, "Intentional broadcast!",
+				Set.of(Bukkit.getConsoleSender())));
+	}
+
+}
diff --git a/src/test/java/org/skriptlang/skript/test/tests/syntaxes/events/EvtBucketEntityTest.java b/src/test/java/org/skriptlang/skript/test/tests/syntaxes/events/EvtBucketEntityTest.java
new file mode 100644
index 00000000000..10764efff03
--- /dev/null
+++ b/src/test/java/org/skriptlang/skript/test/tests/syntaxes/events/EvtBucketEntityTest.java
@@ -0,0 +1,54 @@
+package org.skriptlang.skript.test.tests.syntaxes.events;
+
+import ch.njol.skript.test.runner.SkriptJUnitTest;
+import org.bukkit.Bukkit;
+import org.bukkit.Material;
+import org.bukkit.entity.Cod;
+import org.bukkit.entity.Fish;
+import org.bukkit.entity.Player;
+import org.bukkit.entity.Salmon;
+import org.bukkit.event.player.PlayerBucketEntityEvent;
+import org.bukkit.inventory.EquipmentSlot;
+import org.bukkit.inventory.ItemStack;
+import org.easymock.EasyMock;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+public class EvtBucketEntityTest extends SkriptJUnitTest {
+
+	static {
+		setShutdownDelay(1);
+	}
+
+	private Fish salmon;
+	private Fish cod;
+
+	@Before
+	public void setup() {
+		salmon = getTestLocation().getWorld().spawn(getTestLocation(), Salmon.class);
+		cod = getTestLocation().getWorld().spawn(getTestLocation(), Cod.class);
+	}
+
+	@Test
+	public void test() {
+		Player player = EasyMock.niceMock(Player.class);
+		EasyMock.expect(player.getName()).andReturn("Efnilite").anyTimes();
+		EasyMock.replay(player);
+
+		Bukkit.getPluginManager().callEvent(new PlayerBucketEntityEvent(
+			player, salmon, new ItemStack(Material.WATER_BUCKET),
+			new ItemStack(Material.SALMON_BUCKET), EquipmentSlot.HAND));
+
+		Bukkit.getPluginManager().callEvent(new PlayerBucketEntityEvent(
+			player, cod, new ItemStack(Material.WATER_BUCKET),
+			new ItemStack(Material.COD_BUCKET), EquipmentSlot.HAND));
+	}
+
+	@After
+	public void reset() {
+		salmon.remove();
+		cod.remove();
+	}
+
+}
diff --git a/src/test/java/org/skriptlang/skript/test/tests/syntaxes/events/EvtExperienceCooldownChangeTest.java b/src/test/java/org/skriptlang/skript/test/tests/syntaxes/events/EvtExperienceCooldownChangeTest.java
new file mode 100644
index 00000000000..6f743af8d29
--- /dev/null
+++ b/src/test/java/org/skriptlang/skript/test/tests/syntaxes/events/EvtExperienceCooldownChangeTest.java
@@ -0,0 +1,27 @@
+package org.skriptlang.skript.test.tests.syntaxes.events;
+
+import ch.njol.skript.test.runner.SkriptJUnitTest;
+import org.bukkit.Bukkit;
+import org.bukkit.entity.Player;
+import org.bukkit.event.player.PlayerExpCooldownChangeEvent;
+import org.bukkit.event.player.PlayerExpCooldownChangeEvent.ChangeReason;
+import org.easymock.EasyMock;
+import org.junit.Before;
+import org.junit.Test;
+
+public class EvtExperienceCooldownChangeTest extends SkriptJUnitTest {
+
+	private Player easyMockPlayer;
+
+	@Before
+	public void setUp() {
+		easyMockPlayer = EasyMock.niceMock(Player.class);
+	}
+
+	@Test
+	public void testEvent() {
+		PlayerExpCooldownChangeEvent event = new PlayerExpCooldownChangeEvent(easyMockPlayer, 200, ChangeReason.PLUGIN);
+		Bukkit.getPluginManager().callEvent(event);
+	}
+
+}
diff --git a/src/test/java/org/skriptlang/skript/test/tests/syntaxes/events/EvtFireworkTest.java b/src/test/java/org/skriptlang/skript/test/tests/syntaxes/events/EvtFireworkTest.java
new file mode 100644
index 00000000000..75941ff7de6
--- /dev/null
+++ b/src/test/java/org/skriptlang/skript/test/tests/syntaxes/events/EvtFireworkTest.java
@@ -0,0 +1,59 @@
+package org.skriptlang.skript.test.tests.syntaxes.events;
+
+import ch.njol.skript.Skript;
+import ch.njol.skript.test.runner.SkriptJUnitTest;
+import ch.njol.skript.util.SkriptColor;
+import org.bukkit.Bukkit;
+import org.bukkit.FireworkEffect;
+import org.bukkit.entity.EntityType;
+import org.bukkit.entity.Firework;
+import org.bukkit.event.Event;
+import org.bukkit.event.entity.FireworkExplodeEvent;
+import org.bukkit.inventory.meta.FireworkMeta;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class EvtFireworkTest extends SkriptJUnitTest {
+
+	private EntityType entityType;
+	private List<Firework> fireworkList = new ArrayList<>();
+
+	@Before
+	public void getEntity() {
+		if (Skript.isRunningMinecraft(1, 20, 5)) {
+			entityType = EntityType.FIREWORK_ROCKET;
+		} else {
+			entityType = EntityType.valueOf("FIREWORK");
+		}
+	}
+
+	@Test
+	public void callEvents() {
+		List<Event> events = new ArrayList<>();
+		for (SkriptColor color : SkriptColor.values()) {
+			Firework firework = (Firework) getTestWorld().spawnEntity(getTestLocation(), entityType);
+			FireworkEffect fireworkEffect = FireworkEffect.builder().withColor(color.asDyeColor().getFireworkColor()).build();
+			FireworkMeta fireworkMeta = firework.getFireworkMeta();
+			fireworkMeta.addEffects(fireworkEffect);
+			firework.setFireworkMeta(fireworkMeta);
+			fireworkList.add(firework);
+			events.add(new FireworkExplodeEvent(firework));
+		}
+
+		for (Event event : events) {
+			Bukkit.getPluginManager().callEvent(event);
+		}
+	}
+
+	@After
+	public void cleanUp() {
+		for (Firework firework : fireworkList) {
+			firework.remove();
+		}
+	}
+
+}
diff --git a/src/test/java/org/skriptlang/skript/test/tests/syntaxes/events/EvtFishTest.java b/src/test/java/org/skriptlang/skript/test/tests/syntaxes/events/EvtFishTest.java
new file mode 100644
index 00000000000..4e21768cd2b
--- /dev/null
+++ b/src/test/java/org/skriptlang/skript/test/tests/syntaxes/events/EvtFishTest.java
@@ -0,0 +1,109 @@
+package org.skriptlang.skript.test.tests.syntaxes.events;
+
+import ch.njol.skript.Skript;
+import ch.njol.skript.test.runner.SkriptJUnitTest;
+import org.bukkit.Bukkit;
+import org.bukkit.entity.*;
+import org.bukkit.event.player.PlayerFishEvent;
+import org.easymock.EasyMock;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Ignore;
+import org.junit.Test;
+
+public class EvtFishTest extends SkriptJUnitTest {
+
+	static {
+		setShutdownDelay(1);
+	}
+
+	private Fish salmon;
+	private Fish cod;
+
+	@Before
+	public void setup() {
+		salmon = getTestLocation().getWorld().spawn(getTestLocation(), Salmon.class);
+		cod = getTestLocation().getWorld().spawn(getTestLocation(), Cod.class);
+	}
+
+	@Test
+	public void test() {
+		Player player = EasyMock.niceMock(Player.class);
+		EasyMock.expect(player.getName()).andReturn("Efnilite").anyTimes();
+		EasyMock.replay(player);
+
+		Bukkit.getPluginManager().callEvent(new PlayerFishEvent(
+			player, salmon, new FishHookMock(salmon).getHook(), PlayerFishEvent.State.CAUGHT_FISH));
+
+		Bukkit.getPluginManager().callEvent(new PlayerFishEvent(
+			player, cod, new FishHookMock(cod).getHook(), PlayerFishEvent.State.FISHING));
+	}
+
+	@After
+	public void reset() {
+		salmon.remove();
+		cod.remove();
+	}
+
+	@Ignore
+	private static class FishHookMock {
+
+		private final FishHook hook;
+		private int maxWaitTime = 30 * 20;
+		private int minWaitTime = 5 * 20;
+		private float minApproachAngle = 0;
+		private float maxApproachAngle = 360;
+		private boolean lure = false;
+
+		public FishHookMock(Entity hooked) {
+			hook = EasyMock.niceMock(FishHook.class);
+
+			EasyMock.expect(hook.isInOpenWater()).andReturn(false).anyTimes();
+
+			EasyMock.expect(hook.getHookedEntity()).andAnswer(() -> hooked).anyTimes();
+			EasyMock.expect(hook.getMaxWaitTime()).andAnswer(() -> maxWaitTime).anyTimes();
+			EasyMock.expect(hook.getMinWaitTime()).andAnswer(() -> minWaitTime).anyTimes();
+			EasyMock.expect(hook.getMinLureAngle()).andAnswer(() -> minApproachAngle).anyTimes();
+			EasyMock.expect(hook.getMaxLureAngle()).andAnswer(() -> maxApproachAngle).anyTimes();
+			EasyMock.expect(hook.getApplyLure()).andAnswer(() -> lure).anyTimes();
+
+			hook.setMaxWaitTime(EasyMock.anyInt());
+			EasyMock.expectLastCall().andAnswer(() -> {
+				maxWaitTime = (int) EasyMock.getCurrentArguments()[0];
+				return null;
+			}).anyTimes();
+
+			hook.setMinWaitTime(EasyMock.anyInt());
+			EasyMock.expectLastCall().andAnswer(() -> {
+				minWaitTime = (int) EasyMock.getCurrentArguments()[0];
+				return null;
+			}).anyTimes();
+
+			hook.setMinLureAngle(EasyMock.anyFloat());
+			EasyMock.expectLastCall().andAnswer(() -> {
+				minApproachAngle = (float) EasyMock.getCurrentArguments()[0];
+				return null;
+			}).anyTimes();
+
+			hook.setMaxLureAngle(EasyMock.anyFloat());
+			EasyMock.expectLastCall().andAnswer(() -> {
+				maxApproachAngle = (float) EasyMock.getCurrentArguments()[0];
+				return null;
+			}).anyTimes();
+
+			hook.setApplyLure(EasyMock.anyBoolean());
+			EasyMock.expectLastCall().andAnswer(() -> {
+				lure = (boolean) EasyMock.getCurrentArguments()[0];
+				return null;
+			}).anyTimes();
+
+			EasyMock.replay(hook);
+		}
+
+		public FishHook getHook() {
+			return hook;
+		}
+
+	}
+
+}
diff --git a/src/test/java/org/skriptlang/skript/test/tests/syntaxes/events/EvtFurnaceTest.java b/src/test/java/org/skriptlang/skript/test/tests/syntaxes/events/EvtFurnaceTest.java
new file mode 100644
index 00000000000..45e0c678ad2
--- /dev/null
+++ b/src/test/java/org/skriptlang/skript/test/tests/syntaxes/events/EvtFurnaceTest.java
@@ -0,0 +1,59 @@
+package org.skriptlang.skript.test.tests.syntaxes.events;
+
+import ch.njol.skript.test.runner.SkriptJUnitTest;
+import org.bukkit.Bukkit;
+import org.bukkit.Material;
+import org.bukkit.NamespacedKey;
+import org.bukkit.block.Block;
+import org.bukkit.entity.Player;
+import org.bukkit.event.inventory.FurnaceBurnEvent;
+import org.bukkit.event.inventory.FurnaceExtractEvent;
+import org.bukkit.event.inventory.FurnaceSmeltEvent;
+import org.bukkit.event.inventory.FurnaceStartSmeltEvent;
+import org.bukkit.inventory.CookingRecipe;
+import org.bukkit.inventory.FurnaceRecipe;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.Recipe;
+import org.easymock.EasyMock;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+public class EvtFurnaceTest extends SkriptJUnitTest {
+
+	private Block furnace;
+	private CookingRecipe<FurnaceRecipe> recipe;
+	private Player easyMockPlayer;
+
+	@Before
+	public void setUp() {
+		furnace = setBlock(Material.FURNACE);
+		furnace.setType(Material.FURNACE);
+		for (Recipe goldIngotRecipe : Bukkit.getRecipesFor(new ItemStack(Material.GOLD_INGOT))) {
+			if (goldIngotRecipe instanceof FurnaceRecipe furnaceRecipe) {
+				recipe = furnaceRecipe;
+				break;
+			}
+		}
+		easyMockPlayer = EasyMock.niceMock(Player.class);
+	}
+
+	@Test
+	public void callEvents() {
+		FurnaceBurnEvent burnEvent = new FurnaceBurnEvent(furnace, new ItemStack(Material.LAVA_BUCKET), 10);
+		FurnaceSmeltEvent smeltEvent = new FurnaceSmeltEvent(furnace, new ItemStack(Material.RAW_IRON), new ItemStack(Material.IRON_INGOT));
+		FurnaceStartSmeltEvent startEvent = new FurnaceStartSmeltEvent(furnace, new ItemStack(Material.RAW_GOLD), recipe);
+		FurnaceExtractEvent extractEvent = new FurnaceExtractEvent(easyMockPlayer, furnace, Material.COPPER_INGOT, 10, 20);
+
+		Bukkit.getPluginManager().callEvent(burnEvent);
+		Bukkit.getPluginManager().callEvent(smeltEvent);
+		Bukkit.getPluginManager().callEvent(startEvent);
+		Bukkit.getPluginManager().callEvent(extractEvent);
+	}
+
+	@After
+	public void cleanUp() {
+		furnace.setType(Material.AIR);
+	}
+
+}
diff --git a/src/test/java/org/skriptlang/skript/test/tests/syntaxes/events/EvtGrowTest.java b/src/test/java/org/skriptlang/skript/test/tests/syntaxes/events/EvtGrowTest.java
index 44cb566c33f..c6298498ff4 100644
--- a/src/test/java/org/skriptlang/skript/test/tests/syntaxes/events/EvtGrowTest.java
+++ b/src/test/java/org/skriptlang/skript/test/tests/syntaxes/events/EvtGrowTest.java
@@ -1,24 +1,5 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package org.skriptlang.skript.test.tests.syntaxes.events;
 
-import ch.njol.skript.Skript;
 import ch.njol.skript.test.runner.SkriptJUnitTest;
 import org.bukkit.Material;
 import org.bukkit.block.Block;
@@ -31,7 +12,6 @@
 public class EvtGrowTest extends SkriptJUnitTest {
 
 	private Block plant, birch;
-	private static final boolean canRun = Skript.methodExists(Block.class, "applyBoneMeal", BlockFace.class);
 
 	static {
 		setShutdownDelay(1);
@@ -39,8 +19,9 @@ public class EvtGrowTest extends SkriptJUnitTest {
 
 	@Before
 	public void setBlocks() {
-		plant = setBlock(Material.WHEAT);
-		plant.getRelative(0,-1,0).setType(Material.FARMLAND);
+		Block farmland = setBlock(Material.FARMLAND);
+		farmland.getRelative(0, 1, 0).setType(Material.WHEAT);
+		plant = farmland.getRelative(0, 1, 0);
 		birch = plant.getRelative(10,0,0);
 		birch.getRelative(0,-1,0).setType(Material.DIRT);
 		birch.setType(Material.BIRCH_SAPLING);
@@ -48,20 +29,18 @@ public void setBlocks() {
 
 	@Test
 	public void testGrow() {
-		if (canRun) {
-			int maxIterations = 100;
-			int iterations = 0;
-			while (((Ageable) plant.getBlockData()).getAge() != ((Ageable) plant.getBlockData()).getMaximumAge()) {
-				plant.applyBoneMeal(BlockFace.UP);
-				if (iterations++ > maxIterations)
-					return;
-			}
-			iterations = 0;
-			while (birch.getType() == Material.BIRCH_SAPLING) {
-				birch.applyBoneMeal(BlockFace.UP);
-				if (iterations++ > maxIterations)
-					return;
-			}
+		int maxIterations = 100;
+		int iterations = 0;
+		while (plant.getBlockData() instanceof Ageable ageable && ageable.getAge() != ageable.getMaximumAge()) {
+			plant.applyBoneMeal(BlockFace.UP);
+			if (iterations++ > maxIterations)
+				break;
+		}
+		iterations = 0;
+		while (birch.getType() == Material.BIRCH_SAPLING) {
+			birch.applyBoneMeal(BlockFace.UP);
+			if (iterations++ > maxIterations)
+				break;
 		}
 	}
 
diff --git a/src/test/java/org/skriptlang/skript/test/tests/syntaxes/events/EvtPiglinBarterTest.java b/src/test/java/org/skriptlang/skript/test/tests/syntaxes/events/EvtPiglinBarterTest.java
new file mode 100644
index 00000000000..9752d3f06a4
--- /dev/null
+++ b/src/test/java/org/skriptlang/skript/test/tests/syntaxes/events/EvtPiglinBarterTest.java
@@ -0,0 +1,58 @@
+package org.skriptlang.skript.test.tests.syntaxes.events;
+
+import ch.njol.skript.Skript;
+import ch.njol.skript.test.runner.SkriptJUnitTest;
+import org.bukkit.Bukkit;
+import org.bukkit.Material;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.EntityType;
+import org.bukkit.inventory.ItemStack;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class EvtPiglinBarterTest extends SkriptJUnitTest {
+
+	private Entity piglin;
+	private static final boolean canRun = Skript.classExists("org.bukkit.event.entity.PiglinBarterEvent");
+
+	static {
+		setShutdownDelay(1);
+	}
+
+	@Before
+	public void spawn() {
+		if (!canRun)
+			return;
+
+		piglin = getTestWorld().spawnEntity(getTestLocation(), EntityType.PIGLIN);
+	}
+
+	@Test
+	public void testCall() {
+		if (!canRun)
+			return;
+
+		ItemStack input = new ItemStack(Material.GOLD_INGOT);
+		List<ItemStack> outcome = new ArrayList<>();
+		outcome.add(new ItemStack(Material.EMERALD));
+
+		try {
+			Bukkit.getPluginManager().callEvent(
+				new org.bukkit.event.entity.PiglinBarterEvent(
+					(org.bukkit.entity.Piglin) piglin, input, outcome));
+		} catch (NoClassDefFoundError ignored) { }
+	}
+
+	@After
+	public void remove() {
+		if (!canRun)
+			return;
+
+		piglin.remove();
+	}
+
+}
diff --git a/src/test/java/org/skriptlang/skript/test/tests/syntaxes/events/EvtPlayerInputTest.java b/src/test/java/org/skriptlang/skript/test/tests/syntaxes/events/EvtPlayerInputTest.java
new file mode 100644
index 00000000000..782b29f8ae0
--- /dev/null
+++ b/src/test/java/org/skriptlang/skript/test/tests/syntaxes/events/EvtPlayerInputTest.java
@@ -0,0 +1,40 @@
+package org.skriptlang.skript.test.tests.syntaxes.events;
+
+import ch.njol.skript.Skript;
+import ch.njol.skript.test.runner.SkriptJUnitTest;
+import org.bukkit.Bukkit;
+import org.bukkit.entity.Player;
+import org.easymock.EasyMock;
+import org.junit.Before;
+import org.junit.Test;
+import org.skriptlang.skript.bukkit.input.InputKey;
+import org.skriptlang.skript.test.utils.InputHelper;
+
+public class EvtPlayerInputTest extends SkriptJUnitTest {
+
+	private static final boolean SUPPORTS_INPUT_EVENT = Skript.classExists("org.bukkit.event.player.PlayerInputEvent");
+
+	static {
+		setShutdownDelay(1);
+	}
+
+	private Player player;
+
+	@Before
+	public void setup() {
+		if (!SUPPORTS_INPUT_EVENT)
+			return;
+		player = EasyMock.niceMock(Player.class);
+	}
+
+	@Test
+	public void test() {
+		if (!SUPPORTS_INPUT_EVENT)
+			return;
+		EasyMock.expect(player.getCurrentInput()).andStubReturn(InputHelper.fromKeys(InputKey.FORWARD));
+		EasyMock.replay(player);
+		Bukkit.getPluginManager().callEvent(InputHelper.createPlayerInputEvent(player, InputKey.FORWARD, InputKey.JUMP));
+		EasyMock.verify(player);
+	}
+
+}
diff --git a/src/test/java/org/skriptlang/skript/test/tests/syntaxes/events/EvtVehicleCollisionTest.java b/src/test/java/org/skriptlang/skript/test/tests/syntaxes/events/EvtVehicleCollisionTest.java
new file mode 100644
index 00000000000..bc9c132b4e3
--- /dev/null
+++ b/src/test/java/org/skriptlang/skript/test/tests/syntaxes/events/EvtVehicleCollisionTest.java
@@ -0,0 +1,43 @@
+package org.skriptlang.skript.test.tests.syntaxes.events;
+
+import ch.njol.skript.test.runner.SkriptJUnitTest;
+import org.bukkit.Bukkit;
+import org.bukkit.Material;
+import org.bukkit.entity.EntityType;
+import org.bukkit.entity.Pig;
+import org.bukkit.entity.Sheep;
+import org.bukkit.event.vehicle.VehicleBlockCollisionEvent;
+import org.bukkit.event.vehicle.VehicleEntityCollisionEvent;
+import org.bukkit.util.Vector;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+public class EvtVehicleCollisionTest extends SkriptJUnitTest {
+
+	private Pig pig;
+	private Sheep sheep;
+	private Material old;
+
+	@Before
+	public void setUp() {
+		pig = spawnTestPig();
+		sheep = (Sheep) getTestWorld().spawnEntity(getTestLocation(), EntityType.SHEEP);
+		old = getBlock().getType();
+		setBlock(Material.OBSIDIAN);
+	}
+
+	@Test
+	public void test() {
+		Bukkit.getPluginManager().callEvent(new VehicleBlockCollisionEvent(pig, getBlock(), new Vector()));
+		Bukkit.getPluginManager().callEvent(new VehicleEntityCollisionEvent(pig, sheep));
+	}
+
+	@After
+	public void cleanUp() {
+		pig.remove();
+		sheep.remove();
+		setBlock(old);
+	}
+
+}
diff --git a/src/test/java/org/skriptlang/skript/test/tests/syntaxes/events/PlayerElytraBoostEventTest.java b/src/test/java/org/skriptlang/skript/test/tests/syntaxes/events/PlayerElytraBoostEventTest.java
new file mode 100644
index 00000000000..75855937cc6
--- /dev/null
+++ b/src/test/java/org/skriptlang/skript/test/tests/syntaxes/events/PlayerElytraBoostEventTest.java
@@ -0,0 +1,72 @@
+package org.skriptlang.skript.test.tests.syntaxes.events;
+
+import ch.njol.skript.test.runner.SkriptJUnitTest;
+import com.destroystokyo.paper.event.player.PlayerElytraBoostEvent;
+import org.bukkit.Bukkit;
+import org.bukkit.Material;
+import org.bukkit.entity.EntityType;
+import org.bukkit.entity.Firework;
+import org.bukkit.entity.Player;
+import org.bukkit.event.Event;
+import org.bukkit.inventory.EquipmentSlot;
+import org.bukkit.inventory.ItemStack;
+import org.easymock.EasyMock;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.lang.reflect.Constructor;
+
+public class PlayerElytraBoostEventTest extends SkriptJUnitTest {
+
+	private Player player;
+	private Firework firework;
+
+	@Before
+	public void setUp() {
+		player = EasyMock.niceMock(Player.class);
+		EntityType entityType = EntityType.valueOf("FIREWORK");
+		if (entityType == null) {
+			entityType = EntityType.valueOf("FIREWORK_ROCKET");
+		}
+		assert entityType != null;
+		firework = (Firework) getTestWorld().spawnEntity(getTestLocation(), entityType);
+		firework.setTicksToDetonate(9999999);
+	}
+
+	@Test
+	public void test() {
+		Constructor<?> constructor = null;
+		boolean newerConstructor = false;
+		try {
+			constructor = PlayerElytraBoostEvent.class.getConstructor(Player.class, ItemStack.class, Firework.class, EquipmentSlot.class);
+			newerConstructor = true;
+		} catch (Exception ignored) {
+			try {
+				constructor = PlayerElytraBoostEvent.class.getConstructor(Player.class, ItemStack.class, Firework.class);
+			} catch (NoSuchMethodException e) {
+				throw new IllegalStateException("No valid constructor for 'PlayerElytraBoostEvent'");
+			}
+		}
+
+		try {
+			Event event;
+			if (newerConstructor) {
+				event = (Event) constructor.newInstance(player, new ItemStack(Material.FIREWORK_ROCKET), firework, EquipmentSlot.HAND);
+			} else {
+				event = (Event) constructor.newInstance(player, new ItemStack(Material.FIREWORK_ROCKET), firework);
+			}
+
+			Bukkit.getPluginManager().callEvent(event);
+		} catch (Exception e) {
+			throw new RuntimeException("Unable to construct event.");
+		}
+	}
+
+	@After
+	public void cleanUp() {
+		if (firework != null)
+			firework.remove();
+	}
+
+}
diff --git a/src/test/java/org/skriptlang/skript/test/tests/syntaxes/expressions/ExprAffectedEntitiesTest.java b/src/test/java/org/skriptlang/skript/test/tests/syntaxes/expressions/ExprAffectedEntitiesTest.java
new file mode 100644
index 00000000000..ab7c1f073f9
--- /dev/null
+++ b/src/test/java/org/skriptlang/skript/test/tests/syntaxes/expressions/ExprAffectedEntitiesTest.java
@@ -0,0 +1,44 @@
+package org.skriptlang.skript.test.tests.syntaxes.expressions;
+
+import ch.njol.skript.test.runner.SkriptJUnitTest;
+import org.bukkit.Bukkit;
+import org.bukkit.entity.AreaEffectCloud;
+import org.bukkit.entity.EntityType;
+import org.bukkit.entity.LivingEntity;
+import org.bukkit.entity.Pig;
+import org.bukkit.event.entity.AreaEffectCloudApplyEvent;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class ExprAffectedEntitiesTest extends SkriptJUnitTest {
+
+	private AreaEffectCloud cloud;
+	private Pig piggy;
+	private final List<LivingEntity> entityList = new ArrayList<>();
+
+	@Before
+	public void setUp() {
+		piggy = spawnTestPig();
+		entityList.add(piggy);
+		cloud = (AreaEffectCloud) getTestWorld().spawnEntity(getTestLocation(), EntityType.AREA_EFFECT_CLOUD);
+	}
+
+	@Test
+	public void callEvent() {
+		AreaEffectCloudApplyEvent event = new AreaEffectCloudApplyEvent(cloud, entityList);
+		Bukkit.getPluginManager().callEvent(event);
+	}
+
+	@After
+	public void cleanUp() {
+		if (piggy != null)
+			piggy.remove();
+		if (cloud != null)
+			cloud.remove();
+	}
+
+}
diff --git a/src/test/java/org/skriptlang/skript/test/tests/syntaxes/expressions/ExprCurrentInputKeysTest.java b/src/test/java/org/skriptlang/skript/test/tests/syntaxes/expressions/ExprCurrentInputKeysTest.java
new file mode 100644
index 00000000000..06f57ca0ee3
--- /dev/null
+++ b/src/test/java/org/skriptlang/skript/test/tests/syntaxes/expressions/ExprCurrentInputKeysTest.java
@@ -0,0 +1,54 @@
+package org.skriptlang.skript.test.tests.syntaxes.expressions;
+
+import ch.njol.skript.Skript;
+import ch.njol.skript.lang.Expression;
+import ch.njol.skript.lang.SkriptParser;
+import ch.njol.skript.lang.util.ContextlessEvent;
+import ch.njol.skript.test.runner.SkriptJUnitTest;
+import ch.njol.skript.variables.Variables;
+import org.bukkit.entity.Player;
+import org.easymock.EasyMock;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.skriptlang.skript.bukkit.input.InputKey;
+import org.skriptlang.skript.test.utils.InputHelper;
+
+public class ExprCurrentInputKeysTest extends SkriptJUnitTest {
+
+	private static final boolean SUPPORTS_INPUT = Skript.classExists("org.bukkit.Input");
+
+	static {
+		setShutdownDelay(1);
+	}
+
+	private Player player;
+	private Expression<? extends InputKey> inputKeyExpression;
+
+	@Before
+	public void setup() {
+		if (!SUPPORTS_INPUT)
+			return;
+		player = EasyMock.niceMock(Player.class);
+		//noinspection unchecked
+		inputKeyExpression = new SkriptParser("input keys of {_player}").parseExpression(InputKey.class);
+	}
+
+	@Test
+	public void test() {
+		if (!SUPPORTS_INPUT)
+			return;
+		if (inputKeyExpression == null)
+			Assert.fail("Input keys expression is null");
+
+		ContextlessEvent event = ContextlessEvent.get();
+		Variables.setVariable("player", player, event, true);
+
+		EasyMock.expect(player.getCurrentInput()).andReturn(InputHelper.fromKeys(InputKey.FORWARD, InputKey.JUMP));
+		EasyMock.replay(player);
+		InputKey[] keys = inputKeyExpression.getArray(event);
+		Assert.assertArrayEquals(keys, new InputKey[]{InputKey.FORWARD, InputKey.JUMP});
+		EasyMock.verify(player);
+	}
+
+}
diff --git a/src/test/java/org/skriptlang/skript/test/tests/syntaxes/expressions/ExprDropsTest.java b/src/test/java/org/skriptlang/skript/test/tests/syntaxes/expressions/ExprDropsTest.java
index f9f9c372176..5a28dae81d6 100644
--- a/src/test/java/org/skriptlang/skript/test/tests/syntaxes/expressions/ExprDropsTest.java
+++ b/src/test/java/org/skriptlang/skript/test/tests/syntaxes/expressions/ExprDropsTest.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package org.skriptlang.skript.test.tests.syntaxes.expressions;
 
 import ch.njol.skript.test.runner.SkriptJUnitTest;
diff --git a/src/test/java/org/skriptlang/skript/test/tests/syntaxes/expressions/ExprHoverListTest.java b/src/test/java/org/skriptlang/skript/test/tests/syntaxes/expressions/ExprHoverListTest.java
new file mode 100644
index 00000000000..219bec8ebae
--- /dev/null
+++ b/src/test/java/org/skriptlang/skript/test/tests/syntaxes/expressions/ExprHoverListTest.java
@@ -0,0 +1,31 @@
+package org.skriptlang.skript.test.tests.syntaxes.expressions;
+
+import ch.njol.skript.test.runner.SkriptAsyncJUnitTest;
+import com.destroystokyo.paper.network.StatusClient;
+import net.kyori.adventure.text.Component;
+import org.bukkit.Bukkit;
+import org.easymock.EasyMock;
+import org.junit.Test;
+
+import java.net.InetSocketAddress;
+
+public class ExprHoverListTest extends SkriptAsyncJUnitTest {
+
+	static {
+		setShutdownDelay(1);
+	}
+
+	@Test
+	public void test() {
+		StatusClient client = EasyMock.niceMock(StatusClient.class);
+		InetSocketAddress address = new InetSocketAddress("localhost", 1103);
+
+		EasyMock.expect(client.getAddress()).andReturn(address);
+		EasyMock.replay(client);
+
+		Bukkit.getPluginManager().callEvent(
+			new com.destroystokyo.paper.event.server.PaperServerListPingEvent(
+				client, Component.empty(), 3, 20, "", 766, null));
+	}
+
+}
diff --git a/src/test/java/org/skriptlang/skript/test/tests/syntaxes/expressions/ExprLastDeathLocationTest.java b/src/test/java/org/skriptlang/skript/test/tests/syntaxes/expressions/ExprLastDeathLocationTest.java
new file mode 100644
index 00000000000..40706ac0591
--- /dev/null
+++ b/src/test/java/org/skriptlang/skript/test/tests/syntaxes/expressions/ExprLastDeathLocationTest.java
@@ -0,0 +1,75 @@
+package org.skriptlang.skript.test.tests.syntaxes.expressions;
+
+import ch.njol.skript.lang.Effect;
+import ch.njol.skript.lang.TriggerItem;
+import ch.njol.skript.lang.util.ContextlessEvent;
+import ch.njol.skript.test.runner.SkriptJUnitTest;
+import ch.njol.skript.variables.Variables;
+import org.bukkit.Bukkit;
+import org.bukkit.Location;
+import org.bukkit.entity.Player;
+import org.easymock.EasyMock;
+import org.easymock.IArgumentMatcher;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+public class ExprLastDeathLocationTest extends SkriptJUnitTest {
+
+	private Player player;
+	private Effect get, set;
+
+	@Before
+	public void setup() {
+		player = EasyMock.niceMock(Player.class);
+		set = Effect.parse("set last death location of {_player} to {_location}", null);
+		get = Effect.parse("set {_loc} to last death location of {_player}", null);
+	}
+
+	@Test
+	public void test() {
+		if (get == null)
+			Assert.fail("Get statement was null");
+		if (set == null)
+			Assert.fail("Set statement was null");
+
+		Location location = new Location(Bukkit.getWorld("world"), 0, 0, 0);
+
+		ContextlessEvent event = ContextlessEvent.get();
+		Variables.setVariable("player", player, event, true);
+		Variables.setVariable("location", location, event, true);
+
+		player.setLastDeathLocation(locationMatcher(location));
+		EasyMock.expectLastCall();
+		EasyMock.replay(player);
+		TriggerItem.walk(set, event);
+		EasyMock.verify(player);
+
+		EasyMock.resetToNice(player);
+
+		EasyMock.expect(player.getLastDeathLocation()).andReturn(location);
+		EasyMock.replay(player);
+		TriggerItem.walk(get, event);
+		EasyMock.verify(player);
+	}
+
+	private <T> T locationMatcher(Location expectedLoc) {
+		EasyMock.reportMatcher(new IArgumentMatcher() {
+			@Override
+			public boolean matches(Object argument) {
+				if (argument instanceof Location location) {
+					return location.equals(expectedLoc);
+				}
+				return false;
+			}
+
+			@Override
+			public void appendTo(StringBuffer buffer) {
+				buffer.append("[location matcher]");
+			}
+		});
+
+		return null;
+	}
+
+}
diff --git a/src/test/java/org/skriptlang/skript/test/tests/syntaxes/expressions/ExprLootContextLooterTest.java b/src/test/java/org/skriptlang/skript/test/tests/syntaxes/expressions/ExprLootContextLooterTest.java
new file mode 100644
index 00000000000..431e307d3b8
--- /dev/null
+++ b/src/test/java/org/skriptlang/skript/test/tests/syntaxes/expressions/ExprLootContextLooterTest.java
@@ -0,0 +1,27 @@
+package org.skriptlang.skript.test.tests.syntaxes.expressions;
+
+import ch.njol.skript.test.runner.SkriptJUnitTest;
+import org.bukkit.Bukkit;
+import org.bukkit.Location;
+import org.bukkit.entity.Player;
+import org.bukkit.event.player.PlayerJoinEvent;
+import org.easymock.EasyMock;
+import org.junit.Test;
+
+public class ExprLootContextLooterTest extends SkriptJUnitTest {
+
+	static {
+		setShutdownDelay(1);
+	}
+
+	@Test
+	public void test() {
+		Player player = EasyMock.niceMock(Player.class);
+		Location location = new Location(Bukkit.getWorld("world"), 0, 0, 0);
+
+		EasyMock.expect(player.getLocation()).andReturn(location);
+		EasyMock.replay(player);
+
+		Bukkit.getPluginManager().callEvent(new PlayerJoinEvent(player, "ok"));
+	}
+}
diff --git a/src/test/java/org/skriptlang/skript/test/tests/syntaxes/expressions/ExprMessageTest.java b/src/test/java/org/skriptlang/skript/test/tests/syntaxes/expressions/ExprMessageTest.java
index 1b0cbefa703..7c63f63b836 100644
--- a/src/test/java/org/skriptlang/skript/test/tests/syntaxes/expressions/ExprMessageTest.java
+++ b/src/test/java/org/skriptlang/skript/test/tests/syntaxes/expressions/ExprMessageTest.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package org.skriptlang.skript.test.tests.syntaxes.expressions;
 
 import ch.njol.skript.test.runner.SkriptJUnitTest;
diff --git a/src/test/java/org/skriptlang/skript/test/tests/utils/ClassInfoReferenceTest.java b/src/test/java/org/skriptlang/skript/test/tests/utils/ClassInfoReferenceTest.java
index a9540240e23..c2cc77192c0 100644
--- a/src/test/java/org/skriptlang/skript/test/tests/utils/ClassInfoReferenceTest.java
+++ b/src/test/java/org/skriptlang/skript/test/tests/utils/ClassInfoReferenceTest.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package org.skriptlang.skript.test.tests.utils;
 
 import ch.njol.skript.classes.ClassInfo;
diff --git a/src/test/java/org/skriptlang/skript/test/tests/utils/DateTest.java b/src/test/java/org/skriptlang/skript/test/tests/utils/DateTest.java
new file mode 100644
index 00000000000..2f8f8f1d8b7
--- /dev/null
+++ b/src/test/java/org/skriptlang/skript/test/tests/utils/DateTest.java
@@ -0,0 +1,29 @@
+package org.skriptlang.skript.test.tests.utils;
+
+import ch.njol.skript.util.Date;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+
+public class DateTest {
+
+	@Test
+	public void testNow() {
+		assertEquals(System.currentTimeMillis(), Date.now().getTime());
+	}
+
+	@Test
+	public void testFromJavaDate() {
+		java.util.Date javaDate = new java.util.Date();
+		Date date = Date.fromJavaDate(javaDate);
+		assertEquals(javaDate.getTime(), date.getTime());
+	}
+
+	@Test
+	public void testEquals() {
+		Date date1 = new Date(1000);
+		java.util.Date date2 = new java.util.Date(1000);
+		assertEquals(date1, date2);
+	}
+
+}
diff --git a/src/test/java/org/skriptlang/skript/test/tests/utils/UtilsTest.java b/src/test/java/org/skriptlang/skript/test/tests/utils/UtilsTest.java
index 592ea5c9fa8..1637f67f875 100644
--- a/src/test/java/org/skriptlang/skript/test/tests/utils/UtilsTest.java
+++ b/src/test/java/org/skriptlang/skript/test/tests/utils/UtilsTest.java
@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package org.skriptlang.skript.test.tests.utils;
 
 import static org.junit.Assert.assertEquals;
diff --git a/src/test/java/org/skriptlang/skript/test/utils/InputHelper.java b/src/test/java/org/skriptlang/skript/test/utils/InputHelper.java
new file mode 100644
index 00000000000..b3ba4112a1b
--- /dev/null
+++ b/src/test/java/org/skriptlang/skript/test/utils/InputHelper.java
@@ -0,0 +1,33 @@
+package org.skriptlang.skript.test.utils;
+
+import org.bukkit.Input;
+import org.bukkit.entity.Player;
+import org.bukkit.event.player.PlayerEvent;
+import org.bukkit.event.player.PlayerInputEvent;
+import org.easymock.EasyMock;
+import org.skriptlang.skript.bukkit.input.InputKey;
+
+public class InputHelper {
+
+	public static PlayerEvent createPlayerInputEvent(Player player, InputKey... keys) {
+		return new PlayerInputEvent(player, fromKeys(keys));
+	}
+
+	public static Input fromKeys(InputKey... keys) {
+		Input input = EasyMock.niceMock(Input.class);
+		for (InputKey key : keys) {
+			switch (key) {
+				case FORWARD -> EasyMock.expect(input.isForward()).andStubReturn(true);
+				case BACKWARD -> EasyMock.expect(input.isBackward()).andStubReturn(true);
+				case RIGHT -> EasyMock.expect(input.isRight()).andStubReturn(true);
+				case LEFT -> EasyMock.expect(input.isLeft()).andStubReturn(true);
+				case JUMP -> EasyMock.expect(input.isJump()).andStubReturn(true);
+				case SNEAK -> EasyMock.expect(input.isSneak()).andStubReturn(true);
+				case SPRINT -> EasyMock.expect(input.isSprint()).andStubReturn(true);
+			}
+		}
+		EasyMock.replay(input);
+		return input;
+	}
+
+}
diff --git a/src/test/java/org/skriptlang/skript/util/ClassLoaderTest.java b/src/test/java/org/skriptlang/skript/util/ClassLoaderTest.java
new file mode 100644
index 00000000000..145035b8ab4
--- /dev/null
+++ b/src/test/java/org/skriptlang/skript/util/ClassLoaderTest.java
@@ -0,0 +1,80 @@
+package org.skriptlang.skript.util;
+
+import org.junit.Test;
+
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import static org.junit.Assert.*;
+
+public class ClassLoaderTest {
+
+	private static void load(ClassLoader loader) {
+		loader.loadClasses(ClassLoaderTest.class);
+	}
+
+	@Test
+	public void testBasePackage() {
+		Set<Class<?>> classes = new HashSet<>();
+		load(ClassLoader.builder()
+				.basePackage("org.skriptlang.skript.util")
+				.forEachClass(classes::add)
+				.build());
+		assertTrue(classes.contains(ClassLoader.class));
+		assertTrue(classes.contains(ClassLoaderTest.class));
+	}
+
+	@Test
+	public void testSubPackages() {
+		Set<Class<?>> classes = new HashSet<>();
+		ClassLoader.Builder builder = ClassLoader.builder()
+				.basePackage("org.skriptlang.skript")
+				.addSubPackages("fake1")
+				.addSubPackages(List.of("fake2"))
+				.forEachClass(classes::add);
+
+		// test without this subpackage
+		load(builder.build());
+		assertFalse(classes.contains(ClassLoader.class));
+		assertFalse(classes.contains(ClassLoaderTest.class));
+
+		// test with this subpackage
+		classes.clear();
+		load(builder.addSubPackage("util").build());
+		assertTrue(classes.contains(ClassLoader.class));
+		assertTrue(classes.contains(ClassLoaderTest.class));
+	}
+
+	@Test
+	public void testFilter() {
+		Set<Class<?>> classes = new HashSet<>();
+		load(ClassLoader.builder()
+				.basePackage("org.skriptlang.skript.util")
+				.filter(fqn -> !fqn.endsWith("Test")) // filter out class names ending with "Test"
+				.forEachClass(classes::add)
+				.build());
+		assertTrue(classes.contains(ClassLoader.class));
+		assertFalse(classes.contains(ClassLoaderTest.class));
+	}
+
+	@Test
+	public void testDeep() {
+		Set<Class<?>> classes = new HashSet<>();
+		ClassLoader.Builder builder = ClassLoader.builder()
+				.basePackage("org.skriptlang.skript")
+				.forEachClass(classes::add);
+
+		// test without deep
+		load(builder.deep(false).build());
+		assertFalse(classes.contains(ClassLoader.class));
+		assertFalse(classes.contains(ClassLoaderTest.class));
+
+		// test with deep
+		classes.clear();
+		load(builder.deep(true).build());
+		assertTrue(classes.contains(ClassLoader.class));
+		assertTrue(classes.contains(ClassLoaderTest.class));
+	}
+
+}
diff --git a/src/test/java/org/skriptlang/skript/util/ClassUtilsTest.java b/src/test/java/org/skriptlang/skript/util/ClassUtilsTest.java
new file mode 100644
index 00000000000..61cb91a7ec0
--- /dev/null
+++ b/src/test/java/org/skriptlang/skript/util/ClassUtilsTest.java
@@ -0,0 +1,22 @@
+package org.skriptlang.skript.util;
+
+import org.junit.Test;
+
+import java.util.AbstractCollection;
+import java.util.Collection;
+
+import static org.junit.Assert.*;
+
+public class ClassUtilsTest {
+
+	@Test
+	public void testIsNormalClass() {
+		assertTrue(ClassUtils.isNormalClass(String.class));
+		assertFalse(ClassUtils.isNormalClass(Test.class));
+		assertFalse(ClassUtils.isNormalClass(String[].class));
+		assertFalse(ClassUtils.isNormalClass(int.class));
+		assertFalse(ClassUtils.isNormalClass(Collection.class));
+		assertFalse(ClassUtils.isNormalClass(AbstractCollection.class));
+	}
+
+}
diff --git a/src/test/java/org/skriptlang/skript/util/PriorityTest.java b/src/test/java/org/skriptlang/skript/util/PriorityTest.java
new file mode 100644
index 00000000000..91ff270458d
--- /dev/null
+++ b/src/test/java/org/skriptlang/skript/util/PriorityTest.java
@@ -0,0 +1,79 @@
+package org.skriptlang.skript.util;
+
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+public class PriorityTest {
+
+	@Test
+	public void testBase() {
+		Priority base = Priority.base();
+
+		assertTrue(base.before().isEmpty());
+		assertTrue(base.after().isEmpty());
+
+		// Different instances, but functionally equal
+		assertEquals(base, Priority.base());
+	}
+
+	@Test
+	public void testBefore() {
+		Priority base = Priority.base();
+		Priority before = Priority.before(base);
+
+		assertTrue(before.before().contains(base));
+		assertTrue(before.after().isEmpty());
+		assertTrue(before.compareTo(base) < 0);
+		assertTrue(base.compareTo(before) > 0);
+
+		// Different instances, but functionally equal
+		assertEquals(before, Priority.before(base));
+	}
+
+	@Test
+	public void testAfter() {
+		Priority base = Priority.base();
+		Priority after = Priority.after(base);
+
+		assertTrue(after.before().isEmpty());
+		assertTrue(after.after().contains(base));
+		assertTrue(after.compareTo(base) > 0);
+		assertTrue(base.compareTo(after) < 0);
+
+		// Different instances, but functionally equal
+		assertEquals(after, Priority.after(base));
+	}
+
+	@Test
+	public void testBoth() {
+		Priority base = Priority.base();
+		Priority before = Priority.before(base);
+		Priority after = Priority.after(base);
+
+		// 'before' should be before 'after'
+		assertTrue(before.compareTo(after) < 0);
+		// 'after' should be after 'before'
+		assertTrue(after.compareTo(before) > 0);
+	}
+
+	@Test
+	public void testComplex() {
+		Priority base = Priority.base();
+
+		Priority before = Priority.before(base);
+		Priority afterBefore = Priority.after(before);
+		// 'afterBefore' should be before 'base'
+		assertTrue(afterBefore.compareTo(base) < 0);
+		// 'base' should be after 'afterBefore'
+		assertTrue(base.compareTo(afterBefore) > 0);
+
+		Priority after = Priority.after(base);
+		Priority beforeAfter = Priority.before(after);
+		// 'beforeAfter' should be after 'base'
+		assertTrue(beforeAfter.compareTo(base) > 0);
+		// 'base' should be before 'beforeAfter'
+		assertTrue(base.compareTo(beforeAfter) < 0);
+	}
+
+}
diff --git a/src/test/resources/invalid-config.sk b/src/test/resources/invalid-config.sk
new file mode 100644
index 00000000000..6faf34dd4c5
--- /dev/null
+++ b/src/test/resources/invalid-config.sk
@@ -0,0 +1,20 @@
+# Comment a
+a:
+	b: # Comment b
+		c: true # Comment c
+	d: false # <<< Invalid
+		e: true
+	f: true
+	# Comment f
+	# Comment f'
+
+	g: true
+
+	# Comment g
+
+# Comment a'
+h: false
+i: true # Comment i
+
+x.z:
+	y: true
diff --git a/src/test/resources/new-config.sk b/src/test/resources/new-config.sk
new file mode 100644
index 00000000000..f6f12aa33d3
--- /dev/null
+++ b/src/test/resources/new-config.sk
@@ -0,0 +1,29 @@
+# Comment a
+a:
+	b: # Comment b
+		c: true # Comment c
+		d: false
+		e: true
+	f: true
+	# Comment f
+	# Comment f'
+
+	g: true
+
+	# Comment g
+
+# Comment a
+
+h:
+	c: true
+	d: false
+
+# Comment h
+i: false
+j: true # value differs from old config
+k: true # Comment k
+
+l: true
+
+x.z:
+	y: true
diff --git a/src/test/resources/old-config.sk b/src/test/resources/old-config.sk
new file mode 100644
index 00000000000..4cf2c80cb22
--- /dev/null
+++ b/src/test/resources/old-config.sk
@@ -0,0 +1,20 @@
+# Comment a
+a:
+	b: # Comment b
+		c: true
+		e: true
+	f: true
+	# Comment f
+	# Comment f'
+
+	outdated value: true
+
+# Comment a'
+i: false
+j: false # Comment j
+k: false # Comment k
+
+outdated value: true
+
+x.z:
+	y: true
diff --git a/src/test/skript/README.md b/src/test/skript/README.md
index 842bb144083..051587fac7e 100644
--- a/src/test/skript/README.md
+++ b/src/test/skript/README.md
@@ -71,10 +71,10 @@ some syntaxes for test development are available.
   * If the tag `to fail` is defined, it will assume the condition is to fail. If it's successful the string is printed.
 * Take a look at existing tests for examples https://github.com/SkriptLang/Skript/tree/master/src/test/skript/tests
   <code>misc/dummy.sk</code> is useful for beginners
-* caseEquals Function. Returns boolean. Useful to check that all string values equal the same. Examples:
-	* <code>caseEquals("hi", "Hi") = false</code>
-	* <code>caseEquals("text", "text", "text") = true</code>
-	* <code>caseEquals({some list variable::*})</code>
+* case_equals Function. Returns boolean. Useful to check that all string values equal the same. Examples:
+	* <code>case_equals("hi", "Hi") = false</code>
+	* <code>case_equals("text", "text", "text") = true</code>
+	* <code>case_equals({some list variable::*})</code>
 
 ## Test Development
 Use Gradle to launch a test development server:
diff --git a/src/test/skript/environments/java11/paper-1.13.2.json b/src/test/skript/environments/java11/paper-1.13.2.json
deleted file mode 100644
index e6efb949c03..00000000000
--- a/src/test/skript/environments/java11/paper-1.13.2.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"name": "paper-1.13.2",
-	"resources": [
-		{"source": "server.properties.generic", "target": "server.properties"}
-	],
-	"paperDownloads": [
-		{
-			"version": "1.13.2",
-			"target": "paperclip.jar"
-		}
-	],
-	"skriptTarget": "plugins/Skript.jar",
-	"commandLine": [
-		"-Dcom.mojang.eula.agree=true",
-		"-jar", "paperclip.jar"
-	]
-}
diff --git a/src/test/skript/environments/java11/paper-1.14.4.json b/src/test/skript/environments/java11/paper-1.14.4.json
deleted file mode 100644
index 1e2972dd84c..00000000000
--- a/src/test/skript/environments/java11/paper-1.14.4.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"name": "paper-1.14.4",
-	"resources": [
-		{"source": "server.properties.generic", "target": "server.properties"}
-	],
-	"paperDownloads": [
-		{
-			"version": "1.14.4",
-			"target": "paperclip.jar"
-		}
-	],
-	"skriptTarget": "plugins/Skript.jar",
-	"commandLine": [
-		"-Dcom.mojang.eula.agree=true",
-		"-jar", "paperclip.jar"
-	]
-}
diff --git a/src/test/skript/environments/java11/paper-1.15.2.json b/src/test/skript/environments/java11/paper-1.15.2.json
deleted file mode 100644
index 08a849ff98d..00000000000
--- a/src/test/skript/environments/java11/paper-1.15.2.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"name": "paper-1.15.2",
-	"resources": [
-		{"source": "server.properties.generic", "target": "server.properties"}
-	],
-	"paperDownloads": [
-		{
-			"version": "1.15.2",
-			"target": "paperclip.jar"
-		}
-	],
-	"skriptTarget": "plugins/Skript.jar",
-	"commandLine": [
-		"-Dcom.mojang.eula.agree=true",
-		"-jar", "paperclip.jar", "--nogui"
-	]
-}
diff --git a/src/test/skript/environments/java11/paper-1.16.5.json b/src/test/skript/environments/java11/paper-1.16.5.json
deleted file mode 100644
index 690a180c001..00000000000
--- a/src/test/skript/environments/java11/paper-1.16.5.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"name": "paper-1.16.5",
-	"resources": [
-		{"source": "server.properties.generic", "target": "server.properties"}
-	],
-	"paperDownloads": [
-		{
-			"version": "1.16.5",
-			"target": "paperclip.jar"
-		}
-	],
-	"skriptTarget": "plugins/Skript.jar",
-	"commandLine": [
-		"-Dcom.mojang.eula.agree=true",
-		"-jar", "paperclip.jar", "--nogui"
-	]
-}
diff --git a/src/test/skript/environments/java17/paper-1.18.2.json b/src/test/skript/environments/java17/paper-1.18.2.json
deleted file mode 100644
index 406bdd99c06..00000000000
--- a/src/test/skript/environments/java17/paper-1.18.2.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"name": "paper-1.18.2",
-	"resources": [
-		{"source": "server.properties.generic", "target": "server.properties"}
-	],
-	"paperDownloads": [
-		{
-			"version": "1.18.2",
-			"target": "paperclip.jar"
-		}
-	],
-	"skriptTarget": "plugins/Skript.jar",
-	"commandLine": [
-		"-Dcom.mojang.eula.agree=true",
-		"-jar", "paperclip.jar", "--nogui"
-	]
-}
diff --git a/src/test/skript/environments/java17/paper-1.17.1.json b/src/test/skript/environments/java21/paper-1.21.4.json
similarity index 85%
rename from src/test/skript/environments/java17/paper-1.17.1.json
rename to src/test/skript/environments/java21/paper-1.21.4.json
index 720eba10ef5..5957458a7a9 100644
--- a/src/test/skript/environments/java17/paper-1.17.1.json
+++ b/src/test/skript/environments/java21/paper-1.21.4.json
@@ -1,11 +1,11 @@
 {
-	"name": "paper-1.17.1",
+	"name": "paper-1.21.4",
 	"resources": [
 		{"source": "server.properties.generic", "target": "server.properties"}
 	],
 	"paperDownloads": [
 		{
-			"version": "1.17.1",
+			"version": "1.21.4",
 			"target": "paperclip.jar"
 		}
 	],
diff --git a/src/test/skript/junit/-BellEventsPaper.sk b/src/test/skript/junit/-BellEventsPaper.sk
index 61afbd566f5..bc36739064b 100644
--- a/src/test/skript/junit/-BellEventsPaper.sk
+++ b/src/test/skript/junit/-BellEventsPaper.sk
@@ -1,5 +1,5 @@
 # This file contains events we can run on Paper 1.16.5+
 
 on bell ringing:
-    junit test is "org.skriptlang.skript.test.tests.syntaxes.events.BellEventsTest"
-    complete objective "bell rings" for junit test "org.skriptlang.skript.test.tests.syntaxes.events.BellEventsTest"
+	junit test is "org.skriptlang.skript.test.tests.syntaxes.events.BellEventsTest"
+	complete objective "bell rings" for junit test "org.skriptlang.skript.test.tests.syntaxes.events.BellEventsTest"
diff --git a/src/test/skript/junit/-BellEventsSpigot.sk b/src/test/skript/junit/-BellEventsSpigot.sk
index cf33b09aff5..65ba0e256f7 100644
--- a/src/test/skript/junit/-BellEventsSpigot.sk
+++ b/src/test/skript/junit/-BellEventsSpigot.sk
@@ -1,10 +1,10 @@
 # This file contains tests we can run on Spigot 1.19.4+
 
 on bell ringing:
-    junit test is "org.skriptlang.skript.test.tests.syntaxes.events.BellEventsTest"
-    complete objective "bell rings" for junit test "org.skriptlang.skript.test.tests.syntaxes.events.BellEventsTest"
+	junit test is "org.skriptlang.skript.test.tests.syntaxes.events.BellEventsTest"
+	complete objective "bell rings" for junit test "org.skriptlang.skript.test.tests.syntaxes.events.BellEventsTest"
 
 on bell resonating:
-    junit test is "org.skriptlang.skript.test.tests.syntaxes.events.BellEventsTest"
-    complete objective "bell resonates" for junit test "org.skriptlang.skript.test.tests.syntaxes.events.BellEventsTest"
-    assert size of event-entities is greater than or equal to 1 with "bell did not reveal the pillager"
+	junit test is "org.skriptlang.skript.test.tests.syntaxes.events.BellEventsTest"
+	complete objective "bell resonates" for junit test "org.skriptlang.skript.test.tests.syntaxes.events.BellEventsTest"
+	assert size of event-entities is greater than or equal to 1 with "bell did not reveal the pillager"
diff --git a/src/test/skript/junit/BellEvents.sk b/src/test/skript/junit/BellEvents.sk
index 2d7597ef4b2..29c9ad47738 100644
--- a/src/test/skript/junit/BellEvents.sk
+++ b/src/test/skript/junit/BellEvents.sk
@@ -1,25 +1,25 @@
 test "BellEventsTest" when running JUnit:
-    set {_slashIndex} to last index of "/" in "%script%.sk"
-    if {_slashIndex} is -1: # try \ separator (Windows)
-        set {_slashIndex} to last index of "\" in "%script%.sk"
-    set {_parent} to substring of "%script%.sk" from 0 to {_slashIndex}
+	set {_slashIndex} to last index of "/" in "%script%.sk"
+	if {_slashIndex} is -1: # try \ separator (Windows)
+		set {_slashIndex} to last index of "\" in "%script%.sk"
+	set {_parent} to substring of "%script%.sk" from 0 to {_slashIndex}
 
-    if running below minecraft "1.19.4":
-        complete objective "bell resonates" for junit test "org.skriptlang.skript.test.tests.syntaxes.events.BellEventsTest"
-        if running below minecraft "1.16.5":
-            complete objective "bell rings" for junit test "org.skriptlang.skript.test.tests.syntaxes.events.BellEventsTest"
-        else:
-            load script "%{_parent}%-BellEventsPaper.sk"
-    else:
-        load script "%{_parent}%-BellEventsSpigot.sk"
+	if running below minecraft "1.19.4":
+		complete objective "bell resonates" for junit test "org.skriptlang.skript.test.tests.syntaxes.events.BellEventsTest"
+		if running below minecraft "1.16.5":
+			complete objective "bell rings" for junit test "org.skriptlang.skript.test.tests.syntaxes.events.BellEventsTest"
+		else:
+			load script "%{_parent}%-BellEventsPaper.sk"
+	else:
+		load script "%{_parent}%-BellEventsSpigot.sk"
 
-    ensure junit test "org.skriptlang.skript.test.tests.syntaxes.events.BellEventsTest" completes "bell resonates"
-    ensure junit test "org.skriptlang.skript.test.tests.syntaxes.events.BellEventsTest" completes "bell rings"
+	ensure junit test "org.skriptlang.skript.test.tests.syntaxes.events.BellEventsTest" completes "bell resonates"
+	ensure junit test "org.skriptlang.skript.test.tests.syntaxes.events.BellEventsTest" completes "bell rings"
 
 on script unload:
-    set {_slashIndex} to last index of "/" in "%script%.sk"
-    if {_slashIndex} is -1: # try \ separator (Windows)
-        set {_slashIndex} to last index of "\" in "%script%.sk"
-    set {_parent} to substring of "%script%.sk" from 0 to {_slashIndex}
-    disable script "%{_parent}%BellEventsSpigot.sk"
-    disable script "%{_parent}%BellEventsPaper.sk"
+	set {_slashIndex} to last index of "/" in "%script%.sk"
+	if {_slashIndex} is -1: # try \ separator (Windows)
+		set {_slashIndex} to last index of "\" in "%script%.sk"
+	set {_parent} to substring of "%script%.sk" from 0 to {_slashIndex}
+	disable script "%{_parent}%BellEventsSpigot.sk"
+	disable script "%{_parent}%BellEventsPaper.sk"
diff --git a/src/test/skript/junit/CancelledEventTest.sk b/src/test/skript/junit/CancelledEventTest.sk
index ae8b2563367..5051afa3c10 100644
--- a/src/test/skript/junit/CancelledEventTest.sk
+++ b/src/test/skript/junit/CancelledEventTest.sk
@@ -11,7 +11,7 @@ test "ExprDropsJUnit" when running JUnit:
 	ensure junit test {@test} completes {_tests::*}
 
 on load:
-	set {-cancelled-event-test::call-count} to 0
+	set {cancelled-event-test::call-count} to 0
 
 on form:
 	junit test is {@test}
@@ -26,7 +26,7 @@ on cancelled form:
 on any form:
 	junit test is {@test}
 
-	add 1 to {-cancelled-event-test::call-count}
+	add 1 to {cancelled-event-test::call-count}
 
-	if {-cancelled-event-test::call-count} is 2:
+	if {cancelled-event-test::call-count} is 2:
 		complete objective "listen for any event" for {@test}
diff --git a/src/test/skript/junit/CondChatVisibility.sk b/src/test/skript/junit/CondChatVisibility.sk
new file mode 100644
index 00000000000..9ce5f39dd9c
--- /dev/null
+++ b/src/test/skript/junit/CondChatVisibility.sk
@@ -0,0 +1,18 @@
+test "CondChatVisibilityJUnit" when running JUnit:
+	set {_tests::1} to "chat visibility is only commands"
+	set {_tests::2} to "no chat filtering"
+	set {_tests::3} to "can see chat colours"
+	ensure junit test "org.skriptlang.skript.test.tests.syntaxes.conditions.CondChatVisibilityTest" completes {_tests::*}
+
+on join:
+	set {_test} to "org.skriptlang.skript.test.tests.syntaxes.conditions.CondChatVisibilityTest"
+	junit test is {_test}
+
+	if player can only see commands:
+		complete objective "chat visibility is only commands" for {_test}
+
+	if player doesn't have chat filtering enabled:
+		complete objective "no chat filtering" for {_test}
+
+	if player can see chat colours:
+		complete objective "can see chat colours" for {_test}
diff --git a/src/test/skript/junit/EntryContainerTest.sk b/src/test/skript/junit/EntryContainerTest.sk
new file mode 100644
index 00000000000..13376089928
--- /dev/null
+++ b/src/test/skript/junit/EntryContainerTest.sk
@@ -0,0 +1,9 @@
+options:
+	test: "org.skriptlang.skript.test.tests.syntaxes.events.EntryContainerTest"
+
+test "EntryContainerTest" when running JUnit:
+	ensure junit test {@test} completes "has entry"
+
+test entry container:
+	has entry:
+		complete objective "has entry" for {@test}
diff --git a/src/test/skript/junit/EvtBeaconTest.sk b/src/test/skript/junit/EvtBeaconTest.sk
new file mode 100644
index 00000000000..ea298098942
--- /dev/null
+++ b/src/test/skript/junit/EvtBeaconTest.sk
@@ -0,0 +1,112 @@
+options:
+	EvtBeaconTest: "org.skriptlang.skript.test.tests.syntaxes.events.EvtBeaconTest"
+
+on load:
+	set {_tests::1} to "beacon activated"
+	set {_tests::2} to "activated - got block"
+
+	set {_tests::3} to "beacon deactivated"
+	set {_tests::4} to "deactivated - got block"
+
+	set {_tests::5} to "beacon toggled"
+	set {_tests::6} to "toggled - got block"
+
+	set {_tests::7} to "beacon change effect"
+	set {_tests::8} to "change effect - got player"
+	set {_tests::9} to "change effect - got primary effect type"
+	set {_tests::10} to "change effect - got secondary effect type"
+	set {_tests::11} to "change effect - got block"
+
+	set {_tests::12} to "beacon effect"
+	set {_tests::13} to "beacon effect - primary"
+	set {_tests::14} to "effect - primary - got block"
+	set {_tests::15} to "effect - primary - got player"
+	set {_tests::16} to "effect - primary - got health boost effect"
+
+	set {_tests::17} to "beacon effect - secondary"
+	set {_tests::18} to "effect - secondary - got block"
+	set {_tests::19} to "effect - secondary - got player"
+	set {_tests::20} to "effect - secondary - got regeneration effect"
+
+	set {_tests::21} to "primary beacon effect"
+	set {_tests::22} to "primary effect - got block"
+	set {_tests::23} to "primary effect - got player"
+	set {_tests::24} to "primary effect - got health boost effect"
+
+	set {_tests::25} to "secondary beacon effect"
+	set {_tests::26} to "secondary effect - got block"
+	set {_tests::27} to "secondary effect - got player"
+	set {_tests::28} to "secondary effect - got regeneration effect"
+
+	ensure junit test {@EvtBeaconTest} completes {_tests::*}
+
+
+on beacon activate:
+	junit test is {@EvtBeaconTest}
+	complete objective "beacon activated" for junit test {@EvtBeaconTest}
+	if event-block is set:
+		complete objective "activated - got block" for junit test {@EvtBeaconTest}
+
+on beacon deactivate:
+	junit test is {@EvtBeaconTest}
+	complete objective "beacon deactivated" for junit test {@EvtBeaconTest}
+	if event-block is set:
+		complete objective "deactivated - got block" for junit test {@EvtBeaconTest}
+
+on beacon toggle:
+	junit test is {@EvtBeaconTest}
+	complete objective "beacon toggled" for junit test {@EvtBeaconTest}
+	if event-block is set:
+		complete objective "toggled - got block" for junit test {@EvtBeaconTest}
+
+on beacon change effect:
+	junit test is {@EvtBeaconTest}
+	complete objective "beacon change effect" for junit test {@EvtBeaconTest}
+	if event-player is set:
+		complete objective "change effect - got player" for junit test {@EvtBeaconTest}
+	if primary beacon effect is health boost:
+		complete objective "change effect - got primary effect type" for junit test {@EvtBeaconTest}
+	if secondary beacon effect is regeneration:
+		complete objective "change effect - got secondary effect type" for junit test {@EvtBeaconTest}
+	if event-block is set:
+		complete objective "change effect - got block" for junit test {@EvtBeaconTest}
+
+on beacon effect:
+	junit test is {@EvtBeaconTest}
+	complete objective "beacon effect" for junit test {@EvtBeaconTest}
+	if applied effect is the primary effect:
+		complete objective "beacon effect - primary" for junit test {@EvtBeaconTest}
+		if event-block is set:
+			complete objective "effect - primary - got block" for junit test {@EvtBeaconTest}
+		if event-player is set:
+			complete objective "effect - primary - got player" for junit test {@EvtBeaconTest}
+		if applied effect is health boost:
+			complete objective "effect - primary - got health boost effect" for junit test {@EvtBeaconTest}
+	else:
+		complete objective "beacon effect - secondary" for junit test {@EvtBeaconTest}
+		if event-block is set:
+			complete objective "effect - secondary - got block" for junit test {@EvtBeaconTest}
+		if event-player is set:
+			complete objective "effect - secondary - got player" for junit test {@EvtBeaconTest}
+		if applied effect is regeneration:
+			complete objective "effect - secondary - got regeneration effect" for junit test {@EvtBeaconTest}
+
+on primary beacon effect:
+	junit test is {@EvtBeaconTest}
+	complete objective "primary beacon effect" for junit test {@EvtBeaconTest}
+	if event-block is set:
+		complete objective "primary effect - got block" for junit test {@EvtBeaconTest}
+	if event-player is set:
+		complete objective "primary effect - got player" for junit test {@EvtBeaconTest}
+	if applied effect is health boost:
+		complete objective "primary effect - got health boost effect" for junit test {@EvtBeaconTest}
+
+on secondary beacon effect:
+	junit test is {@EvtBeaconTest}
+	complete objective "secondary beacon effect" for junit test {@EvtBeaconTest}
+	if event-block is set:
+		complete objective "secondary effect - got block" for junit test {@EvtBeaconTest}
+	if event-player is set:
+		complete objective "secondary effect - got player" for junit test {@EvtBeaconTest}
+	if applied effect is regeneration:
+		complete objective "secondary effect - got regeneration effect" for junit test {@EvtBeaconTest}
diff --git a/src/test/skript/junit/EvtBreed.sk b/src/test/skript/junit/EvtBreed.sk
new file mode 100644
index 00000000000..52a4091666e
--- /dev/null
+++ b/src/test/skript/junit/EvtBreed.sk
@@ -0,0 +1,39 @@
+test "EvtBreedJUnit" when running JUnit:
+	set {_tests::1} to "correct breeder"
+	set {_tests::2} to "correct breeding mother"
+	set {_tests::3} to "correct breeding father"
+	set {_tests::4} to "correct bred child"
+	set {_tests::5} to "item is carrot"
+
+	ensure junit test "org.skriptlang.skript.test.tests.syntaxes.events.EvtBreedTest" completes {_tests::*}
+
+on breed of pig:
+	set {_test} to "org.skriptlang.skript.test.tests.syntaxes.events.EvtBreedTest"
+	junit test is {_test}
+
+	if:
+		breeder is a player
+		breeder's name is "Efnilite"
+	then:
+		complete objective "correct breeder" for {_test}
+
+	if:
+		breeding mother is a pig
+		breeding mother's name is "mother"
+	then:
+		complete objective "correct breeding mother" for {_test}
+
+	if:
+		breeding father is a pig
+		breeding father's name is "father"
+	then:
+		complete objective "correct breeding father" for {_test}
+
+	if:
+		bred child is pig
+		bred child's name is "child"
+	then:
+		complete objective "correct bred child" for {_test}
+
+	if event-item is a carrot:
+		complete objective "item is carrot" for {_test}
diff --git a/src/test/skript/junit/EvtBroadcast.sk b/src/test/skript/junit/EvtBroadcast.sk
new file mode 100644
index 00000000000..818de912c93
--- /dev/null
+++ b/src/test/skript/junit/EvtBroadcast.sk
@@ -0,0 +1,18 @@
+test "EvtBroadcastJUnit" when running JUnit:
+
+	set {_tests::1} to "set broadcasted message"
+	set {_tests::2} to "clear broadcasted message"
+
+	ensure junit test "org.skriptlang.skript.test.tests.syntaxes.events.EvtBroadcastTest" completes {_tests::*}
+
+on broadcast:
+	set {_test} to "org.skriptlang.skript.test.tests.syntaxes.events.EvtBroadcastTest"
+	junit test is {_test}
+
+	set broadcast message to "hello"
+	if broadcasted message is "hello":
+		complete objective "set broadcasted message" for {_test}
+
+	clear broadcast-message
+	if broadcasted message is "":
+		complete objective "clear broadcasted message" for {_test}
diff --git a/src/test/skript/junit/EvtBucketEntity.sk b/src/test/skript/junit/EvtBucketEntity.sk
new file mode 100644
index 00000000000..f9df581cd85
--- /dev/null
+++ b/src/test/skript/junit/EvtBucketEntity.sk
@@ -0,0 +1,47 @@
+test "EvtBucketEntityJUnit" when running JUnit:
+	set {_tests::1} to "any - correct fish"
+	set {_tests::2} to "any - correct player"
+	set {_tests::3} to "any - correct item"
+	set {_tests::4} to "any - correct entity bucket"
+	set {_tests::5} to "specific - correct fish"
+	set {_tests::6} to "specific - correct player"
+	set {_tests::7} to "specific - correct item"
+	set {_tests::8} to "specific - correct entity bucket"
+
+	ensure junit test "org.skriptlang.skript.test.tests.syntaxes.events.EvtBucketEntityTest" completes {_tests::*}
+
+on bucket catch:
+	set {_test} to "org.skriptlang.skript.test.tests.syntaxes.events.EvtBucketEntityTest"
+	junit test is {_test}
+
+	if event-entity is a salmon:
+		complete objective "any - correct fish" for {_test}
+	else:
+		stop
+
+	if player's name is "Efnilite":
+		complete objective "any - correct player" for {_test}
+
+	if event-item is a water bucket:
+		complete objective "any - correct item" for {_test}
+
+	if future event-item is a salmon bucket:
+		complete objective "any - correct entity bucket" for {_test}
+
+on bucket catch of cod:
+	set {_test} to "org.skriptlang.skript.test.tests.syntaxes.events.EvtBucketEntityTest"
+	junit test is {_test}
+
+	if event-entity is a cod:
+		complete objective "specific - correct fish" for {_test}
+	else:
+		stop
+
+	if player's name is "Efnilite":
+		complete objective "specific - correct player" for {_test}
+
+	if event-item is a water bucket:
+		complete objective "specific - correct item" for {_test}
+
+	if future event-item is a cod bucket:
+		complete objective "specific - correct entity bucket" for {_test}
diff --git a/src/test/skript/junit/EvtExperienceCooldownChangeTest.sk b/src/test/skript/junit/EvtExperienceCooldownChangeTest.sk
new file mode 100644
index 00000000000..6ec6844fb4a
--- /dev/null
+++ b/src/test/skript/junit/EvtExperienceCooldownChangeTest.sk
@@ -0,0 +1,16 @@
+on load:
+	set {_test::1} to "got player"
+	set {_test::2} to "change reason is plugin"
+	set {_test::3} to "got new cooldown"
+
+	ensure junit test "org.skriptlang.skript.test.tests.syntaxes.events.EvtExperienceCooldownChangeTest" completes {_test::*}
+
+on player experience cooldown change:
+	set {_test} to "org.skriptlang.skript.test.tests.syntaxes.events.EvtExperienceCooldownChangeTest"
+	junit test is {_test}
+	if event-player is set:
+		complete objective "got player" for junit test {_test}
+	if xp cooldown change reason is plugin:
+		complete objective "change reason is plugin" for junit test {_test}
+	if event-timespan is set:
+		complete objective "got new cooldown" for junit test {_test}
diff --git a/src/test/skript/junit/EvtFireworkTest.sk b/src/test/skript/junit/EvtFireworkTest.sk
new file mode 100644
index 00000000000..9646a81a82d
--- /dev/null
+++ b/src/test/skript/junit/EvtFireworkTest.sk
@@ -0,0 +1,16 @@
+options:
+	EvtFireworkTest: "org.skriptlang.skript.test.tests.syntaxes.events.EvtFireworkTest"
+
+test "EvtFireworkJUnit" when running JUnit:
+	set {_tests::1} to "any firework"
+	loop all colors:
+		set {_tests::%loop-iteration + 1%} to "%loop-color% firework"
+
+	ensure junit test {@EvtFireworkTest} completes {_tests::*}
+
+on firework explode:
+	junit test is {@EvtFireworkTest}
+	complete objective "any firework" for {@EvtFireworkTest}
+	if event-colors is set:
+		set {_color} to first element of event-colors
+		complete objective "%{_color}% firework" for {@EvtFireworkTest}
diff --git a/src/test/skript/junit/EvtFish.sk b/src/test/skript/junit/EvtFish.sk
new file mode 100644
index 00000000000..2b6082e436f
--- /dev/null
+++ b/src/test/skript/junit/EvtFish.sk
@@ -0,0 +1,230 @@
+test "EvtFishJUnit" when running JUnit:
+	add "cast - correct player" to {_tests::*}
+	add "cast - correct fish" to {_tests::*}
+	add "cast - not in open water" to {_tests::*}
+	add "cast - correct fish hooked" to {_tests::*}
+	add "cast - set waiting time" to {_tests::*}
+	add "cast - add waiting time" to {_tests::*}
+	add "cast - remove waiting time" to {_tests::*}
+	add "cast - reset waiting time" to {_tests::*}
+	add "cast - set approach angle" to {_tests::*}
+	add "cast - add approach angle" to {_tests::*}
+	add "cast - remove approach angle" to {_tests::*}
+	add "cast - reset approach angle" to {_tests::*}
+	add "cast - invalid approach angle" to {_tests::*}
+	add "cast - lure enchantment bonus" to {_tests::*}
+	add "cast - apply lure enchantment bonus" to {_tests::*}
+	add "cast - remove lure enchantment bonus" to {_tests::*}
+	if method "org.bukkit.entity.FishHook#getTimeUntilBite" exists:
+		add "cast - bite time" to {_tests::*}
+		add "cast - remove bite time" to {_tests::*}
+		add "cast - add bite time" to {_tests::*}
+		add "cast - invalid bite time" to {_tests::*}
+
+	add "catch - correct player" to {_tests::*}
+	add "catch - correct fish" to {_tests::*}
+	add "catch - not in open water" to {_tests::*}
+	add "catch - correct fish hooked" to {_tests::*}
+	add "catch - set waiting time" to {_tests::*}
+	add "catch - add waiting time" to {_tests::*}
+	add "catch - remove waiting time" to {_tests::*}
+	add "catch - reset waiting time" to {_tests::*}
+	add "catch - set approach angle" to {_tests::*}
+	add "catch - add approach angle" to {_tests::*}
+	add "catch - remove approach angle" to {_tests::*}
+	add "catch - reset approach angle" to {_tests::*}
+	add "catch - invalid approach angle" to {_tests::*}
+	add "catch - lure enchantment bonus" to {_tests::*}
+	add "catch - apply lure enchantment bonus" to {_tests::*}
+	add "catch - remove lure enchantment bonus" to {_tests::*}
+	if method "org.bukkit.entity.FishHook#getTimeUntilBite" exists:
+		add "catch - bite time" to {_tests::*}
+		add "catch - remove bite time" to {_tests::*}
+		add "catch - add bite time" to {_tests::*}
+		add "catch - invalid bite time" to {_tests::*}
+
+	ensure junit test "org.skriptlang.skript.test.tests.syntaxes.events.EvtFishTest" completes {_tests::*}
+
+on fishing line cast:
+	set {_test} to "org.skriptlang.skript.test.tests.syntaxes.events.EvtFishTest"
+	junit test is {_test}
+
+	if player's name is "Efnilite":
+		complete objective "cast - correct player" for {_test}
+
+	if event-entity is a cod:
+		complete objective "cast - correct fish" for {_test}
+
+	if fishing hook is not in open water:
+		complete objective "cast - not in open water" for {_test}
+
+	if hooked entity is a cod:
+		complete objective "cast - correct fish hooked" for {_test}
+
+	set max fish waiting time to 20 seconds
+	if max fish waiting time is 20 seconds:
+		complete objective "cast - set waiting time" for {_test}
+
+	add 1 second to min fish waiting time
+	if min fish waiting time is 6 seconds:
+		complete objective "cast - add waiting time" for {_test}
+
+	remove 1 second from max fish waiting time
+	if max fish waiting time is 19 seconds:
+		complete objective "cast - remove waiting time" for {_test}
+
+	reset min fish waiting time
+	reset max fish waiting time
+	if:
+		min fish waiting time is 5 seconds
+		max fish waiting time is 30 seconds
+	then:
+		complete objective "cast - reset waiting time" for {_test}
+
+	set max fish approach angle to 40
+	if max fish approach angle is 40:
+		complete objective "cast - set approach angle" for {_test}
+
+	add 10 to min fish approach angle
+	if min fish approach angle is 10:
+		complete objective "cast - add approach angle" for {_test}
+
+	remove 10 from min fish approach angle
+	if min fish approach angle is 0:
+		complete objective "cast - remove approach angle" for {_test}
+
+	reset max fish approach angle
+	reset min fish approach angle
+	if:
+		min fish approach angle is 0
+		max fish approach angle is 360
+	then:
+		complete objective "cast - reset approach angle" for {_test}
+
+	set min fish approach angle to 720
+	set max fish approach angle to -3
+	if:
+		min fish approach angle is 360
+		max fish approach angle is 0
+	then:
+		complete objective "cast - invalid approach angle" for {_test}
+
+	if lure enchantment bonus isn't applied:
+		complete objective "cast - lure enchantment bonus" for {_test}
+
+	apply the lure enchantment bonus
+	if lure enchantment bonus is applied:
+		complete objective "cast - apply lure enchantment bonus" for {_test}
+
+	remove the lure enchantment bonus
+	if lure enchantment bonus is not applied:
+		complete objective "cast - remove lure enchantment bonus" for {_test}
+
+	parse if method "org.bukkit.entity.FishHook#getTimeUntilBite" exists:
+		set fishing bite time to 1 second
+		if fishing bite time is 1 second:
+			complete objective "cast - bite time" for {_test}
+
+		remove 0.5 seconds from fishing bite time
+		if fishing bite time is 0.5 seconds:
+			complete objective "cast - remove bite time" for {_test}
+
+		add 0.5 seconds to fishing bite time
+		if fishing bite time is 1 second:
+			complete objective "cast - add bite time" for {_test}
+
+		set fishing bite time to 0 second
+		if fishing bite time is 1 tick:
+			complete objective "catch - invalid bite time" for {_test}
+
+on fish catch:
+	set {_test} to "org.skriptlang.skript.test.tests.syntaxes.events.EvtFishTest"
+	junit test is {_test}
+
+	if player's name is "Efnilite":
+		complete objective "catch - correct player" for {_test}
+
+	if event-entity is a salmon:
+		complete objective "catch - correct fish" for {_test}
+
+	if fishing hook is not in open water:
+		complete objective "catch - not in open water" for {_test}
+
+	if hooked entity is a salmon:
+		complete objective "catch - correct fish hooked" for {_test}
+
+	set max fish waiting time to 20 seconds
+	if max fish waiting time is 20 seconds:
+		complete objective "catch - set waiting time" for {_test}
+
+	add 1 second to min fish waiting time
+	if min fish waiting time is 6 seconds:
+		complete objective "catch - add waiting time" for {_test}
+
+	remove 1 second from max fish waiting time
+	if max fish waiting time is 19 seconds:
+		complete objective "catch - remove waiting time" for {_test}
+
+	reset min fish waiting time
+	reset max fish waiting time
+	if:
+		min fish waiting time is 5 seconds
+		max fish waiting time is 30 seconds
+	then:
+		complete objective "catch - reset waiting time" for {_test}
+
+	set max fish approach angle to 40
+	if max fish approach angle is 40:
+		complete objective "catch - set approach angle" for {_test}
+
+	add 10 to min fish approach angle
+	if min fish approach angle is 10:
+		complete objective "catch - add approach angle" for {_test}
+
+	remove 10 from min fish approach angle
+	if min fish approach angle is 0:
+		complete objective "catch - remove approach angle" for {_test}
+
+	set min fish approach angle to 720
+	set max fish approach angle to -3
+	if:
+		min fish approach angle is 360
+		max fish approach angle is 0
+	then:
+		complete objective "catch - invalid approach angle" for {_test}
+
+	reset min fish approach angle
+	reset max fish approach angle
+	if:
+		min fish approach angle is 0
+		max fish approach angle is 360
+	then:
+		complete objective "catch - reset approach angle" for {_test}
+
+	if lure enchantment bonus isn't applied:
+		complete objective "catch - lure enchantment bonus" for {_test}
+
+	apply the lure enchantment bonus
+	if lure enchantment bonus is applied:
+		complete objective "catch - apply lure enchantment bonus" for {_test}
+
+	remove the lure enchantment bonus
+	if lure enchantment bonus is not applied:
+		complete objective "catch - remove lure enchantment bonus" for {_test}
+
+	parse if method "org.bukkit.entity.FishHook#getTimeUntilBite" exists:
+		set fishing bite time to 1 second
+		if fishing bite time is 1 second:
+			complete objective "catch - bite time" for {_test}
+
+		remove 0.5 seconds from fishing bite time
+		if fishing bite time is 0.5 seconds:
+			complete objective "catch - remove bite time" for {_test}
+
+		add 0.5 seconds to fishing bite time
+		if fishing bite time is 1 second:
+			complete objective "catch - add bite time" for {_test}
+
+		set fishing bite time to 0 second
+		if fishing bite time is 1 tick:
+			complete objective "catch - invalid bite time" for {_test}
diff --git a/src/test/skript/junit/EvtFurnaceTest.sk b/src/test/skript/junit/EvtFurnaceTest.sk
new file mode 100644
index 00000000000..6999fe35b7b
--- /dev/null
+++ b/src/test/skript/junit/EvtFurnaceTest.sk
@@ -0,0 +1,41 @@
+options:
+	EvtFurnaceTest: "org.skriptlang.skript.test.tests.syntaxes.events.EvtFurnaceTest"
+
+on load:
+	set {_tests::1} to "smelt event"
+	set {_tests::2} to "smelt - got smelted item"
+	set {_tests::3} to "start smelt event"
+	set {_tests::4} to "start smelt - got smelting item"
+	set {_tests::5} to "fuel burn event"
+	set {_tests::6} to "fuel burn - got burned fuel item"
+	set {_tests::7} to "extract event"
+	set {_tests::8} to "extract - got extracted item"
+	set {_tests::9} to "extract - got player"
+
+	ensure junit test {@EvtFurnaceTest} completes {_tests::*}
+
+on smelt:
+	junit test is {@EvtFurnaceTest}
+	complete objective "smelt event" for junit test {@EvtFurnaceTest}
+	if smelted item is an iron ingot:
+		complete objective "smelt - got smelted item" for junit test {@EvtFurnaceTest}
+
+on start smelt:
+	junit test is {@EvtFurnaceTest}
+	complete objective "start smelt event" for junit test {@EvtFurnaceTest}
+	if smelting item is a raw gold:
+		complete objective "start smelt - got smelting item" for junit test {@EvtFurnaceTest}
+
+on fuel burn:
+	junit test is {@EvtFurnaceTest}
+	complete objective "fuel burn event" for junit test {@EvtFurnaceTest}
+	if burned fuel is a lava bucket:
+		complete objective "fuel burn - got burned fuel item" for junit test {@EvtFurnaceTest}
+
+on furnace extract:
+	junit test is {@EvtFurnaceTest}
+	complete objective "extract event" for junit test {@EvtFurnaceTest}
+	if extracted item is a copper ingot:
+		complete objective "extract - got extracted item" for junit test {@EvtFurnaceTest}
+	if event-player is set:
+		complete objective "extract - got player" for junit test {@EvtFurnaceTest}
diff --git a/src/test/skript/junit/EvtGrow.sk b/src/test/skript/junit/EvtGrow.sk
index 080dfd819b9..7873455d4be 100644
--- a/src/test/skript/junit/EvtGrow.sk
+++ b/src/test/skript/junit/EvtGrow.sk
@@ -1,70 +1,59 @@
-on script load:
-	# prior to 1.18, applyBoneMeal either did not exist or did not fire events
-	# so we need to complete the objectives manually to avoid the tests failing
-	if running below minecraft "1.18":
-		complete objective "grow of wheat" for junit test "org.skriptlang.skript.test.tests.syntaxes.events.EvtGrowTest"
-		complete objective "grow from wheat" for junit test "org.skriptlang.skript.test.tests.syntaxes.events.EvtGrowTest"
-		complete objective "grow to wheat" for junit test "org.skriptlang.skript.test.tests.syntaxes.events.EvtGrowTest"
-		complete objective "grow of wheat (blockdata)" for junit test "org.skriptlang.skript.test.tests.syntaxes.events.EvtGrowTest"
-		complete objective "grow from wheat (blockdata)" for junit test "org.skriptlang.skript.test.tests.syntaxes.events.EvtGrowTest"
-		complete objective "grow to wheat (blockdata)" for junit test "org.skriptlang.skript.test.tests.syntaxes.events.EvtGrowTest"
-		complete objective "grow of birch tree" for junit test "org.skriptlang.skript.test.tests.syntaxes.events.EvtGrowTest"
-		complete objective "grow of birch sapling" for junit test "org.skriptlang.skript.test.tests.syntaxes.events.EvtGrowTest"
-		complete objective "grow from birch sapling" for junit test "org.skriptlang.skript.test.tests.syntaxes.events.EvtGrowTest"
-		complete objective "grow to birch tree" for junit test "org.skriptlang.skript.test.tests.syntaxes.events.EvtGrowTest"
+options:
+	test: "org.skriptlang.skript.test.tests.syntaxes.events.EvtGrowTest"
 
+on script load:
 	# itemtype
-	ensure junit test "org.skriptlang.skript.test.tests.syntaxes.events.EvtGrowTest" completes "grow of wheat"
-	ensure junit test "org.skriptlang.skript.test.tests.syntaxes.events.EvtGrowTest" completes "grow from wheat"
-	ensure junit test "org.skriptlang.skript.test.tests.syntaxes.events.EvtGrowTest" completes "grow to wheat"
+	ensure junit test {@test} completes "grow of wheat"
+	ensure junit test {@test} completes "grow from wheat"
+	ensure junit test {@test} completes "grow to wheat"
 
 	# blockdata
-	ensure junit test "org.skriptlang.skript.test.tests.syntaxes.events.EvtGrowTest" completes "grow of wheat (blockdata)"
-	ensure junit test "org.skriptlang.skript.test.tests.syntaxes.events.EvtGrowTest" completes "grow from wheat (blockdata)"
-	ensure junit test "org.skriptlang.skript.test.tests.syntaxes.events.EvtGrowTest" completes "grow to wheat (blockdata)"
+	ensure junit test {@test} completes "grow of wheat (blockdata)"
+	ensure junit test {@test} completes "grow from wheat (blockdata)"
+	ensure junit test {@test} completes "grow to wheat (blockdata)"
 
 	# structures
-	ensure junit test "org.skriptlang.skript.test.tests.syntaxes.events.EvtGrowTest" completes "grow of birch tree"
-	ensure junit test "org.skriptlang.skript.test.tests.syntaxes.events.EvtGrowTest" completes "grow of birch sapling"
-	ensure junit test "org.skriptlang.skript.test.tests.syntaxes.events.EvtGrowTest" completes "grow from birch sapling"
-	ensure junit test "org.skriptlang.skript.test.tests.syntaxes.events.EvtGrowTest" completes "grow to birch tree"
+	ensure junit test {@test} completes "grow of birch tree"
+	ensure junit test {@test} completes "grow of birch sapling"
+	ensure junit test {@test} completes "grow from birch sapling"
+	ensure junit test {@test} completes "grow to birch tree"
 
 on grow of wheat:
-	junit test is "org.skriptlang.skript.test.tests.syntaxes.events.EvtGrowTest"
-	complete objective "grow of wheat" for junit test "org.skriptlang.skript.test.tests.syntaxes.events.EvtGrowTest"
+	junit test is {@test}
+	complete objective "grow of wheat" for junit test {@test}
 
 on grow of wheat[age=0]:
-	junit test is "org.skriptlang.skript.test.tests.syntaxes.events.EvtGrowTest"
-	complete objective "grow of wheat (blockdata)" for junit test "org.skriptlang.skript.test.tests.syntaxes.events.EvtGrowTest"
+	junit test is {@test}
+	complete objective "grow of wheat (blockdata)" for junit test {@test}
 
 on grow from wheat:
-	junit test is "org.skriptlang.skript.test.tests.syntaxes.events.EvtGrowTest"
-	complete objective "grow from wheat" for junit test "org.skriptlang.skript.test.tests.syntaxes.events.EvtGrowTest"
+	junit test is {@test}
+	complete objective "grow from wheat" for junit test {@test}
 
 on grow from wheat[age=0]:
-	junit test is "org.skriptlang.skript.test.tests.syntaxes.events.EvtGrowTest"
-	complete objective "grow from wheat (blockdata)" for junit test "org.skriptlang.skript.test.tests.syntaxes.events.EvtGrowTest"
+	junit test is {@test}
+	complete objective "grow from wheat (blockdata)" for junit test {@test}
 
 on grow to wheat:
-	junit test is "org.skriptlang.skript.test.tests.syntaxes.events.EvtGrowTest"
-	complete objective "grow to wheat" for junit test "org.skriptlang.skript.test.tests.syntaxes.events.EvtGrowTest"
+	junit test is {@test}
+	complete objective "grow to wheat" for junit test {@test}
 
 on grow to wheat[age=7]:
-	junit test is "org.skriptlang.skript.test.tests.syntaxes.events.EvtGrowTest"
-	complete objective "grow to wheat (blockdata)" for junit test "org.skriptlang.skript.test.tests.syntaxes.events.EvtGrowTest"
+	junit test is {@test}
+	complete objective "grow to wheat (blockdata)" for junit test {@test}
 
 on grow of birch tree:
-	junit test is "org.skriptlang.skript.test.tests.syntaxes.events.EvtGrowTest"
-	complete objective "grow of birch tree" for junit test "org.skriptlang.skript.test.tests.syntaxes.events.EvtGrowTest"
+	junit test is {@test}
+	complete objective "grow of birch tree" for junit test {@test}
 
 on grow of birch sapling:
-	junit test is "org.skriptlang.skript.test.tests.syntaxes.events.EvtGrowTest"
-	complete objective "grow of birch sapling" for junit test "org.skriptlang.skript.test.tests.syntaxes.events.EvtGrowTest"
+	junit test is {@test}
+	complete objective "grow of birch sapling" for junit test {@test}
 
 on grow from birch sapling:
-	junit test is "org.skriptlang.skript.test.tests.syntaxes.events.EvtGrowTest"
-	complete objective "grow from birch sapling" for junit test "org.skriptlang.skript.test.tests.syntaxes.events.EvtGrowTest"
+	junit test is {@test}
+	complete objective "grow from birch sapling" for junit test {@test}
 
 on grow to birch tree:
-	junit test is "org.skriptlang.skript.test.tests.syntaxes.events.EvtGrowTest"
-	complete objective "grow to birch tree" for junit test "org.skriptlang.skript.test.tests.syntaxes.events.EvtGrowTest"
+	junit test is {@test}
+	complete objective "grow to birch tree" for junit test {@test}
diff --git a/src/test/skript/junit/EvtPiglinBarter.sk b/src/test/skript/junit/EvtPiglinBarter.sk
new file mode 100644
index 00000000000..e498380c681
--- /dev/null
+++ b/src/test/skript/junit/EvtPiglinBarter.sk
@@ -0,0 +1,74 @@
+test "EvtPiglinBarterJUnit" when running JUnit:
+	set {_test} to "org.skriptlang.skript.test.tests.syntaxes.events.EvtPiglinBarterTest"
+	set {_tests::1} to "correct barter input"
+	set {_tests::2} to "clear barter drops"
+	set {_tests::3} to "set barter drops to 2 items"
+	set {_tests::4} to "remove item from barter drops"
+	set {_tests::5} to "add multiple items to barter drops"
+	set {_tests::6} to "remove all of an item from barter drops"
+	set {_tests::7} to "remove multiple items from barter drops"
+	set {_tests::8} to "barter drops test complete"
+	ensure {_test} completes {_tests::*}
+
+
+on piglin barter:
+	set {_test} to "org.skriptlang.skript.test.tests.syntaxes.events.EvtPiglinBarterTest"
+	junit test is {_test}
+
+	# Items
+
+	if barter input is gold ingot:
+		complete objective "correct barter input" for {_test}
+
+	clear barter drops
+	if size of barter drops is 0:
+		complete objective "clear barter drops" for {_test}
+
+	set barter drops to 1 emerald and 1 diamond
+	if:
+		size of barter drops is 2
+		barter drops contains 1 emerald
+		barter drops contains 1 diamond
+	then:
+		complete objective "set barter drops to 2 items" for {_test}
+
+	add 1 iron ingot to barter drops
+	if:
+		size of barter drops is 3
+		barter drops contains 1 emerald
+		barter drops contains 1 diamond
+		barter drops contains 1 iron ingot
+	then:
+		complete objective "add item to barter drops" for {_test}
+
+	remove iron ingot from barter drops
+	if:
+		size of barter drops is 2
+		barter drops contains 1 emerald
+		barter drops contains 1 diamond
+	then:
+		complete objective "remove item from barter drops" for {_test}
+
+	add 1 dirt and 2 dirt to barter drops
+	if:
+		size of barter drops is 4
+		barter drops contains 1 emerald
+		barter drops contains 1 diamond
+		barter drops contains 1 dirt
+		barter drops contains 2 dirt
+	then:
+		complete objective "add multiple items to barter drops" for {_test}
+
+	remove all dirt from barter drops
+	if:
+		size of barter drops is 2
+		barter drops contains 1 emerald
+		barter drops contains 1 diamond
+	then:
+		complete objective "remove all of an item from barter drops" for {_test}
+
+	remove 1 emerald and 1 diamond from barter drops
+	if size of barter drops is 0:
+		complete objective "remove multiple items from barter drops" for {_test}
+
+	complete objective "barter drops test complete" for {_test}
diff --git a/src/test/skript/junit/EvtPlayerInput.sk b/src/test/skript/junit/EvtPlayerInput.sk
new file mode 100644
index 00000000000..87c8822ec93
--- /dev/null
+++ b/src/test/skript/junit/EvtPlayerInput.sk
@@ -0,0 +1,62 @@
+test "EvtPlayerInputJUnit" when running JUnit:
+	running minecraft "1.21.3"
+	set {_tests::1} to "player is pressing event-inputkeys"
+	set {_tests::2} to "inputs of player is event-inputkeys"
+	set {_tests::3} to "past inputs of player is past event-inputkeys"
+	set {_tests::4} to "player is pressing forward key"
+	set {_tests::5} to "player is pressing jump key"
+	set {_tests::6} to "player is pressing forward key and jump key"
+	set {_tests::7} to "player is pressing forward key, sneak key, or backward key"
+	set {_tests::8} to "player is not pressing sneak key"
+	set {_tests::9} to "player is not pressing forward key and sneak key"
+	set {_tests::10} to "player was pressing forward key"
+	set {_tests::11} to "player was not pressing jump key"
+
+	ensure junit test "org.skriptlang.skript.test.tests.syntaxes.events.EvtPlayerInputTest" completes {_tests::*}
+
+parse:
+	results: {EvtPlayerInput::parse::*}
+	code:
+		on toggle of any input key:
+			set {_test} to "org.skriptlang.skript.test.tests.syntaxes.events.EvtPlayerInputTest"
+			junit test is {_test}
+
+			if player is pressing event-inputkeys:
+				complete objective "player is pressing event-inputkeys" for {_test}
+
+			if inputs of player is event-inputkeys:
+				complete objective "inputs of player is event-inputkeys" for {_test}
+
+			if past inputs of player is past event-inputkeys:
+				complete objective "past inputs of player is past event-inputkeys" for {_test}
+
+			if player is pressing forward key:
+				complete objective "player is pressing forward key" for {_test}
+
+			if player is pressing jump key:
+				complete objective "player is pressing jump key" for {_test}
+
+			if player is pressing forward key and jump key:
+				complete objective "player is pressing forward key and jump key" for {_test}
+
+			if player is pressing forward key, sneak key, or backward key:
+				complete objective "player is pressing forward key, sneak key, or backward key" for {_test}
+
+			if player is not pressing sneak key:
+				complete objective "player is not pressing sneak key" for {_test}
+
+			if player is not pressing forward key and sneak key:
+				complete objective "player is not pressing forward key and sneak key" for {_test}
+
+			if player was pressing forward key:
+				complete objective "player was pressing forward key" for {_test}
+
+			if player was not pressing jump key:
+				complete objective "player was not pressing jump key" for {_test}
+
+test "EvtPlayerInput":
+	if running minecraft "1.21.3":
+		assert {EvtPlayerInput::parse::*} is not set with "Player input event failed to parse in 1.21.3 and above"
+	else:
+		assert {EvtPlayerInput::parse::*} is set with "Player input event successfully parsed in 1.21.2 and below"
+
diff --git a/src/test/skript/junit/EvtVehicleCollisionTest.sk b/src/test/skript/junit/EvtVehicleCollisionTest.sk
new file mode 100644
index 00000000000..e00f22c774c
--- /dev/null
+++ b/src/test/skript/junit/EvtVehicleCollisionTest.sk
@@ -0,0 +1,43 @@
+options:
+	test: "org.skriptlang.skript.test.tests.syntaxes.events.EvtVehicleCollisionTest"
+
+test "EvtVehicleCollisionJUnit" when running JUnit:
+	set {_tests::*} to "any collision", "any collision - obsidian" and "any collision - sheep"
+	add "any block collision", "block collision - obsidian" and "obsidian collision" to {_tests::*}
+	add "any entity collision", "entity collision - sheep" and "sheep collision" to {_tests::*}
+	ensure junit test {@test} completes {_tests::*}
+
+on vehicle collision:
+	junit test is {@test}
+	complete objective "any collision" for junit test {@test}
+	if event-block is obsidian:
+		complete objective "any collision - obsidian" for junit test {@test}
+
+	if event-entity is a sheep:
+		complete objective "any collision - sheep" for junit test {@test}
+
+on vehicle collision with obsidian:
+	junit test is {@test}
+	complete objective "obsidian collision" for junit test {@test}
+
+on vehicle block collision:
+	junit test is {@test}
+	complete objective "any block collision" for junit test {@test}
+
+on vehicle block collision of obsidian:
+	junit test is {@test}
+	if event-block is obsidian:
+		complete objective "block collision - obsidian" for junit test {@test}
+
+on vehicle collision with a sheep:
+	junit test is {@test}
+	complete objective "sheep collision" for junit test {@test}
+
+on vehicle entity collision:
+	junit test is {@test}
+	complete objective "any entity collision" for junit test {@test}
+
+on vehicle entity collision with a sheep:
+	junit test is {@test}
+	if event-entity is a sheep:
+		complete objective "entity collision - sheep" for junit test {@test}
diff --git a/src/test/skript/junit/ExprAffectedEntities.sk b/src/test/skript/junit/ExprAffectedEntities.sk
new file mode 100644
index 00000000000..49f29440f88
--- /dev/null
+++ b/src/test/skript/junit/ExprAffectedEntities.sk
@@ -0,0 +1,27 @@
+on load:
+	set {_tests::1} to "cleared piggies"
+	set {_tests::2} to "add 5 pigs"
+	set {_tests::3} to "remove 2 pigs"
+	set {_tests::4} to "set 4 pigs"
+
+	ensure junit test "org.skriptlang.skript.test.tests.syntaxes.expressions.ExprAffectedEntitiesTest" completes {_tests::*}
+
+on area effect:
+	set {_test} to "org.skriptlang.skript.test.tests.syntaxes.expressions.ExprAffectedEntitiesTest"
+	junit test is {_test}
+	clear affected entities
+	spawn 5 pigs at spawn of world "world":
+		add entity to {_pigs::*}
+	add {_pigs::*} to affected entities
+	if size of affected entities = 5:
+		complete objective "add 5 pigs" for junit test {_test}
+	remove (elements from 1 to 2 of {_pigs::*}) from affected entities
+	if size of affected entities = 3:
+		complete objective "remove 2 pigs" for junit test {_test}
+	set affected entities to (elements from 1 to 4 of {_pigs::*})
+	if size of affected entities = 4:
+		complete objective "set 4 pigs" for junit test {_test}
+	clear affected entities
+	if size of affected entities = 0:
+		complete objective "cleared piggies" for junit test {_test}
+	clear entities within {_pigs::*}
diff --git a/src/test/skript/junit/ExprHoverList.sk b/src/test/skript/junit/ExprHoverList.sk
new file mode 100644
index 00000000000..cde73ea7015
--- /dev/null
+++ b/src/test/skript/junit/ExprHoverList.sk
@@ -0,0 +1,44 @@
+test "ExprHoverListJUnit" when running JUnit:
+	set {_test} to "org.skriptlang.skript.test.tests.syntaxes.expressions.ExprHoverListTest"
+
+	set {_tests::1} to "clear hover list"
+	set {_tests::2} to "set hover list"
+	set {_tests::3} to "add multiple items to hover list"
+	set {_tests::4} to "remove item from hover list"
+	set {_tests::5} to "reset hover list"
+
+	ensure junit test {_test} completes {_tests::*}
+
+on server list ping:
+	set {_test} to "org.skriptlang.skript.test.tests.syntaxes.expressions.ExprHoverListTest"
+	junit test is {_test}
+
+	clear hover list
+	if size of hover list is 0:
+		complete objective "clear hover list" for {_test}
+
+	set hover list to "hello"
+	if hover list is "hello":
+		complete objective "set hover list" for {_test}
+
+	add "world" to hover list
+	add "aghalfgdfalkhgj" to hover list
+	if:
+		size of hover list is 3
+		hover list contains "hello"
+		hover list contains "world"
+		hover list contains "aghalfgdfalkhgj"
+	then:
+		complete objective "add multiple items to hover list" for {_test}
+
+	remove "aghalfgdfalkhgj" from hover list
+	if:
+		size of hover list is 2
+		hover list contains "hello"
+		hover list contains "world"
+	then:
+		complete objective "remove item from hover list" for {_test}
+
+	reset hover list
+	if size of hover list is 0:
+		complete objective "reset hover list" for {_test}
diff --git a/src/test/skript/junit/ExprLootContextLooter.sk b/src/test/skript/junit/ExprLootContextLooter.sk
new file mode 100644
index 00000000000..31364456b06
--- /dev/null
+++ b/src/test/skript/junit/ExprLootContextLooter.sk
@@ -0,0 +1,22 @@
+options:
+	test: "org.skriptlang.skript.test.tests.syntaxes.expressions.ExprLootContextLooterTest"
+
+test "ExprLootContextKillerJUnit" when running JUnit:
+	set {_tests::1} to "set killer"
+	set {_tests::2} to "clear killer"
+	ensure junit test {@test} completes {_tests::*}
+
+on join:
+	junit test is {@test}
+
+	set {_player} to player
+	set {_context} to a loot context at player's location:
+		set looter to {_player}
+
+		if looter is {_player}:
+			complete objective "set killer" for {@test}
+
+		reset looter
+
+		if looter is not set:
+			complete objective "clear killer" for {@test}
diff --git a/src/test/skript/junit/PlayerElytraBoostEventTest.sk b/src/test/skript/junit/PlayerElytraBoostEventTest.sk
new file mode 100644
index 00000000000..bcd57eb9b30
--- /dev/null
+++ b/src/test/skript/junit/PlayerElytraBoostEventTest.sk
@@ -0,0 +1,16 @@
+options:
+	test: "org.skriptlang.skript.test.tests.syntaxes.events.PlayerElytraBoostEventTest"
+
+test "PlayerElytraBoostEventTest" when running JUnit:
+	set {_tests::*} to "boost event called", "boost event - firework item", "boost event - player" and "boost event - firework entity"
+	ensure junit test {@test} completes {_tests::*}
+
+on elytra boost:
+	junit test is {@test}
+	complete objective "boost event called" for {@test}
+	if event-item is a firework rocket:
+		complete objective "boost event - firework item" for {@test}
+	if event-entity is a firework:
+		complete objective "boost event - firework entity" for {@test}
+	if event-player is set:
+		complete objective "boost event - player" for {@test}
diff --git a/src/test/skript/tests/misc/-disabled.sk b/src/test/skript/tests/misc/-disabled.sk
new file mode 100644
index 00000000000..e36f0fdf1fb
--- /dev/null
+++ b/src/test/skript/tests/misc/-disabled.sk
@@ -0,0 +1,2 @@
+on script load:
+	set {EffScriptFile} to true
diff --git a/src/test/skript/tests/misc/angle.sk b/src/test/skript/tests/misc/angle.sk
new file mode 100644
index 00000000000..f6deadfb12a
--- /dev/null
+++ b/src/test/skript/tests/misc/angle.sk
@@ -0,0 +1,33 @@
+test "angle":
+	assert 90 degrees is 90 with "90 degrees is not 90"
+	assert -10.5 degrees is -10.5 with "-10.5 degrees is not -10.5"
+	assert 354698306983560 degrees is 354698306983560 with "354698306983560 degrees is not 354698306983560"
+
+	assert pi radians is 180.0 degrees with "pi radians is not 180 degrees"
+	assert 2 * pi in radians is 360.0 degrees with "2pi radians is not 360 degrees"
+
+	assert 180.0 degrees is pi radians with "180 degrees is not pi radians"
+	assert 360.0 in degrees is 2 * pi radians with "360 degrees is not 2pi radians"
+
+	assert infinity value degrees is infinity value with "infinity degrees is not infinity"
+	assert -infinity value degrees is -infinity value with "-infinity degrees is not -infinity"
+	assert infinity value radians is infinity value with "infinity radians is not infinity"
+	assert -infinity value radians is -infinity value with "-infinity radians is not -infinity"
+
+	assert ("90 degrees" parsed as number) is 90 with "90 degrees parsed as number is not 90"
+	assert ("3.141592653589793 radians" parsed as number) is 180.0 with "pi radians parsed as number is not 180 degrees"
+	assert ("90 degrees" parsed as number) is 90 degrees with "90 degrees parsed as number is not 90 degrees"
+	assert ("3.141592653589793 radians" parsed as number) is 180.0 degrees with "pi radians parsed as number is not 180 degrees"
+	assert ("90 degrees" parsed as number) is 0.5 * pi radians with "90 degrees parsed as number is not 0.5pi radians"
+	assert ("3.141592653589793 radians" parsed as number) is pi radians with "pi radians parsed as number is not pi radians"
+
+	assert 90, 180 and 270 in degrees is 90, 180 and 270 with "90, 180 and 270 degrees is not 90, 180 and 270"
+	assert 0.5 * pi, pi and 1.5 * pi in radians is 90.0, 180.0 and 270.0 with "0.5pi, pi and 1.5pi radians is not 90, 180 and 270"
+
+	assert ("n" parsed as number) degrees is not set with "'n' parsed as number degrees is set"
+	assert ("n" parsed as number) radians is not set with "'n' parsed as number radians is set"
+	assert ("n degrees" parsed as number) is not set with "'n' parsed as number degrees is set"
+	assert ("n radians" parsed as number) is not set with "'n' parsed as number radians is set"
+
+	assert isNaN(NaN value degrees) is true with "NaN degrees is not NaN"
+	assert isNaN(NaN value radians) is true with "NaN radians is not NaN"
diff --git a/src/test/skript/tests/misc/boats.sk b/src/test/skript/tests/misc/boats.sk
new file mode 100644
index 00000000000..bfb29e0a5e1
--- /dev/null
+++ b/src/test/skript/tests/misc/boats.sk
@@ -0,0 +1,51 @@
+
+test "boats":
+	set {_boats::*} to "oak boat", "birch boat", "spruce boat", "jungle boat", "acacia boat", "dark oak boat", and "mangrove boat"
+	parse if running minecraft "1.20.4":
+		add "cherry boat" and "bamboo raft" to {_boats::*}
+	# enable when fully released
+	# parse if running minecraft "1.21.3":
+		# add "pale oak boat" to {_boats::*}
+
+	loop {_boats::*}:
+		set {_parse} to loop-value parsed as entity type
+		if {_parse} is set:
+			spawn {_parse} at spawn of "world":
+				set {_boat} to entity
+
+			assert {_boat} is set with "Failed to spawn %loop-value%"
+			set {_a boat} to "a boat" parsed as entity type
+			set {_a boat item} to "%loop-value%" parsed as item type
+			assert {_boat} is {_a boat} with "%loop-value% was not a boat"
+			assert {_boat} is {_a boat item} with "%loop-value% did not match a boat item"
+
+			clear entity within {_boat}
+			clear {_boat}
+		else:
+			assert false is true with "Failed to parse '%loop-value%' as an entity type", expected loop-value, got {_parse}
+
+
+test "chest boats":
+	set {_boats::*} to "oak chest boat", "birch chest boat", "spruce chest boat", "jungle chest boat", "acacia chest boat", "dark oak chest boat", and "mangrove chest boat"
+	parse if running minecraft "1.20.4":
+		add "cherry chest boat" and "bamboo chest raft" to {_boats::*}
+	# enable when fully released
+	# parse if running minecraft "1.21.3":
+		# add "pale oak chest boat" to {_boats::*}
+
+	loop {_boats::*}:
+		set {_parse} to loop-value parsed as entity type
+		if {_parse} is set:
+			spawn {_parse} at spawn of "world":
+				set {_boat} to entity
+
+			assert {_boat} is set with "Failed to spawn %loop-value%"
+			set {_a chest boat} to "a chest boat" parsed as entity type
+			set {_a chest boat item} to "%loop-value%" parsed as item type
+			assert {_boat} is {_a chest boat} with "%loop-value% was not a chest boat"
+			assert {_boat} is {_a chest boat item} with "%loop-value% did not match a chest boat item"
+
+			clear entity within {_boat}
+			clear {_boat}
+		else:
+			assert false is true with "Failed to parse '%loop-value%' as an entity type", expected loop-value, got {_parse}
diff --git a/src/test/skript/tests/misc/default variables.sk b/src/test/skript/tests/misc/default variables.sk
index 3097e25aab3..bebdc75a69a 100644
--- a/src/test/skript/tests/misc/default variables.sk	
+++ b/src/test/skript/tests/misc/default variables.sk	
@@ -8,7 +8,7 @@ variables:
 	{testing::regression::%offlineplayer%} = 1337
 
 on test "default variables":
-	spawn a pig at spawn of world "world"
+	spawn a pig at test-location
 	assert {testing::variables1::%last spawned pig%} is 1337 with "default variable 1 failed"
 
 	set {_string} to "empty string"
diff --git a/src/test/skript/tests/misc/displaydata.sk b/src/test/skript/tests/misc/displaydata.sk
new file mode 100644
index 00000000000..cf31458bf2b
--- /dev/null
+++ b/src/test/skript/tests/misc/displaydata.sk
@@ -0,0 +1,68 @@
+test "display entity data":
+	spawn a text display at spawn of world "world":
+		set {_text} to entity
+
+	spawn a block display at spawn of world "world":
+		set {_block} to entity
+
+	spawn an item display at spawn of world "world":
+		set {_item} to entity
+
+	assert {_text} is a display with "text display was not a display"
+	assert {_text} is a text display with "text display was not a text display"
+	assert {_text} is not an item display with "text display was an item display"
+	assert {_text} is not a block display with "text display was a block display"
+
+	assert {_block} is a display with "block display was not a display"
+	assert {_block} is a block display with "block display was not a block display"
+	assert {_block} is not an item display with "block display was an item display"
+	assert {_block} is not a text display with "block display was a text display"
+
+	assert {_item} is a display with "item display was not a display"
+	assert {_item} is a item display with "item display was not an item display"
+	assert {_item} is not an text display with "item display was a text display"
+	assert {_item} is not a block display with "item display was a block display"
+
+	spawn a block display of a spruce log at spawn of world "world":
+		set {_block1} to entity
+
+	assert size of block displays is 2 with "did not find all block displays"
+
+	spawn a red bed block display at spawn of world "world":
+		set {_block2} to entity
+
+	assert size of block displays is 3 with "did not find all block displays"
+	assert size of block displays of a spruce log is 1 with "did not find correct amount of spruce block displays"
+	assert size of red bed block displays is 1 with "did not find correct amount of block display of a red beds"
+
+	assert {_block2} is a display with "block display was not a display"
+	assert {_block2} is a block display with "block display was not a block display"
+	assert {_block2} is not a block display of a spruce log with "block display of a red bed was a block display of a spruce log"
+	assert {_block2} is a block display of a red bed with "block display of a red bed was not a block display of a red bed"
+	assert {_block2} is not an item display with "block display was an item display"
+	assert {_block2} is not a text display with "block display was a text display"
+
+	spawn an item display of an oak log at spawn of world "world":
+		set {_item1} to entity
+
+	spawn a item display of a diamond at spawn of world "world":
+		set {_item2} to entity
+
+	assert size of item displays is 3 with "did not find all item displays"
+	assert size of item displays of oak log is 1 with "did not find correct amount of spruce item displays of oak logs"
+	assert size of item displays of diamond is 1 with "did not find correct amount of item displays of diamonds"
+
+	assert {_item2} is a display with "item display was not a display"
+	assert {_item2} is a item display with "item display was not a item display"
+	assert {_item2} is not an item display of an oak log with "item display of a diamond was an oak log block display"
+	assert {_item2} is a diamond item display with "item display of a diamond was not a diamond block display"
+	assert {_item2} is not a block display with "item display was a block display"
+	assert {_item2} is not a text display with "item display was a text display"
+
+	delete display within {_text}
+	delete display within {_item}
+	delete display within {_item1}
+	delete display within {_item2}
+	delete display within {_block}
+	delete display within {_block1}
+	delete display within {_block2}
diff --git a/src/test/skript/tests/misc/displays.sk b/src/test/skript/tests/misc/displays.sk
new file mode 100644
index 00000000000..c4f7427fcaa
--- /dev/null
+++ b/src/test/skript/tests/misc/displays.sk
@@ -0,0 +1,17 @@
+test "spawn displays":
+	spawn a text display at spawn of world "world":
+		set {_display} to event-display
+	assert billboard of display within {_display} is "fixed" parsed as billboard with "default billboard was not fixed"
+	set billboard of display within {_display} to "center" parsed as billboard
+	assert billboard of display within {_display} is center with "failed to set billboard to center"
+	clear all entities
+	spawn a block display at spawn of world "world":
+		set block data of event-display to grass_block[snowy=true]
+		set {_display} to event-display
+	assert block data of display within {_display} is grass_block[snowy=true] with "failed to compare block display block data"
+	spawn an item display of a diamond sword of sharpness at spawn of world "world":
+		assert item transform of event-display is no transform with "item transform was not default"
+		set item transform of event-display to head
+		assert item transform of event-display is head with "failed to set item transform to head"
+		assert item of event-display is a diamond sword of sharpness with "failed to compare against the item of the display %item of display%"
+	clear all entities
diff --git a/src/test/skript/tests/misc/dummy.sk b/src/test/skript/tests/misc/dummy.sk
index d31e8fd53b7..70ef5461ab2 100644
--- a/src/test/skript/tests/misc/dummy.sk
+++ b/src/test/skript/tests/misc/dummy.sk
@@ -1,2 +1,6 @@
 test "redundant":
 	assert "true" is "true" with "logic failed"
+
+local function testDummy() :: boolean:
+	return true
+	# this is used by another test
diff --git a/src/test/skript/tests/misc/expression sections.sk b/src/test/skript/tests/misc/expression sections.sk
new file mode 100644
index 00000000000..c68567f9c58
--- /dev/null
+++ b/src/test/skript/tests/misc/expression sections.sk	
@@ -0,0 +1,53 @@
+test "expression sections":
+	set {_var} to false
+	set {_runnable} to a new runnable:
+		set {_var} to true
+
+	assert {_var} is false with "expression section ran too early!"
+
+	run {_runnable}
+	assert {_var} is true with "expression section didn't run!"
+
+	# try it again in case it stops working for some reason
+	set {_var} to false
+	run {_runnable}
+	assert {_var} is true with "expression section didn't run again!"
+
+	# section in a section!
+	set {_runnable} to a new runnable:
+		set {_runnable2} to a new runnable:
+			set {_var} to true
+		run {_runnable2}
+	set {_var} to false
+	run {_runnable}
+	assert {_var} is true with "expression section in expression section didn't run"
+
+	# test proper logging behavior
+	parse:
+		set {_runnable} to a new runnable:
+			made up line
+			stop
+	assert size of last parse logs is 1 with "expected only one error for an invalid statement"
+	assert last parse logs contain "Can't understand this condition/effect: made up line"
+
+test "expression sections that don't work":
+	# Section with no section expression!
+	set {_expected} to "The line 'set {_var} to true' is a valid statement but cannot function as a section (:) because there is no syntax in the line to manage it."
+	parse:
+		set {_var} to true:
+			broadcast "NO BAD"
+	assert last parse logs contain {_expected} with "section was allowed with no header syntax"
+
+	# Multiple section expressions in one line!
+	set {_expected} to "The syntax 'a new runnable' tried to claim the current section, but it was already claimed by 'a new runnable'. You cannot have two section-starters in the same line."
+	parse:
+		set {_list::*} to a new runnable, a new runnable and a new runnable:
+			broadcast "NO BAD"
+	assert last parse logs contain {_expected} with "section was allowed with multiple headers"
+
+	# Regular section and a section expression in one line!
+	set {_expected} to "The syntax 'if {_var} is equal to a new runnable' tried to claim the current section, but it was already claimed by 'a new runnable'. You cannot have two section-starters in the same line."
+	parse:
+		if {_var} is a new runnable:
+			broadcast "NO BAD"
+	assert last parse logs contain {_expected} with "section was allowed with multiple headers"
diff --git a/src/test/skript/tests/misc/item data serialization.sk b/src/test/skript/tests/misc/item data serialization.sk
index d79e1713e62..4921971582f 100644
--- a/src/test/skript/tests/misc/item data serialization.sk	
+++ b/src/test/skript/tests/misc/item data serialization.sk	
@@ -1,6 +1,6 @@
 test "item data serialization":
 
 	# No assertion needed, it will be done internally
-	set {a::1} to a dirt block named "DIRT" with lore "LORE1" and "LORE2"
+	set {a::1} to a dirt named "DIRT" with lore "LORE1" and "LORE2"
 
 	delete {a::1}
diff --git a/src/test/skript/tests/misc/keyed set mode.sk b/src/test/skript/tests/misc/keyed set mode.sk
new file mode 100644
index 00000000000..513f897fedd
--- /dev/null
+++ b/src/test/skript/tests/misc/keyed set mode.sk	
@@ -0,0 +1,29 @@
+test "keyed set mode":
+	# we have a `test key values [of %list%]` syntax for testing key preservation
+
+	set {_list::*} to test key values
+
+	# expecting hello -> there, foo -> bar, a -> b
+	assert size of {_list::*} is 3 with "something wasn't set properly"
+	assert {_list::hello} is "there" with "key/value set not matched: %indices of {_list::*}% -> %{_list::*}%"
+	assert {_list::foo} is "bar" with "key/value set not matched: %indices of {_list::*}% -> %{_list::*}%"
+	assert {_list::a} is "b" with "key/value set not matched: %indices of {_list::*}% -> %{_list::*}%"
+
+	# expecting reversion to numeric indices
+	set {_list 2::*} to {_list::*}
+	assert size of {_list 2::*} is 3 with "something wasn't carried properly"
+	assert {_list 2::hello} is not "there" with "keys were preserved in list -> list set"
+	assert {_list 2::foo} is not "bar" with "keys were preserved in list -> list set"
+	assert {_list 2::a} is not "b" with "keys were preserved in list -> list set"
+
+	delete {_list::*}
+	delete {_list 2::*}
+
+	set {_list::alice} to "bob"
+	set {_list::hello} to "world"
+	set {_list 2::*} to test key values of {_list::*}
+
+	# expecting preservation of keys
+	assert size of {_list 2::*} is 2 with "something wasn't carried properly"
+	assert {_list 2::alice} is "bob" with "keys were not preserved, %indices of {_list 2::*}% -> %{_list 2::*}%"
+	assert {_list 2::hello} is "world" with "keys were not preserved, %indices of {_list 2::*}% -> %{_list 2::*}%"
diff --git a/src/test/skript/tests/misc/legacy script name.sk b/src/test/skript/tests/misc/legacy script name.sk
new file mode 100644
index 00000000000..e5375eadd90
--- /dev/null
+++ b/src/test/skript/tests/misc/legacy script name.sk	
@@ -0,0 +1,7 @@
+options:
+	path: (join ("..", "..", "..", "..", "..", "..", "src", "test", "skript", "tests" and "") by file_separator())
+
+test "script name (old)":
+	set {_name} to the script's name
+	assert the script's name is {@path} + "misc" + file_separator() + "legacy script name" with "script name is wrong"
+	# Original behaviour included the file path and name but not the extension, e.g. `quests/MyQuestScript`
diff --git a/src/test/skript/tests/misc/registry-enum-comparators.sk b/src/test/skript/tests/misc/registry-enum-comparators.sk
new file mode 100644
index 00000000000..511ce65bb70
--- /dev/null
+++ b/src/test/skript/tests/misc/registry-enum-comparators.sk
@@ -0,0 +1,24 @@
+test "registry and enum comparators":
+	# We're using loops because that is when Skript appears to hate comparing things
+	# Example errors when Skript doesn't have explicit comparators:
+	#  'Can't compare a biome with a biome'
+	#  'Can't compare a attribute type with a attribute type'
+
+
+	# Compare registry entries
+	loop all biomes:
+		if loop-value = plains:
+			assert loop-value = plains with "Should be able to compare biomes"
+
+	loop all attribute types:
+		if loop-value = generic movement speed:
+			assert loop-value = generic movement speed with "Should be able to compare attribute types"
+
+	# Compare enum entries
+	loop all teleport causes:
+		if loop-value = ender pearl:
+			assert loop-value = ender pearl with "Should be able to compare teleport causes"
+
+	loop all spawn reasons:
+		if loop-value = jockey:
+			assert loop-value = jockey with "Should be able to compare spawn reasons"
diff --git a/src/test/skript/tests/misc/registry.sk b/src/test/skript/tests/misc/registry.sk
index 2294472fbae..7181d5ce8ec 100644
--- a/src/test/skript/tests/misc/registry.sk
+++ b/src/test/skript/tests/misc/registry.sk
@@ -1,4 +1,4 @@
-test "registry" when minecraft version is "1.14":
+test "registry":
 
 	# Test namespaced keys
 	assert curse of vanishing = minecraft:vanishing_curse with "'curse of vanishing' enchant should match namespace key"
@@ -6,3 +6,14 @@ test "registry" when minecraft version is "1.14":
 	# Test serialization
 	set {test::enchantment} to minecraft:sharpness
 	assert {test::enchantment} = sharpness with "variable should have been set to sharpness enchantment"
+
+	# Test other registry items
+	assert minecraft:nether_wastes = nether wastes with "Biome should be in registry"
+
+	parse if running minecraft "1.21.2":
+		assert minecraft:movement_speed = movement speed with "Attribute should be in registry"
+	parse if running below minecraft "1.21.2":
+		assert minecraft:generic.movement_speed = movement speed with "Attribute should be in registry"
+
+	parse if running minecraft "1.20.5":
+		assert minecraft:ashen = ashen with "Wolf variants should be in registry"
diff --git a/src/test/skript/tests/misc/supported events.sk b/src/test/skript/tests/misc/supported events.sk
new file mode 100644
index 00000000000..f0cfc2f8a16
--- /dev/null
+++ b/src/test/skript/tests/misc/supported events.sk	
@@ -0,0 +1,5 @@
+test "supported events":
+	parse:
+		set {_x} to the exploded blocks
+
+	assert last parse logs contain "'the exploded blocks' can only be used in the entity explode event" with "supported events message did not get sent correctly"
diff --git a/src/test/skript/tests/misc/test expressions.sk b/src/test/skript/tests/misc/test expressions.sk
new file mode 100644
index 00000000000..f212bae8352
--- /dev/null
+++ b/src/test/skript/tests/misc/test expressions.sk	
@@ -0,0 +1,8 @@
+test "test world":
+	assert test world is world "world" with "test world was not world 'world'"
+
+test "test location":
+	assert test location is spawn of test world ~ vector(0, 1, 0) with "test location was not spawn location ~ (0, 1, 0)"
+
+test "test block":
+	assert location of test block is block at (spawn of test world ~ vector(10, 1, 0)) with "test block was not block at spawn location ~ (10, 1, 0)"
diff --git a/src/test/skript/tests/misc/timespans.sk b/src/test/skript/tests/misc/timespans.sk
new file mode 100644
index 00000000000..e6a81c60918
--- /dev/null
+++ b/src/test/skript/tests/misc/timespans.sk
@@ -0,0 +1,50 @@
+command /testtimespan <timespan>:
+	trigger:
+		set {timespan} to arg-1
+
+test "timespans":
+
+	execute command "/testtimespan 1 day"
+	assert {timespan} is "1 day" parsed as timespan with "%{timespan}% doesn't equal 1 day!"
+
+	execute command "/testtimespan 2 hours"
+	assert {timespan} is "2 hours" parsed as timespan with "%{timespan}% doesn't equal 2 hours!"
+
+	execute command "/testtimespan 30 minutes"
+	assert {timespan} is "30 minutes" parsed as timespan with "%{timespan}% doesn't equal 30 minutes!"
+
+	execute command "/testtimespan 1d"
+	assert {timespan} is "1 day" parsed as timespan with "%{timespan}% doesn't equal 1 day!"
+
+	execute command "/testtimespan 2h"
+	assert {timespan} is "2 hours" parsed as timespan with "%{timespan}% doesn't equal 2 hours!"
+
+	execute command "/testtimespan 30m"
+	assert {timespan} is "30 minutes" parsed as timespan with "%{timespan}% doesn't equal 30 minutes!"
+
+	execute command "/testtimespan 30m and 20s"
+	assert {timespan} is "30 minutes and 20 seconds" parsed as timespan with "%{timespan}% doesn't equal 30 minutes and 20 seconds!"
+
+	execute command "/testtimespan 50 minutes and 45 seconds"
+	assert {timespan} is "50 minutes 45 seconds" parsed as timespan with "%{timespan}% doesn't equal 50 minutes and 45 seconds!"
+
+	execute command "/testtimespan 1d 6h"
+	assert {timespan} is "1 day 6 hours" parsed as timespan with "%{timespan}% doesn't equal 1 day and 6 hours!"
+
+	execute command "/testtimespan 2 weeks 3d 12 hours"
+	assert {timespan} is "2 weeks 3 days 12 hours" parsed as timespan with "%{timespan}% doesn't equal 2 weeks, 3 days and 12 hours!"
+
+	execute command "/testtimespan 1.5d"
+	assert {timespan} is "1 day and 12 hours" parsed as timespan with "%{timespan}% doesn't equal 1 day and 12 hours!"
+
+	execute command "/testtimespan 2.5h"
+	assert {timespan} is "2 hours and 30 minutes" parsed as timespan with "%{timespan}% doesn't equal 2 hours and 30 minutes!"
+
+	execute command "/testtimespan invalidinput"
+	assert {timespan} is "invalid" parsed as timespan to fail with "%{timespan}% was incorrectly parsed!"
+
+	execute command "/testtimespan 1mo 2w 3d 4h 5m 6s"
+	assert {timespan} is "1 month, 2 weeks, 3 days, 4 hours, 5 minutes and 6 seconds" parsed as timespan with "%{timespan}% doesn't equal 1 month, 2 weeks, 3 days, 4 hours, 5 minutes and 6 seconds!"
+
+	execute command "/testtimespan 9999999999d"
+	assert {timespan} is "9999999999 days" parsed as timespan with "%{timespan}% doesn't equal 9999999999 days!"
diff --git a/src/test/skript/tests/misc/underscores in numbers.sk b/src/test/skript/tests/misc/underscores in numbers.sk
new file mode 100644
index 00000000000..20028f917d3
--- /dev/null
+++ b/src/test/skript/tests/misc/underscores in numbers.sk	
@@ -0,0 +1,44 @@
+test "underscores in numbers":
+	assert 1 is a number with "1 is not a number"
+	assert -1 is a number with "-1 is not a number"
+	assert 1.236 is a number with "1.236 is not a number"
+	assert -1.236 is a number with "1.236 is not a number"
+	assert 1234567890 is a number with "1234567890 is not a number"
+	assert -1234567890 is a number with "-1234567890 is not a number"
+
+	assert 1_23_456 is 123456 with "1_23_456 is not 123456"
+	assert -1_23_456 is -123456 with "-1_23_456 is not -123456"
+	assert 1_23_4 is 1234 with "1_23_4 is not 1234"
+	assert -1_23_4 is -1234 with "-1_23_4 is not -1234"
+
+	assert 1_2.3_456 is 12.3456 with "1_2.3_456 is not 12.3456"
+	assert -1_2.3_456 is -12.3456 with "-1_2.3_456 is not -12.3456"
+	assert 1_2.3_4 is 12.34 with "1_2.3_4 is not 12.34"
+	assert -1_2.3_4 is -12.34 with "-1_2.3_4 is not -12.34"
+
+	assert 1_23_456_65665_7354 is 123456656657354 with "1_23_456_65665_7354 is not 123456656657354"
+	assert -1_23_456_65665_7354 is -123456656657354 with "-1_23_456_65665_7354 is not -123456656657354"
+
+	assert 1_23_4% is 1234/100 with "1_23_4%% is not 1234/100"
+	assert -1_23_4% is -1234/100 with "-1_23_4%% is not -1234/100"
+	assert 1_2.3_4% is 12.34/100 with "1_2.3_4%% is not 12.34/100"
+	assert -1_2.3_4% is -12.34/100 with "-1_2.3_4%% is not -12.34/100"
+
+	assert ("1__00" parsed as number) is not a number with "1__00 is a number"
+	assert ("1.2__3_6" parsed as number) is not a number with "1.2__3_6 is a number"
+	assert ("1.2__3_6%%" parsed as number) is not a number with "1.2__3_6%% is a number"
+
+	assert ("_1" parsed as number) is not a number with "_1 is a number"
+	assert ("_1.2_3_6" parsed as number) is not a number with "_1.2_3_6 is a number"
+	assert ("___1" parsed as number) is not a number with "___1 is a number"
+	assert ("___1.2_3_6" parsed as number) is not a number with "___1.2_3_6 is a number"
+
+	assert ("1_" parsed as number) is not a number with "1_ is a number"
+	assert ("1.2_3_6_" parsed as number) is not a number with "1.2_3_6_ is a number"
+	assert ("1___" parsed as number) is not a number with "1___ is a number"
+	assert ("1.2_3_6___" parsed as number) is not a number with "1.2_3_6___ is a number"
+
+	assert ("_1_" parsed as number) is not a number with "_1_ is a number"
+	assert ("_1.2_3_6_" parsed as number) is not a number with "_1.2_3_6_ is a number"
+	assert ("___1___" parsed as number) is not a number with "___1___ is a number"
+	assert ("___1.2_3_6___" parsed as number) is not a number with "___1.2_3_6___ is a number"
diff --git a/src/test/skript/tests/misc/unicode.sk b/src/test/skript/tests/misc/unicode.sk
new file mode 100644
index 00000000000..3a6e9ba7816
--- /dev/null
+++ b/src/test/skript/tests/misc/unicode.sk
@@ -0,0 +1,6 @@
+test "unicode":
+	assert "<unicode:00A7>" is "§" with "single symbol did not get replaced"
+	assert "<u:00A7>" is "§" with "single short symbol did not get replaced"
+
+	assert "a<unicode:1F41B>B" is "a🐛B" with "symbol did not get replaced"
+	assert "a<u:1F41B>B" is "a🐛B" with "short symbol did not get replaced"
diff --git a/src/test/skript/tests/regressions/2535-foxdata fixes.sk b/src/test/skript/tests/regressions/2535-foxdata fixes.sk
index f5eb10a0a39..926e164a002 100644
--- a/src/test/skript/tests/regressions/2535-foxdata fixes.sk	
+++ b/src/test/skript/tests/regressions/2535-foxdata fixes.sk	
@@ -1,4 +1,4 @@
-test "fox EntityData fixes" when running minecraft "1.15.2":
+test "fox EntityData fixes":
 	spawn red fox at location(0, 64, 0, world "world")
 	spawn 3 snow foxes at location(0, 64, 0, world "world")
 	delete all foxes
diff --git a/src/test/skript/tests/regressions/2537-missing mooshroom variations in 1.14+.sk b/src/test/skript/tests/regressions/2537-missing mooshroom variations in 1.14+.sk
index 0265e5c3281..bc7ae656d9c 100644
--- a/src/test/skript/tests/regressions/2537-missing mooshroom variations in 1.14+.sk	
+++ b/src/test/skript/tests/regressions/2537-missing mooshroom variations in 1.14+.sk	
@@ -1,4 +1,4 @@
-test "mooshroom EntityData fixes" when running minecraft "1.15.2":
+test "mooshroom EntityData fixes":
 	spawn brown mooshroom at location(0, 64, 0, world "world")
 	spawn 3 red mooshrooms at location(0, 64, 0, world "world")
 	delete all mooshrooms
diff --git a/src/test/skript/tests/misc/2584-HealthUtils - update.sk b/src/test/skript/tests/regressions/2584-health-utils-update.sk
similarity index 90%
rename from src/test/skript/tests/misc/2584-HealthUtils - update.sk
rename to src/test/skript/tests/regressions/2584-health-utils-update.sk
index 3ecd5dfd764..e746f39c3cc 100644
--- a/src/test/skript/tests/misc/2584-HealthUtils - update.sk	
+++ b/src/test/skript/tests/regressions/2584-health-utils-update.sk
@@ -1,5 +1,5 @@
 on test "health utils update":
-	spawn a pig at spawn of world "world"
+	spawn a pig at test-location
 	set {_pig} to last spawned pig
 	set max health of {_pig} to 20
 	set health of {_pig} to 20
diff --git a/src/test/skript/tests/regressions/2625-villager comparisons.sk b/src/test/skript/tests/regressions/2625-villager comparisons.sk
index 14c30e09572..7b0961b158e 100644
--- a/src/test/skript/tests/regressions/2625-villager comparisons.sk	
+++ b/src/test/skript/tests/regressions/2625-villager comparisons.sk	
@@ -1,4 +1,4 @@
-test "villager comparisons" when running minecraft "1.15.2":
+test "villager comparisons":
 	spawn cleric at location(0, 64, 0, world "world")
 	assert last spawned entity is a cleric with "comparison failed"
 	delete last spawned entity
diff --git a/src/test/skript/tests/regressions/2711-item-compares.sk b/src/test/skript/tests/regressions/2711-item-compares.sk
index 064f6cc7cff..2ef84292444 100644
--- a/src/test/skript/tests/regressions/2711-item-compares.sk
+++ b/src/test/skript/tests/regressions/2711-item-compares.sk
@@ -1,5 +1,10 @@
+aliases:
+	closed birch door = minecraft:birch_door[open=false]
+	any door = birch door, closed birch door
+	any wood door = birch door, closed birch door
+
 test "item comparison":
 	set {_test} to a dragon head
 	assert {_test} is a dragon head with "failed to compare against a head"
-	set {_test} to a door
+	set {_test} to any door
 	assert {_test} is any door, any wood door, birch door or a closed birch door with "failed to compare against a door"
diff --git a/src/test/skript/tests/regressions/3253-entitydata fixes.sk b/src/test/skript/tests/regressions/3253-entitydata fixes.sk
index d4c36542fe1..cd937d01209 100644
--- a/src/test/skript/tests/regressions/3253-entitydata fixes.sk	
+++ b/src/test/skript/tests/regressions/3253-entitydata fixes.sk	
@@ -1,41 +1,40 @@
 test "entity data fixes":
-	spawn a baby zombie at spawn of world "world"
+	spawn a baby zombie at test-location
 	assert last spawned entity is a baby zombie with "last spawned entity should have been a baby zombie"
 	assert last spawned entity is a baby entity with "last spawned entity should have been a baby entity"
 
-	spawn an adult zombie at spawn of world "world"
+	spawn an adult zombie at test-location
 	assert last spawned entity is an adult zombie with "last spawned entity should have been an adult zombie"
 	assert last spawned entity is an adult entity with "last spawned entity should have been an adult entity"
 
-	spawn a baby cow at spawn of world "world"
+	spawn a baby cow at test-location
 	assert last spawned entity is a baby cow with "last spawned entity should have been a baby cow"
 	assert last spawned entity is a baby entity with "last spawned entity should have been a baby entity"
 
-	spawn an adult cow at spawn of world "world"
+	spawn an adult cow at test-location
 	assert last spawned entity is an adult cow with "last spawned entity should have been an adult cow"
 	assert last spawned entity is an adult entity with "last spawned entity should have been an adult entity"
 
-	spawn a baby sheep at spawn of world "world"
+	spawn a baby sheep at test-location
 	assert last spawned entity is a baby sheep with "last spawned entity should have been a baby sheep"
 	assert last spawned entity is a baby entity with "last spawned entity should have been a baby entity"
 
-	spawn an adult sheep at spawn of world "world"
+	spawn an adult sheep at test-location
 	assert last spawned entity is an adult sheep with "last spawned entity should have been an adult sheep"
 	assert last spawned entity is an adult entity with "last spawned entity should have been an adult entity"
 
-test "entity data fixes - 1.16.5" when running minecraft "1.16.5":
-	spawn a baby piglin at spawn of world "world"
+	spawn a baby piglin at test-location
 	assert last spawned entity is a baby piglin with "last spawned entity should have been a baby piglin"
 	assert last spawned entity is a baby entity with "last spawned entity should have been a baby entity"
 
-	spawn an adult piglin at spawn of world "world"
+	spawn an adult piglin at test-location
 	assert last spawned entity is an adult piglin with "last spawned entity should have been an adult piglin"
 	assert last spawned entity is an adult entity with "last spawned entity should have been an adult entity"
 
-	spawn a baby zoglin at spawn of world "world"
+	spawn a baby zoglin at test-location
 	assert last spawned entity is a baby zoglin with "last spawned entity should have been a baby zoglin"
 	assert last spawned entity is a baby entity with "last spawned entity should have been a baby entity"
 
-	spawn an adult zoglin at spawn of world "world"
+	spawn an adult zoglin at test-location
 	assert last spawned entity is an adult zoglin with "last spawned entity should have been an adult zoglin"
 	assert last spawned entity is an adult entity with "last spawned entity should have been an adult entity"
diff --git a/src/test/skript/tests/regressions/3281-itemamount fixes.sk b/src/test/skript/tests/regressions/3281-itemamount fixes.sk
index 38e22889d4c..b8820a089c7 100644
--- a/src/test/skript/tests/regressions/3281-itemamount fixes.sk	
+++ b/src/test/skript/tests/regressions/3281-itemamount fixes.sk	
@@ -1,6 +1,6 @@
 test "item amount fixes":
 	set time in world "world" to night # we dont want our poor zombie to die
-	spawn a zombie at spawn of world "world"
+	spawn a zombie at test-location
 	set {_e} to last spawned zombie
 
 	set {_e}'s tool to dirt
@@ -11,7 +11,7 @@ test "item amount fixes":
 
 	set time in world "world" to day
 
-	drop dirt at location 20 above spawn of world "world"
+	drop dirt at location 20 above test-location
 	set {_d} to last dropped item
 	assert item amount of item of {_d} = 1 with "Item amount of dirt should have been 1"
 	set item amount of item of {_d} to 10
diff --git a/src/test/skript/tests/regressions/3284-itemcrack particle.sk b/src/test/skript/tests/regressions/3284-itemcrack particle.sk
index 470e61948c4..fc3a1b26634 100644
--- a/src/test/skript/tests/regressions/3284-itemcrack particle.sk	
+++ b/src/test/skript/tests/regressions/3284-itemcrack particle.sk	
@@ -1,3 +1,3 @@
 test "item crack particles":
-	set {_loc} to location of spawn of world "world"
+	set {_loc} to test-location
 	play diamond sword item crack at {_loc}
diff --git a/src/test/skript/tests/regressions/3303-item durability.sk b/src/test/skript/tests/regressions/3303-item durability.sk
index acaecccaf8d..352c927b9c6 100644
--- a/src/test/skript/tests/regressions/3303-item durability.sk	
+++ b/src/test/skript/tests/regressions/3303-item durability.sk	
@@ -2,11 +2,3 @@ test "item durability":
 	set {_i} to a diamond sword
 	set durability of {_i} to 500
 	assert durability of {_i} != damage value of {_i} with "Durability of item should not equal damage value"
-
-test "block data value" when running below minecraft "1.13.2":
-	set block at spawn of world "world" to farmland
-	set {_b} to block above block at spawn of world "world"
-	set block at {_b} to fully grown wheat plant
-	assert data value of block at {_b} = 7 with "Data value of block should have been 7"
-	set data value of block at {_b} to 1
-	assert data value of block at {_b} = 1 with "Data value of block should have been 1"
diff --git a/src/test/skript/tests/regressions/3314-chunk is loaded.sk b/src/test/skript/tests/regressions/3314-chunk is loaded.sk
index a3b63bdb12d..d42fa419d61 100644
--- a/src/test/skript/tests/regressions/3314-chunk is loaded.sk	
+++ b/src/test/skript/tests/regressions/3314-chunk is loaded.sk	
@@ -1,6 +1,6 @@
 test "chunk/world is loaded":
 	#Chunks
-	assert chunk at spawn of world "world" is loaded with "chunk at spawn should have been loaded"
+	assert chunk at test-location is loaded with "chunk at spawn should have been loaded"
 	set block at location(16, 1, 16, world "world") to dirt
 	assert chunk at 1, 1 in world "world" is loaded with "chunk at 1, 1 in world should have been loaded"
 	assert chunk at location(16, 1, 16, world "world") is loaded with "chunk at location(1, 1, 1, world ""world"") should be loaded"
diff --git a/src/test/skript/tests/regressions/3419-item comparisons.sk b/src/test/skript/tests/regressions/3419-item comparisons.sk
index fdbba9ef835..7baedff8e9d 100644
--- a/src/test/skript/tests/regressions/3419-item comparisons.sk	
+++ b/src/test/skript/tests/regressions/3419-item comparisons.sk	
@@ -2,13 +2,13 @@ test "item comparisons":
 
 	# Basic Material Comparisons
 
-	set {_a} to a dirt block
+	set {_a} to dirt
 	set {_b} to a diamond block
 
-	assert {_a} is a dirt block with "{_a} is not a dirt block (it should be)"
+	assert {_a} is dirt with "{_a} is not dirt (it should be)"
 	assert {_a} is not a diamond block with "{_a} is a diamond block (it shouldn't be)"
 
-	assert {_b} is not a dirt block with "{_b} is a dirt block (it shouldn't be)"
+	assert {_b} is not dirt with "{_b} is dirt (it shouldn't be)"
 	assert {_b} is a diamond block with "{_b} is not a diamond block (it should be)"
 
 	assert {_a} is not {_b} with "{_a} is {_b} (it shouldn't be) (Basic Material Comparisons)"
@@ -32,18 +32,18 @@ test "item comparisons":
 
 	# Different Enchantment Comparisons
 
-	set {_a} to a dirt block of sharpness 1
-	set {_b} to a dirt block of sharpness 2
+	set {_a} to dirt of sharpness 1
+	set {_b} to dirt of sharpness 2
 
-	assert {_a} is a dirt block with "{_a} is not a dirt block (it should be)"
-	assert {_a} is a dirt block of sharpness 1 with "{_a} is not a dirt block of sharpness 1 (it should be)"
-	assert {_a} is not a dirt block of sharpness 2 with "{_a} is a dirt block of sharpness 2 (it shouldn't be)"
-	assert a dirt block of sharpness 1 is {_a} with "a dirt block of sharpness 1 is not {_a} (it should be)"
+	assert {_a} is dirt with "{_a} is not dirt (it should be)"
+	assert {_a} is dirt of sharpness 1 with "{_a} is not dirt of sharpness 1 (it should be)"
+	assert {_a} is not dirt of sharpness 2 with "{_a} is dirt of sharpness 2 (it shouldn't be)"
+	assert dirt of sharpness 1 is {_a} with "dirt of sharpness 1 is not {_a} (it should be)"
 
-	assert {_b} is a dirt block with "{_b} is not a dirt block (it should be)"
-	assert {_b} is not a dirt block of sharpness 1 with "{_b} is a dirt block of sharpness 1 (it shouldn't be)"
-	assert {_b} is a dirt block of sharpness 2 with "{_b} is not a dirt block of sharpness 2 (it should be)"
-	assert a dirt block of sharpness 1 is not {_b} with "a dirt block of sharpness 1 is {_b} (it shouldn't be)"
+	assert {_b} is dirt with "{_b} is not dirt (it should be)"
+	assert {_b} is not dirt of sharpness 1 with "{_b} is dirt of sharpness 1 (it shouldn't be)"
+	assert {_b} is dirt of sharpness 2 with "{_b} is not dirt of sharpness 2 (it should be)"
+	assert dirt of sharpness 1 is not {_b} with "dirt of sharpness 1 is {_b} (it shouldn't be)"
 
 	assert {_a} is not {_b} with "{_a} is {_b} (it shouldn't be) (Different Enchantment Comparisons"
 	assert {_b} is not {_a} with "{_b} is {_a} (it shouldn't be) (Different Enchantment Comparisons)"
@@ -65,18 +65,18 @@ test "item comparisons":
 	# Skull Comparisons
 
 	set {_a} to a skeleton skull named "Skulliest Skull"
-	set {_b} to an ender dragon skull named "Skully Skull"
+	set {_b} to a dragon head named "Skully Skull"
 
 	assert {_a} is a skeleton skull with "{_a} is not a skeleton skull (it should be)"
 	assert {_a} is not a plain skeleton skull with "{_a} is an unnamed skeleton skull (it shouldn't be)"
 	assert {_a} is a skeleton skull named "Skulliest Skull" with "{_a} is not a skeleton skull named ""Skulliest Skull"" (it should be)"
 
-	assert {_a} is not an ender dragon skull with "{_a} is an ender dragon skull (it should't be)"
-	assert {_a} is not an ender dragon skull named "Skulliest Skull" with "{_a} is an ender dragon skull named ""Skulliest Skull"" (it shouldn't be)"
+	assert {_a} is not a dragon head with "{_a} is a dragon head (it should't be)"
+	assert {_a} is not a dragon head named "Skulliest Skull" with "{_a} is a dragon head named ""Skulliest Skull"" (it shouldn't be)"
 
-	assert {_b} is an ender dragon skull with "{_b} is not an ender dragon skull (it should be)"
-	assert {_b} is not a plain ender dragon skull with "{_b} is an unnamed ender dragon skull (it shouldn't be)"
-	assert {_b} is an ender dragon skull named "Skully Skull" with "{_b} is not an ender dragon skull named ""Skully Skull"" (it should be)"
+	assert {_b} is a dragon head with "{_b} is not a dragon head (it should be)"
+	assert {_b} is not a plain dragon head with "{_b} is an unnamed dragon head (it shouldn't be)"
+	assert {_b} is a dragon head named "Skully Skull" with "{_b} is not a dragon head named ""Skully Skull"" (it should be)"
 
 	assert {_b} is not a skeleton skull with "{_b} is a skeleton skull (it shouldn't be)"
 	assert {_b} is not a skeleton skull named "Skully Skull" with "{_b} is a skeleton skull named ""Skully Skull"" (it shouldn't be)"
@@ -84,30 +84,30 @@ test "item comparisons":
 	assert {_a} is not {_b} with "{_a} is {_b} (it shouldn't be) (Skull Comparisons)"
 	assert {_b} is not {_a} with "{_b} is {_a} (it shouldn't be) (Skull Comparisons)"
 
-	# Player Skull Comparisons
+	# Player Head Comparisons
 
 	set {_p1} to "APickledWalrus" parsed as an offlineplayer
 	set {_p2} to "ShaneBee" parsed as an offlineplayer
 	set {_a} to skull of {_p1}
 	set {_b} to skull of {_p2}
 
-	assert {_a} is a player skull with "{_a} is not a player skull (it should be)"
+	assert {_a} is a player head with "{_a} is not a player head (it should be)"
 	assert {_a} is the skull of {_p1} with "{_a} is not the skull of {_p1} (it should be)"
 	assert {_a} is not the skull of {_p2} with "{_a} is the skull of {_p2} (it shouldn't be)"
 
-	assert {_b} is a player skull with "{_b} is not a player skull (it should be)"
+	assert {_b} is a player head with "{_b} is not a player head (it should be)"
 	assert {_b} is the skull of {_p2} with "{_b} is not the skull of {_p2} (it should be)"
 	assert {_b} is not the skull of {_p1} with "{_b} is the skull of {_p1} (it shouldn't be)"
 
-	assert {_a} is not {_b} with "{_a} is {_b} (it shouldn't be) (Player Skull Comparisons)"
-	assert {_b} is not {_a} with "{_b} is {_a} (it shouldn't be) (Player Skull Comparisons)"
+	assert {_a} is not {_b} with "{_a} is {_b} (it shouldn't be) (Player Head Comparisons)"
+	assert {_b} is not {_a} with "{_b} is {_a} (it shouldn't be) (Player Head Comparisons)"
 
 	# Remove / Remove All Tests
 
-	set block at spawn of world "world" to air
-	set block at spawn of world "world" to a chest
+	set test-block to air
+	set test-block to a chest
 
-	set {_inventory} to inventory of block at spawn of world "world"
+	set {_inventory} to inventory of test-block
 	add 64 diamonds and 64 diamonds named "Fake Diamond" to {_inventory}
 
 	remove 4 of plain diamonds from {_inventory}
@@ -123,7 +123,7 @@ test "item comparisons":
 	remove all diamonds from {_inventory}
 	assert {_inventory} is empty with "{_inventory} still has diamonds, but it shouldn't."
 
-	set block at spawn of world "world" to air
+	set block at test-location to air
 
 	# Different Meta Comparisons
 
@@ -133,24 +133,24 @@ test "item comparisons":
 	assert {_one} is {_two} with "a diamond sword of sharpness 1 named ""TEST"" should be a diamond sword of sharpness 1"
 	assert {_two} is not {_one} with "a diamond sword of sharpness 1 should NOT be a diamond sword of sharpness 1 named ""TEST"""
 
-	set {_three} to a sand block of unbreaking 3 with lore "Sandy Block"
-	set {_four} to a sand block of unbreaking 3
+	set {_three} to sand of unbreaking 3 with lore "Sandy Block"
+	set {_four} to sand of unbreaking 3
 
-	assert {_three} is {_four} with "a sand block of unbreaking 3 with lore ""Sandy Block"" should be a sand block of unbreaking 3"
-	assert {_four} is not {_three} with "a sand block of unbreaking 3 should NOT be a sand block of unbreaking 3 with lore ""Sandy Block"""
+	assert {_three} is {_four} with "sand of unbreaking 3 with lore ""Sandy Block"" should be sand of unbreaking 3"
+	assert {_four} is not {_three} with "sand of unbreaking 3 should NOT be sand of unbreaking 3 with lore ""Sandy Block"""
 
 	# Same material but different data values (1.12 and below) (see https://github.com/SkriptLang/Skript/issues/4643)
 
 
-	set block at spawn of world "world" to a chest
-	set {_inventory} to inventory of block at spawn of world "world"
+	set test-block to a chest
+	set {_inventory} to inventory of test-block
 	add 64 white wool and 64 red wool to {_inventory}
 
 	assert amount of white wool in {_inventory} is 64 with "Inventory doesn't have 64 white wool, but it should (amount found: %amount of white wool in {_inventory}%)"
 	assert amount of red wool in {_inventory} is 64 with "Inventory doesn't have 64 red wool, but it should (amount found: %amount of red wool in {_inventory}%)"
 
 	remove all items from {_inventory}
-	set block at spawn of world "world" to air
+	set test-block to air
 
 	# type comparisons (see https://github.com/SkriptLang/Skript/issues/5693)
 
diff --git a/src/test/skript/tests/regressions/4769-fire-visualeffect.sk b/src/test/skript/tests/regressions/4769-fire-visualeffect.sk
index c490fa9e9cb..cfe83f94713 100644
--- a/src/test/skript/tests/regressions/4769-fire-visualeffect.sk
+++ b/src/test/skript/tests/regressions/4769-fire-visualeffect.sk
@@ -2,9 +2,12 @@ test "fire visual effect comparison":
 	assert a block is a block with "failed to compare block classinfo against block classinfo"
 	assert an itemtype is an itemtype with "failed to compare itemtype classinfo against itemtype classinfo"
 	assert a diamond is an itemtype with "failed to compare itemtype 'diamond' against itemtype classinfo"
+	set {_below} to type of block below block at spawn of world "world"
 	set {_block} to type of block at spawn of world "world"
-	set block at spawn of world "world" to fire
+	set block below block at spawn of world "world" to oak planks
+	set block at spawn of world "world" to fire[]
 	assert block at spawn of world "world" is fire with "failed to compare fire (itemtype) with a block"
+	set block below block at spawn of world "world" to {_below}
 	set block at spawn of world "world" to {_block}
 	play 5 fire at spawn of world "world"
 	assert "fire" parsed as visual effect is fire with "failed to compare visual effects"
diff --git a/src/test/skript/tests/regressions/4773-composter-the-imposter.sk b/src/test/skript/tests/regressions/4773-composter-the-imposter.sk
index 7fb0fdc677e..086df94ca0a 100644
--- a/src/test/skript/tests/regressions/4773-composter-the-imposter.sk
+++ b/src/test/skript/tests/regressions/4773-composter-the-imposter.sk
@@ -1,5 +1,5 @@
-test "composter the imposter" when running minecraft "1.14.4":
-	set {_block} to type of block at spawn of world "world"
-	set block at spawn of world "world" to composter
-	assert block at spawn of world "world" is composter with "failed to compare composter (itemtype) with a block"
-	set block at spawn of world "world" to {_block}
+test "composter the imposter":
+	set {_block} to type of test-block
+	set test-block to composter
+	assert test-block is composter with "failed to compare composter (itemtype) with a block"
+	set test-block to {_block}
diff --git a/src/test/skript/tests/regressions/4988-function uuid multiple parameters.sk b/src/test/skript/tests/regressions/4988-function uuid multiple parameters.sk
index 891acea46c5..8689089c36c 100644
--- a/src/test/skript/tests/regressions/4988-function uuid multiple parameters.sk	
+++ b/src/test/skript/tests/regressions/4988-function uuid multiple parameters.sk	
@@ -2,7 +2,7 @@
 # The exact function from the issue
 local function test(uuid: string, s: string) :: boolean:
 	if {_uuid} is set:
-		if  {_s} is set:
+		if {_s} is set:
 			return true
 	return false
 
diff --git a/src/test/skript/tests/regressions/5345-any-aliases-random.sk b/src/test/skript/tests/regressions/5345-any-aliases-random.sk
index 0fb00edf38d..437bf8d3260 100644
--- a/src/test/skript/tests/regressions/5345-any-aliases-random.sk
+++ b/src/test/skript/tests/regressions/5345-any-aliases-random.sk
@@ -1,9 +1,12 @@
+aliases:
+	any boots = diamond boots, iron boots, golden boots, leather boots
+
 function randomAliases(empty: boolean = true) :: item:
 	return random item out of any boots
 
 test "any aliases random":
 	assert (random itemtype out of 14, a diamond helmet, false and console) is a diamond helmet with "Could not grab the diamond helmet out of the list."
-	assert (random itemtype out of 14, a diamond helmet, a gold helmet, false and console) is any helmet with "Could not grab any helmet out of the list."
+	assert (random itemtype out of 14, a diamond helmet, a golden helmet, false and console) is diamond helmet or golden helmet with "Could not grab any helmet out of the list."
 	assert random item out of any boots is any boots with "Failed to return the same types as the list."
 	set {_list::*} to true, any boots and false
 	assert random number out of {_list::*} is not set with "Failed to error when finding incorrect type."
diff --git a/src/test/skript/tests/regressions/5491-xp orb merge overwrite.sk b/src/test/skript/tests/regressions/5491-xp orb merge overwrite.sk
index c925f51c590..968cdb5f673 100644
--- a/src/test/skript/tests/regressions/5491-xp orb merge overwrite.sk	
+++ b/src/test/skript/tests/regressions/5491-xp orb merge overwrite.sk	
@@ -1,4 +1,4 @@
-test "spawn xp orb overwriting merged value" when running minecraft "1.14.4":
+test "spawn xp orb overwriting merged value":
 	# 1.13.2 seems not to merge xp orbs in the same way, so this test is skipped
 
 	# 1.21 also does not merge orbs, so this test is disabled.
@@ -7,7 +7,7 @@ test "spawn xp orb overwriting merged value" when running minecraft "1.14.4":
 
 	# sanitize
 	kill all xp orbs
-	set {_spawn} to spawn of world "world"
+	set {_spawn} to test-location
 
 	# test drop effect
 	loop 10 times:
diff --git a/src/test/skript/tests/regressions/551-item amount on itemstacks.sk b/src/test/skript/tests/regressions/551-item amount on itemstacks.sk
index 809f5497f94..681764f7410 100644
--- a/src/test/skript/tests/regressions/551-item amount on itemstacks.sk	
+++ b/src/test/skript/tests/regressions/551-item amount on itemstacks.sk	
@@ -1,5 +1,5 @@
 test "item amount of itemstack":
-	set {_loc} to spawn of world "world"
+	set {_loc} to test-location
 	set {_old-block} to type of block at {_loc}
 	set block at {_loc} to chest
 	add 10 stone to inventory of block at {_loc}
@@ -17,7 +17,7 @@ test "item amount of itemtype":
 	assert item amount of {_item} is 9 with "Amount of itemtype is not 9: %{_amount}%"
 
 test "item amount of slot":
-	set {_loc} to spawn of world "world"
+	set {_loc} to test-location
 	set {_old-block} to type of block at {_loc}
 	set block at {_loc} to chest
 	add 10 stone to inventory of block at {_loc}
diff --git a/src/test/skript/tests/regressions/5566-block iterator being 100 always.sk b/src/test/skript/tests/regressions/5566-block iterator being 100 always.sk
new file mode 100644
index 00000000000..b9581140abe
--- /dev/null
+++ b/src/test/skript/tests/regressions/5566-block iterator being 100 always.sk	
@@ -0,0 +1,8 @@
+
+# Test not related to a made issue. Details at pull request.
+test "100 blocks fix":
+	set {_l} to test-location ~ vector(0, -1, 10)
+	set block at {_l} to air
+
+	assert blocks 5 below {_l} contains air, grass block, dirt, dirt, bedrock and void air with "Failed to get correct blocks (got '%blocks 5 below test-location%')"
+	assert size of blocks 3 below location below {_l} is 4 with "Failed to match asserted size"
diff --git a/src/test/skript/tests/regressions/pull-5748-fix bugs in the random number expression.sk b/src/test/skript/tests/regressions/5748-fix bugs in the random number expression.sk
similarity index 100%
rename from src/test/skript/tests/regressions/pull-5748-fix bugs in the random number expression.sk
rename to src/test/skript/tests/regressions/5748-fix bugs in the random number expression.sk
diff --git a/src/test/skript/tests/regressions/5804-is-burning.sk b/src/test/skript/tests/regressions/5804-is-burning.sk
new file mode 100644
index 00000000000..8526442ff78
--- /dev/null
+++ b/src/test/skript/tests/regressions/5804-is-burning.sk
@@ -0,0 +1,14 @@
+# This test is to see if the `is burning` condition works properly.
+# Before, something like `if {x} is burning` would try to compare {x} to the burning damage cause
+# instead of whether or not the entity was burning.
+test "burning":
+	spawn a pig at test-location:
+		set {_pig} to entity
+
+	assert "burning" parsed as damage cause is burning with "burning damage cause compare"
+
+	ignite {_pig}
+	assert entity within {_pig} is burning with "entity within is burning failed"
+	assert {_pig} is burning with "is burning failed"
+
+	delete entity within {_pig}
diff --git a/src/test/skript/tests/regressions/6032-local-vars-created-in-effsecspawn.sk b/src/test/skript/tests/regressions/6032-local-vars-created-in-effsecspawn.sk
index 23033b01db0..0c9f5422bb4 100644
--- a/src/test/skript/tests/regressions/6032-local-vars-created-in-effsecspawn.sk
+++ b/src/test/skript/tests/regressions/6032-local-vars-created-in-effsecspawn.sk
@@ -1,5 +1,5 @@
 test "local vars created in EffSecSpawn":
-	set {_spawn} to spawn of world "world"
+	set {_spawn} to test-location
 	spawn 4 zombies at {_spawn}:
 		add 1 to {_test}
 	assert {_test} is 4 with "local var created in EffSecSpawn was not properly incremented"
diff --git a/src/test/skript/tests/regressions/6288-event data priority pollution.sk b/src/test/skript/tests/regressions/6288-event data priority pollution.sk
index 3de238ca724..2da0df2c53d 100644
--- a/src/test/skript/tests/regressions/6288-event data priority pollution.sk	
+++ b/src/test/skript/tests/regressions/6288-event data priority pollution.sk	
@@ -1,5 +1,5 @@
 on join with priority lowest:
-    stop
+	stop
 
 every 10 seconds:
-    stop
+	stop
diff --git a/src/test/skript/tests/regressions/6290-item-inventory-conflict.sk b/src/test/skript/tests/regressions/6290-item-inventory-conflict.sk
index 38b2d328cb9..9d3a50794f1 100644
--- a/src/test/skript/tests/regressions/6290-item-inventory-conflict.sk
+++ b/src/test/skript/tests/regressions/6290-item-inventory-conflict.sk
@@ -1,6 +1,6 @@
 test "item inventory conflict":
-  parse:
-    loop all players:
-      loop all items in the loop-player's inventory:
-        set {_item} to loop-item
-  assert parse logs are not set with "failed to parse loop"
+	parse:
+		loop all players:
+			loop all items in the loop-player's inventory:
+				set {_item} to loop-item
+	assert parse logs are not set with "failed to parse loop"
diff --git a/src/test/skript/tests/regressions/pull-6361-function-param.sk b/src/test/skript/tests/regressions/6361-function-param.sk
similarity index 64%
rename from src/test/skript/tests/regressions/pull-6361-function-param.sk
rename to src/test/skript/tests/regressions/6361-function-param.sk
index 81ef44a8d98..f0bc5bfd4ef 100644
--- a/src/test/skript/tests/regressions/pull-6361-function-param.sk
+++ b/src/test/skript/tests/regressions/6361-function-param.sk
@@ -20,7 +20,7 @@
 
 
 function test_English(test: text) :: text:
-    return {_test}
+	return {_test}
 
 function test_Arabic(تجربة: text) :: text:
 	return {_تجربة}
@@ -38,9 +38,9 @@ function test_German(prüfen: text) :: text:
 	return {_prüfen}
 
 test "function parameter names":
-    assert test_English("text") = "text" with "Function 'test_English' failed function parameter name test"
-    assert test_Arabic("text") = "text" with "Function 'test_Arabic' failed function parameter name test"
-    assert test_Japanese("text") = "text" with "Function 'test_Japanese' failed function parameter name test"
-    assert test_Greek("text") = "text" with "Function 'test_Greek' failed function parameter name test"
-    assert test_Thai("text") = "text" with "Function 'test_Thai' failed function parameter name test"
-    assert test_German("text") = "text" with "Function 'test_German' failed function parameter name test"
\ No newline at end of file
+	assert test_English("text") = "text" with "Function 'test_English' failed function parameter name test"
+	assert test_Arabic("text") = "text" with "Function 'test_Arabic' failed function parameter name test"
+	assert test_Japanese("text") = "text" with "Function 'test_Japanese' failed function parameter name test"
+	assert test_Greek("text") = "text" with "Function 'test_Greek' failed function parameter name test"
+	assert test_Thai("text") = "text" with "Function 'test_Thai' failed function parameter name test"
+	assert test_German("text") = "text" with "Function 'test_German' failed function parameter name test"
diff --git a/src/test/skript/tests/regressions/6424-inventory-holder-location.sk b/src/test/skript/tests/regressions/6424-inventory-holder-location.sk
index ed4d9cd64ab..720fad77e31 100644
--- a/src/test/skript/tests/regressions/6424-inventory-holder-location.sk
+++ b/src/test/skript/tests/regressions/6424-inventory-holder-location.sk
@@ -1,5 +1,5 @@
 test "inventory holder location":
-	set {_b} to the block at spawn of world "world"
+	set {_b} to the test-block
 	set {_prev} to type of block at {_b}
 	broadcast {_prev}
 
diff --git a/src/test/skript/tests/regressions/pull-6586-effhealth item mutation.sk b/src/test/skript/tests/regressions/6586-effhealth item mutation.sk
similarity index 100%
rename from src/test/skript/tests/regressions/pull-6586-effhealth item mutation.sk
rename to src/test/skript/tests/regressions/6586-effhealth item mutation.sk
diff --git a/src/test/skript/tests/regressions/pull-6600-variable-set-changer-aiiob.sk b/src/test/skript/tests/regressions/6600-variable-set-changer-aiiob.sk
similarity index 100%
rename from src/test/skript/tests/regressions/pull-6600-variable-set-changer-aiiob.sk
rename to src/test/skript/tests/regressions/6600-variable-set-changer-aiiob.sk
diff --git a/src/test/skript/tests/regressions/6612-nearest entity cast error.sk b/src/test/skript/tests/regressions/6612-nearest entity cast error.sk
index c5b503e7cbd..b3cd3f6dbed 100644
--- a/src/test/skript/tests/regressions/6612-nearest entity cast error.sk	
+++ b/src/test/skript/tests/regressions/6612-nearest entity cast error.sk	
@@ -1,5 +1,5 @@
 test "charge creeper nearest entity cast":
-	set {_location} to spawn of world "world"
+	set {_location} to test-location
 	spawn a creeper at {_location}
 	set {_creeper} to last spawned creeper
 	assert {_creeper} is not charged with "spawning a normal creeper shouldn't spawn a charged one"
@@ -10,7 +10,7 @@ test "charge creeper nearest entity cast":
 	delete the last spawned creeper
 
 test "poison nearest entity cast":
-	set {_location} to spawn of world "world"
+	set {_location} to test-location
 	spawn a creeper at {_location}
 	set {_creeper} to last spawned creeper
 	poison (nearest entity to {_location}) # this never threw an exception
diff --git a/src/test/skript/tests/regressions/6623-wrong parsing order for math.sk b/src/test/skript/tests/regressions/6623-wrong parsing order for math.sk
index e3a8a02cd07..300fc2278dc 100644
--- a/src/test/skript/tests/regressions/6623-wrong parsing order for math.sk	
+++ b/src/test/skript/tests/regressions/6623-wrong parsing order for math.sk	
@@ -1,5 +1,5 @@
 test "wrong parsing order for math in object expr":
-	spawn a zombie at spawn of world "world"
+	spawn a zombie at test-location
 	set {_e} to the last spawned zombie
 
 	set {_result} to health of {_e} + max health of {_e}
diff --git a/src/test/skript/tests/regressions/pull-6687-enchantment-update.sk b/src/test/skript/tests/regressions/6687-enchantment-update.sk
similarity index 100%
rename from src/test/skript/tests/regressions/pull-6687-enchantment-update.sk
rename to src/test/skript/tests/regressions/6687-enchantment-update.sk
diff --git a/src/test/skript/tests/regressions/6707-spawn-fish-types.sk b/src/test/skript/tests/regressions/6707-spawn-fish-types.sk
index 2a0d0bf8112..75a28a42200 100644
--- a/src/test/skript/tests/regressions/6707-spawn-fish-types.sk
+++ b/src/test/skript/tests/regressions/6707-spawn-fish-types.sk
@@ -1,26 +1,26 @@
 test "spawn fish types":
-	spawn a cod at spawn of world "world":
+	spawn a cod at test-location:
 		set {_e} to entity
 	assert {_e} is a cod with "failed to spawn a cod"
 	delete entity within {_e}
 
-	spawn a salmon at spawn of world "world":
+	spawn a salmon at test-location:
 		set {_e} to entity
 	assert {_e} is a salmon with "failed to spawn a salmon"
 	delete entity within {_e}
 
-	spawn a puffer fish at spawn of world "world":
+	spawn a puffer fish at test-location:
 		set {_e} to entity
 	assert {_e} is a puffer fish with "failed to spawn a puffer fish"
 	delete entity within {_e}
 
-	spawn a tropical fish at spawn of world "world":
+	spawn a tropical fish at test-location:
 		set {_e} to entity
 	assert {_e} is a tropical fish with "failed to spawn a tropical fish"
 	delete entity within {_e}
 
 	parse if running minecraft "1.19":
-		spawn a tadpole at spawn of world "world":
+		spawn a tadpole at test-location:
 			set {_e} to entity
 		assert {_e} is a tadpole with "failed to spawn a tadpole"
 		delete entity within {_e}
diff --git a/src/test/skript/tests/regressions/pull-6746-spawn-dropped-item.sk b/src/test/skript/tests/regressions/6746-spawn-dropped-item.sk
similarity index 71%
rename from src/test/skript/tests/regressions/pull-6746-spawn-dropped-item.sk
rename to src/test/skript/tests/regressions/6746-spawn-dropped-item.sk
index b8910894bad..10ebb6ffde9 100644
--- a/src/test/skript/tests/regressions/pull-6746-spawn-dropped-item.sk
+++ b/src/test/skript/tests/regressions/6746-spawn-dropped-item.sk
@@ -1,9 +1,9 @@
 test "spawn dropped item":
-	spawn dropped stone at spawn of world "world":
+	spawn dropped stone at test-location:
 		set {_e} to entity
 	assert {_e} is set with "failed to spawn dropped stone"
 	delete entity within {_e}
 
-	spawn dropped item at spawn of world "world":
+	spawn dropped item at test-location:
 		set {_e2} to entity
 	assert {_e2} is not set with "spawned `dropped item` despite undefined item type"
diff --git a/src/test/skript/tests/regressions/pull-6760-particle itemtype conflicts.sk b/src/test/skript/tests/regressions/6760-particle itemtype conflicts.sk
similarity index 100%
rename from src/test/skript/tests/regressions/pull-6760-particle itemtype conflicts.sk
rename to src/test/skript/tests/regressions/6760-particle itemtype conflicts.sk
diff --git a/src/test/skript/tests/regressions/6762-cant spawn a firework.sk b/src/test/skript/tests/regressions/6762-cant spawn a firework.sk
index f272e0bc8e0..04e04e10715 100644
--- a/src/test/skript/tests/regressions/6762-cant spawn a firework.sk	
+++ b/src/test/skript/tests/regressions/6762-cant spawn a firework.sk	
@@ -1,4 +1,4 @@
 test "can't spawn a firework":
 
-	spawn a firework at spawn of world "world"
+	spawn a firework at test-location
 	assert last spawned firework is set with "firework did not spawn"
diff --git a/src/test/skript/tests/regressions/6811-inventory-holder-location-doublechest.sk b/src/test/skript/tests/regressions/6811-inventory-holder-location-doublechest.sk
index f46d4b52794..bc8dc0aacf7 100644
--- a/src/test/skript/tests/regressions/6811-inventory-holder-location-doublechest.sk
+++ b/src/test/skript/tests/regressions/6811-inventory-holder-location-doublechest.sk
@@ -1,5 +1,5 @@
 test "inventory holder location double chest":
-	set {_b::1} to the block at spawn of world "world"
+	set {_b::1} to the test-block
 	set {_b::2} to the block north of {_b::1}
 	set {_prev::1} to type of block at {_b::1}
 	set {_prev::2} to type of block at {_b::2}
diff --git a/src/test/skript/tests/regressions/6817-null of x incorrect type.sk b/src/test/skript/tests/regressions/6817-null of x incorrect type.sk
new file mode 100644
index 00000000000..ac93553d712
--- /dev/null
+++ b/src/test/skript/tests/regressions/6817-null of x incorrect type.sk	
@@ -0,0 +1,3 @@
+test "null of x incorrect type":
+	# would cause an exception
+	spawn {_null} of pig above {_null}
diff --git a/src/test/skript/tests/regressions/pull-6832-potioneffecttype-compare.sk b/src/test/skript/tests/regressions/6832-potioneffecttype-compare.sk
similarity index 100%
rename from src/test/skript/tests/regressions/pull-6832-potioneffecttype-compare.sk
rename to src/test/skript/tests/regressions/6832-potioneffecttype-compare.sk
diff --git a/src/test/skript/tests/regressions/6907-playsound entity method doesn't exist.sk b/src/test/skript/tests/regressions/6907-playsound entity method doesn't exist.sk
index 8c14277c5b3..22543240ebe 100644
--- a/src/test/skript/tests/regressions/6907-playsound entity method doesn't exist.sk	
+++ b/src/test/skript/tests/regressions/6907-playsound entity method doesn't exist.sk	
@@ -1,3 +1,3 @@
 test "1.17 playsound exception":
 	# would throw exception on <1.17
-	play sound "entity.experience_orb.pickup" with volume 1 at spawn of world "world"
+	play sound "entity.experience_orb.pickup" with volume 1 at test-location
diff --git a/src/test/skript/tests/regressions/pull-6936-single quotes in commands.sk b/src/test/skript/tests/regressions/6936-single quotes in commands.sk
similarity index 100%
rename from src/test/skript/tests/regressions/pull-6936-single quotes in commands.sk
rename to src/test/skript/tests/regressions/6936-single quotes in commands.sk
diff --git a/src/test/skript/tests/regressions/pull-7024-efflook-stack-trace b/src/test/skript/tests/regressions/7024-efflook-stack-trace
similarity index 77%
rename from src/test/skript/tests/regressions/pull-7024-efflook-stack-trace
rename to src/test/skript/tests/regressions/7024-efflook-stack-trace
index 3c6c27522ab..0e86869f113 100644
--- a/src/test/skript/tests/regressions/pull-7024-efflook-stack-trace
+++ b/src/test/skript/tests/regressions/7024-efflook-stack-trace
@@ -1,10 +1,10 @@
 test "efflook throwing stack trace":
-	spawn a zombie at (spawn of world "world"):
+	spawn a zombie at (test-location):
 		set {_z} to entity
 
 	set {_v} to random vector
 	set vector length of {_v} to 10
-	set {_loc} to ((spawn of world "world") ~ {_v})
+	set {_loc} to ((test-location) ~ {_v})
 	set {_x} to "xyz"
 
 	make {_z} look at {_loc}
diff --git a/src/test/skript/tests/regressions/pull-7067-events in structs.sk b/src/test/skript/tests/regressions/7067-events in structs.sk
similarity index 100%
rename from src/test/skript/tests/regressions/pull-7067-events in structs.sk
rename to src/test/skript/tests/regressions/7067-events in structs.sk
diff --git a/src/test/skript/tests/regressions/pull-7120-changes overwriting indices.sk b/src/test/skript/tests/regressions/7120-changes overwriting indices.sk
similarity index 88%
rename from src/test/skript/tests/regressions/pull-7120-changes overwriting indices.sk
rename to src/test/skript/tests/regressions/7120-changes overwriting indices.sk
index 47b02990e7a..439b9c6126d 100644
--- a/src/test/skript/tests/regressions/pull-7120-changes overwriting indices.sk	
+++ b/src/test/skript/tests/regressions/7120-changes overwriting indices.sk	
@@ -1,9 +1,9 @@
 test "EffEnchant overwriting var indices":
 	set {_test::1} to diamond sword
-	set {_test::a} to gold sword
+	set {_test::a} to golden sword
 	set {_test::hello world} to block at spawn of world "world"
 	enchant {_test::*} with sharpness 1
-	assert {_test::*} is diamond sword of sharpness 1, gold sword of sharpness 1, and block at spawn of world "world" with "failed to enchant items"
+	assert {_test::*} is diamond sword of sharpness 1, golden sword of sharpness 1, and block at spawn of world "world" with "failed to enchant items"
 	assert indices of {_test::*} is "1", "a", and "hello world" with "enchanting modified indices"
 
 test "EffReplace overwriting var indices":
diff --git a/src/test/skript/tests/regressions/7129-pretty-quotes.sk b/src/test/skript/tests/regressions/7129-pretty-quotes.sk
new file mode 100644
index 00000000000..7bf6da5b3e5
--- /dev/null
+++ b/src/test/skript/tests/regressions/7129-pretty-quotes.sk
@@ -0,0 +1,30 @@
+
+command /prettyquotecommandtest “prettyquoteliteral” <text>:
+	trigger:
+		set {PrettyQuoteArg} to arg
+
+test "pretty quote usage":
+	set {_error} to "Pretty quotes are not allowed, change to regular quotes"
+	parse:
+		set {_test} to "“Embedded Pretty Quotes”"
+	assert last parse logs does not contain {_error} with "Pretty quotes should work inside strings"
+
+	parse:
+		set {_test} to "" #“Pretty Quote Comment”
+	assert last parse logs does not contain {_error} with "Pretty quotes should work in comments"
+
+	parse:
+		set {_test“”} to ""
+	assert last parse logs does not contain {_error} with "Pretty quotes should work in var names"
+
+	parse:
+		set {_test} to “Pretty Quotes”
+	assert last parse logs contain {_error} with "Pretty quote string usage did not produce expected error"
+
+	parse:
+		set {_test} to "test%“test”%"
+	assert last parse logs contain {_error} with "Pretty quote %%string%% usage did not produce expected error"
+
+	execute command "prettyquotecommandtest “prettyquoteliteral” “prettyquotearg”"
+	assert {PrettyQuoteArg} is "“prettyquotearg”" with "Pretty quotes should work in command args"
+	clear {PrettyQuoteArg}
diff --git a/src/test/skript/tests/regressions/7140-leather horse armor unequipable.sk b/src/test/skript/tests/regressions/7140-leather horse armor unequipable.sk
index fbfae46cc9f..1a23dc53d80 100644
--- a/src/test/skript/tests/regressions/7140-leather horse armor unequipable.sk	
+++ b/src/test/skript/tests/regressions/7140-leather horse armor unequipable.sk	
@@ -1,4 +1,4 @@
-test "leather horse armor unequipable" when running minecraft "1.14":
+test "leather horse armor unequipable":
 	if minecraft version is "1.20.6":
 		stop # horse armor equipping is broken on Paper 1.20.6. see https://github.com/PaperMC/Paper/pull/11139
 
diff --git a/src/test/skript/tests/regressions/7162-removing from variable skips duplicates.sk b/src/test/skript/tests/regressions/7162-removing from variable skips duplicates.sk
new file mode 100644
index 00000000000..c4fadc84163
--- /dev/null
+++ b/src/test/skript/tests/regressions/7162-removing from variable skips duplicates.sk	
@@ -0,0 +1,6 @@
+test "removing from variables skips duplicates":
+	set {_list::*} to 1, 1, 2, 3, 4, 5, 6 and 6
+	remove 1 and 1 from {_list::*}
+	assert {_list::*} is 2, 3, 4, 5, 6 and 6 with "didn't remove all instances of 1 from the list"
+	remove first 6 elements out of {_list::*} from {_list::*}
+	assert {_list::*} is not set with "didn't remove all elements"
diff --git a/src/test/skript/tests/regressions/7164-expressions sometimes dont convert.sk b/src/test/skript/tests/regressions/7164-expressions sometimes dont convert.sk
new file mode 100644
index 00000000000..f7954b3a642
--- /dev/null
+++ b/src/test/skript/tests/regressions/7164-expressions sometimes dont convert.sk	
@@ -0,0 +1,13 @@
+test "expressions sometimes dont convert":
+	assert formatted ({_foo} + {_bar}) is not set with "formatting nothing shouldn't throw an error"
+
+	set {_foo} to "test"
+	assert formatted ({_foo} + {_bar}) is not set with "formatting string + none shouldn't throw an error"
+
+	set {_foo} to 1
+	set {_bar} to 2
+	assert formatted ({_foo} + {_bar}) is not set with "formatting number + number shouldn't throw an error"
+
+	set {_foo} to "foo"
+	set {_bar} to "bar"
+	assert formatted ({_foo} + {_bar}) is "foobar" with "formatting strings doesn't work"
diff --git a/src/test/skript/tests/regressions/7166-formatted numbers.sk b/src/test/skript/tests/regressions/7166-formatted numbers.sk
new file mode 100644
index 00000000000..9bbba8a3da8
--- /dev/null
+++ b/src/test/skript/tests/regressions/7166-formatted numbers.sk	
@@ -0,0 +1,26 @@
+test "formatted numbers function":
+	assert formatNumber(123456789) is "123,456,789" with "default number format failed ##1"
+	assert formatNumber(1234567) is "1,234,567" with "default number format failed ##2"
+	assert formatNumber(123.456) is "123.46" with "default number format failed ##3"
+
+	assert formatNumber(12345678, "##,##.00") is "12,34,56,78.00" with "custom number format failed ##1"
+	assert formatNumber(12345678, "####,####") is "1234,5678" with "custom number format failed ##2"
+	assert formatNumber(123456.789, "$###,###.##") is "$123,456.79" with "custom number format failed ##3"
+
+	assert formatNumber(12345678, "##.,##") is not set with "invalid number format returns a value"
+	assert formatNumber(123.45678, "##.,##") is not set with "invalid number format returns a value"
+
+	set {_n} to "a" parsed as number
+	assert formatNumber({_n}) is not set with "invalid number returns a value"
+	assert formatNumber({_n}, "##,##") is not set with "invalid number with format returns a value"
+	assert formatNumber({_n}, "##.,##") is not set with "invalid number with invalid format returns a value"
+
+	set {_n} to NaN value
+	assert formatNumber({_n}) is "NaN" with "NaN doesn't return a value"
+	assert formatNumber({_n}, "##,##") is "NaN" with "NaN with format doesn't return a value"
+	assert formatNumber({_n}, "##.,##") is not set with "NaN with invalid format returns a value"
+
+	set {_n} to infinity value
+	assert formatNumber({_n}) is "∞" with "infinity doesn't return a value"
+	assert formatNumber({_n}, "##,##") is "∞" with "infinity with format doesn't return a value"
+	assert formatNumber({_n}, "##.,##") is not set with "infinity with invalid format returns a value"
diff --git a/src/test/skript/tests/regressions/7187-display entities conversion.sk b/src/test/skript/tests/regressions/7187-display entities conversion.sk
new file mode 100644
index 00000000000..3c5f27b23e7
--- /dev/null
+++ b/src/test/skript/tests/regressions/7187-display entities conversion.sk	
@@ -0,0 +1,7 @@
+test "display entities conversion":
+	parse:
+		spawn block display of minecraft:stone at test-location
+		set transformation translation of last spawned block display to vector(-0.5,-0.5,-0.5)
+		assert transformation translation of last spawned block display is vector(-0.5,-0.5,-0.5) with "failed to convert block display"
+		delete last spawned block display
+	assert parse logs is not set with "failed to convert block display"
diff --git a/src/test/skript/tests/regressions/7279-create-uncreatable-inventory.sk b/src/test/skript/tests/regressions/7279-create-uncreatable-inventory.sk
new file mode 100644
index 00000000000..b39fca8fbb1
--- /dev/null
+++ b/src/test/skript/tests/regressions/7279-create-uncreatable-inventory.sk
@@ -0,0 +1,18 @@
+test "create un-creatable inventory":
+	# Test creating inventory types which cannot be created
+	assert merchant inventory named "BOB" is set to fail with "This should fail, cannot create a merchant inventory"
+	assert composter inventory named "BOB" is set to fail with "This should fail, cannot create a player inventory"
+
+	# Test creating inventory types which can be created
+	assert chest inventory named "BOB" is set with "Should be able to create a named chest inventory"
+	assert hopper inventory named "Mr Hopper" is set with "Should be able to create a named hopper inventory"
+
+	# Test opening an inventory type which cannot be created
+	parse:
+		open merchant inventory to {_null}
+	assert last parse logs is "Cannot create an inventory of type merchant inventory" with "Opening a merchant inventory should fail"
+
+	# Test opening an inventory type which can be created
+	parse:
+		open chest inventory to {_null}
+	assert last parse logs is not set with "Opening a chest inventory should run fine"
diff --git a/src/test/skript/tests/regressions/7327-expr-sets-return.sk b/src/test/skript/tests/regressions/7327-expr-sets-return.sk
new file mode 100644
index 00000000000..1d4d1eebe42
--- /dev/null
+++ b/src/test/skript/tests/regressions/7327-expr-sets-return.sk
@@ -0,0 +1,10 @@
+test "ExprSets class return failure":
+
+	set {_i} to diamond sword with item flag all item flags
+	assert {_i} is set with "Item with all item flags should be set"
+
+	set {_i::*} to 1 of all itemtypes
+	assert {_i::*} is set with "X of set of all itemtypes should be set"
+
+	# You're a lone wolf, Just want to make sure you don't error
+	set custom model data of all itemtypes to 10
diff --git a/src/test/skript/tests/regressions/7373-burning-time-in-section.sk b/src/test/skript/tests/regressions/7373-burning-time-in-section.sk
new file mode 100644
index 00000000000..3bd1086ec51
--- /dev/null
+++ b/src/test/skript/tests/regressions/7373-burning-time-in-section.sk
@@ -0,0 +1,5 @@
+test "7373 burning time section":
+	spawn a pig at event-location:
+		set burning time of event-entity to 9000 ticks
+		set {_e} to entity
+	delete entity within {_e}
diff --git a/src/test/skript/tests/regressions/pull-5566-block iterator being 100 always.sk b/src/test/skript/tests/regressions/pull-5566-block iterator being 100 always.sk
deleted file mode 100644
index ef77c2955f5..00000000000
--- a/src/test/skript/tests/regressions/pull-5566-block iterator being 100 always.sk	
+++ /dev/null
@@ -1,5 +0,0 @@
-
-# Test not related to a made issue. Details at pull request.
-test "100 blocks fix":
-	assert blocks 5 below spawn of world "world" contains air, grass block, dirt block, dirt block, bedrock block and void air with "Failed to get correct blocks (got '%blocks 5 below spawn of world "world"%')"
-	assert size of blocks 3 below location below spawn of world "world" is 4 with "Failed to match asserted size"
diff --git a/src/test/skript/tests/syntaxes/conditions/CondHasLineOfSight.sk b/src/test/skript/tests/syntaxes/conditions/CondHasLineOfSight.sk
index 63f8faff16e..a4fe6115e8d 100644
--- a/src/test/skript/tests/syntaxes/conditions/CondHasLineOfSight.sk
+++ b/src/test/skript/tests/syntaxes/conditions/CondHasLineOfSight.sk
@@ -1,10 +1,10 @@
 test "line of sight":
-	set {_a} to (spawn of world "world")
+	set {_a} to test-location
 	set {_b} to {_a} ~ vector(0, 10, 0)
 	loop blocks between {_a} and {_b}:
 		set {_block::%loop-block%} to type of loop-block
 		set loop-block to air
-	spawn pig at spawn of world "world"
+	spawn pig at test-location
 	set {_pig1} to last spawned entity
 	spawn pig at {_b}:
 		assert pig has line of sight to {_pig1} with "Pigs should have line of sight to each other 1"
diff --git a/src/test/skript/tests/syntaxes/conditions/CondHasLootTable.sk b/src/test/skript/tests/syntaxes/conditions/CondHasLootTable.sk
new file mode 100644
index 00000000000..b16cef8ef84
--- /dev/null
+++ b/src/test/skript/tests/syntaxes/conditions/CondHasLootTable.sk
@@ -0,0 +1,30 @@
+test "loot table condition":
+	spawn a pig at test-location
+	set {_pig} to last spawned pig
+
+	assert {_pig} has loot table with "default has loot table failed"
+
+	set loot table of {_pig} to loot table "minecraft:entities/cow"
+	assert {_pig} has loot table with "simple has loot table failed"
+
+	set loot table of {_pig} to "bleh blah bluh" parsed as loot table
+	assert {_pig} has loot table with "pig doesn't have loot table after setting invalid loot table"
+
+	delete entity within {_pig}
+
+	set {_pastBlock} to block data of test-block
+
+	set test-block to chest
+
+	assert test-block doesn't have loot table with "has loot table without setting it"
+
+	set loot table of test-block to loot table "minecraft:chests/simple_dungeon"
+	assert test-block has loot table with "simple has loot table failed"
+
+	clear loot table of test-block
+	assert test-block doesn't have a loot table with "block still has loot table after clearing loot table"
+
+	set loot table of test-block to "bleh blah bluh" parsed as loot table
+	assert test-block doesn't have a loot table with "block still has loot table after setting invalid loot table"
+
+	set test-block to {_pastBlock}
diff --git a/src/test/skript/tests/syntaxes/conditions/CondIsCharged.sk b/src/test/skript/tests/syntaxes/conditions/CondIsCharged.sk
new file mode 100644
index 00000000000..58131c3dff1
--- /dev/null
+++ b/src/test/skript/tests/syntaxes/conditions/CondIsCharged.sk
@@ -0,0 +1,35 @@
+test "is charged":
+	spawn a creeper at (spawn of world "world"):
+		set {_c} to entity
+	spawn a wither at (spawn of world "world"):
+		set {_w} to entity
+	shoot a wither skull from {_w}
+	set {_s} to last shot entity
+
+	assert {_c} is not charged with "a normally spawned creeper should not be charged"
+	assert {_w} is not charged with "a normally spawned wither should not be charged"
+	assert {_s} is not charged with "a normally spawned wither skull should not be charged"
+
+	charge {_c}
+	charge {_s}
+	assert {_c} is charged with "charging a creeper should do exactly that"
+	assert {_s} is charged with "charging a wither skull should do exactly that"
+
+	uncharge {_c}
+	uncharge {_s}
+	assert {_c} is not charged with "uncharging a creeper should do exactly that"
+	assert {_s} is not charged with "uncharging a wither skull should do exactly that"
+
+	spawn an adult zombie at (spawn of world "world"):
+		set {_z} to entity
+
+	assert {_z} is not charged with "a non-supported entity should never be charged"
+	charge {_z}
+	assert {_z} is not charged with "charging a non-supported entity should do nothing"
+	uncharge {_z}
+	assert {_z} is not charged with "uncharging a non-supported entity should do nothing"
+
+	delete entity within {_c}
+	delete entity within {_w}
+	delete entity within {_s}
+	delete entity within {_z}
diff --git a/src/test/skript/tests/syntaxes/conditions/CondIsConditional.sk b/src/test/skript/tests/syntaxes/conditions/CondIsConditional.sk
new file mode 100644
index 00000000000..06bade7e893
--- /dev/null
+++ b/src/test/skript/tests/syntaxes/conditions/CondIsConditional.sk
@@ -0,0 +1,22 @@
+test "is conditional":
+
+	set {_l} to location(0,0,0,world)
+	set {_original} to blockdata of block at {_l}
+	set block at {_l} to command block
+	set {_b} to block at {_l}
+
+	assert {_b} is not conditional with "a new command block shouldn't be conditional"
+
+	make command block {_b} conditional
+	assert {_b} is conditional with "making a command block conditional should do exactly that"
+
+	make command block {_b} unconditional
+	assert {_b} is unconditional with "making a command block unconditional should do exactly that"
+
+	set block at {_b} to stone
+	assert {_b} is not conditional with "a non-command block should not be conditional"
+
+	make command block {_b} conditional
+	assert {_b} is not conditional with "making a non-command block conditional shouldn't do anything"
+
+	set block at {_l} to {_original}
diff --git a/src/test/skript/tests/syntaxes/conditions/CondIsCustomNameVisible.sk b/src/test/skript/tests/syntaxes/conditions/CondIsCustomNameVisible.sk
new file mode 100644
index 00000000000..9d2990b8647
--- /dev/null
+++ b/src/test/skript/tests/syntaxes/conditions/CondIsCustomNameVisible.sk
@@ -0,0 +1,20 @@
+test "custom name visibility":
+	spawn an adult zombie at (spawn of world "world"):
+		set {_z} to entity
+
+	assert {_z}'s custom name isn't visible with "A zombie shouldn't be spawned with a visible display name"
+
+	set {_z}'s display name to "aaa"
+
+	assert {_z}'s custom name is visible with "Setting an entity's display name sets the visibility to true"
+
+	hide {_z}'s custom name
+
+	assert {_z}'s custom name isn't visible with "New effect should hide the custom name"
+
+	show {_z}'s custom name
+
+	assert {_z}'s custom name is visible with "New effect should show the custom name"
+
+	delete entity within {_z}
+
diff --git a/src/test/skript/tests/syntaxes/conditions/CondIsDivisibleBy.sk b/src/test/skript/tests/syntaxes/conditions/CondIsDivisibleBy.sk
new file mode 100644
index 00000000000..9ce4462d82a
--- /dev/null
+++ b/src/test/skript/tests/syntaxes/conditions/CondIsDivisibleBy.sk
@@ -0,0 +1,16 @@
+test "is divisible":
+	assert 5 can be evenly divided by 5 with "5 can be divided by 5!"
+	assert 5 can not be evenly divided by 10 with "5 cannot be divided by 10!"
+	assert 5 isn't evenly divisible by 0 with "nothing can be divided by 0!"
+	assert 1964903306 is evenly divisible by 982451653 with "1964903306 is divisible by 982451653!"
+	assert {_none} is evenly divisible by 10 to fail with "you cannot divide by <none>!"
+	assert 5, 10, and 15 can be evenly divided by 5 with "5, 10, and 15 can be evenly divided by 5!"
+	assert 3, 5, and 7 cannot be evenly divided by 2 with "3, 5, and 7 cannot be evenly divided by 2!"
+	assert 5 or 10 or 15 can be evenly divided by 5 with "5 or 10 or 15 can be evenly divided by 5!"
+	assert 3 or 5 or 7 cannot be evenly divided by 2 with "3 or 5 or 7 cannot be evenly divided by 2!"
+	assert -5 is evenly divisible by 5 with "-5 is evenly divisible by 5!"
+	assert -5, -10, and -15 can be evenly divided by 5 with "5, 10, and 15 can be evenly divided by 5!"
+	set {_num} to "5"
+	assert {_num} can be divided by 5 to fail with "You cannot divide by a string!"
+	set {_numlist::*} to "5", "10", and "15"
+	assert {_numlist::*} can be divided by 5 to fail with "You cannot divide by a string!"
diff --git a/src/test/skript/tests/syntaxes/conditions/CondIsEdible.sk b/src/test/skript/tests/syntaxes/conditions/CondIsEdible.sk
index 4e24dccb2fb..1fde67cfbe6 100644
--- a/src/test/skript/tests/syntaxes/conditions/CondIsEdible.sk
+++ b/src/test/skript/tests/syntaxes/conditions/CondIsEdible.sk
@@ -3,4 +3,4 @@ test "edible condition":
 	assert dirt isn't edible with "dirt is edible"
 	assert diamond isn't edible with "diamond is edible"
 	assert golden apple is edible with "golden apple isn't edible"
-	assert steak is edible with "steak isn't edible"
+	assert cooked beef is edible with "cooked beef isn't edible"
diff --git a/src/test/skript/tests/syntaxes/conditions/CondIsFireResistant.sk b/src/test/skript/tests/syntaxes/conditions/CondIsFireResistant.sk
index 61555e98fae..7cb78fb9b13 100644
--- a/src/test/skript/tests/syntaxes/conditions/CondIsFireResistant.sk
+++ b/src/test/skript/tests/syntaxes/conditions/CondIsFireResistant.sk
@@ -20,7 +20,7 @@ test "is fire resistant" when running minecraft "1.20.5":
 
 	# multiple items: naturally not fire resistant
 	set {_item} to diamond
-	set {_item2} to stone block
+	set {_item2} to stone
 	assert ({_item} and {_item2}) are not fire resistant with "{_item} and {_item2} are unexpectedly fire resistant"
 
 	# TODO: enable in 1.21 (doesn't work in 1.20.5 or 1.20.6)
@@ -37,5 +37,5 @@ test "is fire resistant" when running minecraft "1.20.5":
 
 	# multiple items: artifically fire resistant
 	set {_item} to diamond with fire resistance
-	set {_item2} to fire resistant stone block
+	set {_item2} to fire resistant stone
 	assert ({_item} and {_item2}) are fire resistant with "fire resistant {_item} and {_item2} are unexpectedly not fire resistant"
diff --git a/src/test/skript/tests/syntaxes/conditions/CondIsFlammable.sk b/src/test/skript/tests/syntaxes/conditions/CondIsFlammable.sk
index 5e2a22927bc..530f1fb0870 100644
--- a/src/test/skript/tests/syntaxes/conditions/CondIsFlammable.sk
+++ b/src/test/skript/tests/syntaxes/conditions/CondIsFlammable.sk
@@ -1,5 +1,5 @@
 test "flammable condition":
 	assert air isn't flammable with "air is flammable"
 	assert sand isn't flammable with "sand is flammable"
-	assert oak plank is flammable with "oak plank isn't flammable"
+	assert oak planks is flammable with "oak plank isn't flammable"
 	assert diamond isn't flammable with "diamond is flammable"
diff --git a/src/test/skript/tests/syntaxes/conditions/CondIsInLove.sk b/src/test/skript/tests/syntaxes/conditions/CondIsInLove.sk
new file mode 100644
index 00000000000..2a23f4860e8
--- /dev/null
+++ b/src/test/skript/tests/syntaxes/conditions/CondIsInLove.sk
@@ -0,0 +1,26 @@
+test "valid entity is in love":
+	set {_spawn} to spawn of world "world"
+	spawn adult cow at {_spawn}
+	set {_cow} to last spawned cow
+	assert love time of {_cow} is 0 seconds with "cow love time was not 0 seconds after spawning"
+	assert {_cow} is not in love with "cow is in love after spawning"
+	set love time of {_cow} to 10 seconds
+	assert {_cow} is in love with "cow is not in love after setting love time"
+	add 10 seconds to love time of {_cow}
+	assert love time of {_cow} > 10 seconds with "cow love time didn't go up after adding"
+	remove 1 minute from love time of {_cow}
+	assert {_cow} is not in love with "cow is in love after removing more love than possible"
+	add 10 minutes to love time of {_cow}
+	assert {_cow} is in love with "cow didn't enter love mode after adding love time"
+	reset love time of {_cow}
+	assert {_cow} is not in love with "cow was still in love even after resetting love time"
+	delete all cows
+
+test "invalid entity is in love":
+	set {_spawn} to spawn of world "world"
+	spawn adult zombie at {_spawn}
+	set {_zombie} to last spawned zombie
+	assert love time of {_zombie} is 0 seconds with "zombie was in love on spawn"
+	set love time of {_zombie} to 10 minutes
+	assert love time of {_zombie} is 0 seconds with "zombie was in love after set"
+	delete all zombies
diff --git a/src/test/skript/tests/syntaxes/conditions/CondIsInvulnerable.sk b/src/test/skript/tests/syntaxes/conditions/CondIsInvulnerable.sk
new file mode 100644
index 00000000000..50c76b7f1a7
--- /dev/null
+++ b/src/test/skript/tests/syntaxes/conditions/CondIsInvulnerable.sk
@@ -0,0 +1,12 @@
+test "CondIsInvulnerable" when running minecraft "1.20.6":
+	assert creative is invulnerable with "Creative mode should be invulnerable"
+	assert survival is not invulnerable with "Survival mode should not be invulnerable"
+
+test "CondIsInvulnerable":
+	spawn armor stand at spawn of world "world":
+		make entity invulnerable
+		assert entity is invulnerable with "Entity should be invulnerable"
+		make entity vulnerable
+		assert entity is not invulnerable with "Entity should be vulnerable"
+		delete entity
+	assert {_none} is not invulnerable with "Empty variable should be vulnerable"
diff --git a/src/test/skript/tests/syntaxes/conditions/CondIsLoaded.sk b/src/test/skript/tests/syntaxes/conditions/CondIsLoaded.sk
new file mode 100644
index 00000000000..49c3642847e
--- /dev/null
+++ b/src/test/skript/tests/syntaxes/conditions/CondIsLoaded.sk
@@ -0,0 +1,20 @@
+options:
+	path: "../../../../../../src/test/skript/tests/"
+
+	# Princess test script is in another castle, Mario!
+	# paths are relativised to the /scripts/ directory
+	# but we are loading these scripts from the test folder :(
+
+using script reflection
+
+test "this script is loaded":
+	assert the current script is loaded with "this script was not loaded"
+
+test "other script is loaded":
+	set {_path} to {@path} + "misc/-disabled.sk"
+	set {_script} to script named {_path}
+	assert {_script} is not loaded with "disabled script was loaded"
+
+	set {_path} to {@path} + "misc/dummy.sk"
+	set {_script} to script named {_path}
+	assert {_script} is loaded with "enabled script was not loaded"
diff --git a/src/test/skript/tests/syntaxes/conditions/CondIsLootable.sk b/src/test/skript/tests/syntaxes/conditions/CondIsLootable.sk
new file mode 100644
index 00000000000..86c8def8824
--- /dev/null
+++ b/src/test/skript/tests/syntaxes/conditions/CondIsLootable.sk
@@ -0,0 +1,17 @@
+test "is lootable":
+	spawn a pig at test-location
+	set {_pig} to last spawned pig
+
+	assert {_pig} is lootable with "is lootable entity failed"
+
+	delete entity within {_pig}
+
+	set {_pastBlock} to block data of test-block
+
+	set test-block to white wool
+	assert test-block is not lootable with "is not lootable failed"
+
+	set test-block to chest
+	assert test-block is lootable with "is lootable chest failed"
+
+	set test-block to {_pastBlock}
diff --git a/src/test/skript/tests/syntaxes/conditions/CondIsOfType.sk b/src/test/skript/tests/syntaxes/conditions/CondIsOfType.sk
index c4a7ce6e5e1..68717cdca7d 100644
--- a/src/test/skript/tests/syntaxes/conditions/CondIsOfType.sk
+++ b/src/test/skript/tests/syntaxes/conditions/CondIsOfType.sk
@@ -1,3 +1,6 @@
+aliases:
+	sword = diamond sword, iron sword, golden sword, stone sword, wooden sword
+
 test "item is of type condition":
 	assert stone is of type stone with "stone isn't of type stone"
 	assert 12 stone is of type stone with "12 stone isn't of type stone"
@@ -7,7 +10,7 @@ test "item is of type condition":
 	assert diamond sword of sharpness is of type diamond sword with "enchanted diamond sword isn't of type diamond sword"
 	assert stone sword is of type sword with "stone sword isn't of type sword"
 
-	assert gold sword of smite named "test" is not of type iron sword with "enchanted named gold sword is of type iron sword"
+	assert golden sword of smite named "test" is not of type iron sword with "enchanted named gold sword is of type iron sword"
 
 	assert armor stand is of type armor stand with "armor stand isn't of type armor stand"
 	assert 12 armor stand is of type 1 armor stand with "12 armor stand isn't of type 1 armor stand"
@@ -17,23 +20,23 @@ test "item is of type condition":
 	assert ender pearl is of type plain ender pearl with "ender pearl isn't of type plain ender pearl"
 
 test "entity is of type condition":
-    spawn zombie at spawn of "world"
-    assert last spawned zombie is of type zombie with "zombie isn't of type zombie"
-    assert last spawned zombie is not of type ghast with "zombie isn't of type ghast"
-    set {_zombie} to last spawned zombie
-    assert {_zombie} is of type zombie with "zombie in a variable isn't of type zombie"
-    delete last spawned zombie
-
-    spawn armor stand at spawn of "world"
-    assert last spawned armor stand is of type armor stand with "armor stand isn't of type armor stand"
-    assert last spawned armor stand is not of type ghast with "armor stand isn't of type ghast"
-    set {_armor-stand} to last spawned armor stand
-    assert {_armor-stand} is of type armor stand with "armor stand in a variable isn't of type armor stand"
-    delete last spawned armor stand
-
-    spawn enderpearl at spawn of "world"
-    assert last spawned enderpearl is of type ender pearl with "enderpearl isn't of type enderpearl"
-    assert last spawned enderpearl is not of type ghast with "enderpearl isn't of type ghast"
-    set {_enderpearl} to last spawned enderpearl
-    assert {_enderpearl} is of type ender pearl with "enderpearl in a variable isn't of type enderpearl"
-    delete last spawned enderpearl
+	spawn zombie at spawn of "world"
+	assert last spawned zombie is of type zombie with "zombie isn't of type zombie"
+	assert last spawned zombie is not of type ghast with "zombie isn't of type ghast"
+	set {_zombie} to last spawned zombie
+	assert {_zombie} is of type zombie with "zombie in a variable isn't of type zombie"
+	delete last spawned zombie
+
+	spawn armor stand at spawn of "world"
+	assert last spawned armor stand is of type armor stand with "armor stand isn't of type armor stand"
+	assert last spawned armor stand is not of type ghast with "armor stand isn't of type ghast"
+	set {_armor-stand} to last spawned armor stand
+	assert {_armor-stand} is of type armor stand with "armor stand in a variable isn't of type armor stand"
+	delete last spawned armor stand
+
+	spawn enderpearl at spawn of "world"
+	assert last spawned enderpearl is of type ender pearl with "enderpearl isn't of type enderpearl"
+	assert last spawned enderpearl is not of type ghast with "enderpearl isn't of type ghast"
+	set {_enderpearl} to last spawned enderpearl
+	assert {_enderpearl} is of type ender pearl with "enderpearl in a variable isn't of type enderpearl"
+	delete last spawned enderpearl
diff --git a/src/test/skript/tests/syntaxes/conditions/CondIsPreferredTool.sk b/src/test/skript/tests/syntaxes/conditions/CondIsPreferredTool.sk
index 585055cdf88..0139eef1979 100644
--- a/src/test/skript/tests/syntaxes/conditions/CondIsPreferredTool.sk
+++ b/src/test/skript/tests/syntaxes/conditions/CondIsPreferredTool.sk
@@ -1,4 +1,4 @@
-test "CondIsPreferredTool - BlockData" when running minecraft "1.19.2":
+test "CondIsPreferredTool - BlockData":
 	assert wooden pickaxe is preferred tool for minecraft:stone[] with "failed wooden pickaxe for stone blockdata"
 	assert wooden pickaxe is preferred tool for minecraft:dirt[] with "failed wooden pickaxe for dirt blockdata"
 	assert wooden pickaxe is not preferred tool for minecraft:obsidian[] with "failed wooden pickaxe for obsidian blockdata"
@@ -8,13 +8,13 @@ test "CondIsPreferredTool - BlockData" when running minecraft "1.19.2":
 	assert wooden axe is not preferred tool for minecraft:stone[] with "failed wooden axe for stone blockdata"
 	assert wooden axe is preferred tool for minecraft:dirt[] with "failed wooden axe for dirt blockdata"
 
-test "CondIsPreferredTool - Block" when running minecraft "1.16.5":
+test "CondIsPreferredTool - Block":
 	set {_block} to block at location(0,0,0, "world")
 	set {_temp} to {_block}'s type
-	set block at {_block} to grass
-	assert wooden axe is preferred tool for {_block} with "failed wooden axe for grass"
-	assert wooden pickaxe is preferred tool for {_block} with "failed wooden pickaxe for grass"
-	assert diamond pickaxe is preferred tool for {_block} with "failed diamond pickaxe for grass"
+	set block at {_block} to grass block
+	assert wooden axe is preferred tool for {_block} with "failed wooden axe for grass block"
+	assert wooden pickaxe is preferred tool for {_block} with "failed wooden pickaxe for grass block"
+	assert diamond pickaxe is preferred tool for {_block} with "failed diamond pickaxe for grass block"
 
 	set block at {_block} to obsidian
 	assert wooden axe is not preferred tool for {_block} with "failed wooden axe for obsidian"
diff --git a/src/test/skript/tests/syntaxes/conditions/CondIsSaddled.sk b/src/test/skript/tests/syntaxes/conditions/CondIsSaddled.sk
new file mode 100644
index 00000000000..92c3067d5ee
--- /dev/null
+++ b/src/test/skript/tests/syntaxes/conditions/CondIsSaddled.sk
@@ -0,0 +1,15 @@
+test "is saddled":
+	spawn a horse at (spawn of world "world"):
+		set {_horse} to event-entity
+
+	spawn a pig at (spawn of world "world"):
+		set {_pig} to event-entity
+
+	equip {_horse} and {_pig} with saddle
+	assert {_horse} and {_pig} are saddled with "equipping a horse or steerable with a saddle should do exactly that"
+
+	unequip saddle from {_horse} and {_pig}
+	assert {_horse} and {_pig} aren't saddled with "unequipping a saddle from a horse or steerable should do exactly that"
+
+	delete entity within {_horse}
+	delete entity within {_pig}
diff --git a/src/test/skript/tests/syntaxes/conditions/CondIsSolid.sk b/src/test/skript/tests/syntaxes/conditions/CondIsSolid.sk
index 6ea30920b2b..48f40a8fb65 100644
--- a/src/test/skript/tests/syntaxes/conditions/CondIsSolid.sk
+++ b/src/test/skript/tests/syntaxes/conditions/CondIsSolid.sk
@@ -1,4 +1,4 @@
 test "solid condition":
 	assert air isn't solid with "air is solid"
 	assert diamond isn't solid with "diamond is solid"
-	assert oak plank is solid with "oak plank isn't solid"
+	assert oak planks are solid with "oak plank isn't solid"
diff --git a/src/test/skript/tests/syntaxes/conditions/CondIsTagged.sk b/src/test/skript/tests/syntaxes/conditions/CondIsTagged.sk
new file mode 100644
index 00000000000..7b6ec7b5638
--- /dev/null
+++ b/src/test/skript/tests/syntaxes/conditions/CondIsTagged.sk
@@ -0,0 +1,16 @@
+test "CondIsTagged":
+	assert oak slab is tagged as item tag "slabs" with "oak slab is not a slab"
+	assert oak slab is not tagged as item tag "stairs" with "oak slab is somehow a stair"
+	assert a skeleton is tagged as entity tag "minecraft:skeletons" with "skeleton is not a skeleton"
+	assert a cow is not tagged as tag "unknown" with "a cow is somehow tagged as unknown"
+
+	assert a skeleton and a stray are tagged as tag "skeletons" with "skeleton and stray are not skeletons"
+	assert a skeleton or a zombie is tagged as tag "skeletons" with "skeleton or zombie are not skeletons"
+
+	set block at location(0,20,0) to oak slab
+	assert block at location(0,20,0) is tagged as block tag "slabs" with "oak slab is not a slab"
+	set block at location(0,20,0) to air
+
+	spawn a skeleton at spawn of world "world":
+		assert entity is tagged as entity tag "minecraft:skeletons" with "skeleton is not a skeleton"
+		delete entity
diff --git a/src/test/skript/tests/syntaxes/conditions/CondIsTamed.sk b/src/test/skript/tests/syntaxes/conditions/CondIsTamed.sk
new file mode 100644
index 00000000000..6f9c20ad52c
--- /dev/null
+++ b/src/test/skript/tests/syntaxes/conditions/CondIsTamed.sk
@@ -0,0 +1,21 @@
+test "is tamed":
+	spawn a horse at test-location:
+		set {_e} to entity
+	spawn an adult zombie at test-location:
+		set {_z} to entity
+
+	assert {_e} is not tamed with "a normally spawned horse should not be tamed"
+
+	tame {_e}
+	assert {_e} is tamed with "taming a horse should do exactly that"
+
+	untame {_e}
+	assert {_e} is not tamed with "untaming a horse should do exactly that"
+
+	tame {_}
+	tame {_z}
+	assert {_} is not tamed with "taming null should do nothing"
+	assert {_z} is not tamed with "taming an invalid entity should do nothing"
+
+	delete entity within {_e}
+	delete entity within {_z}
diff --git a/src/test/skript/tests/syntaxes/conditions/CondIsTicking.sk b/src/test/skript/tests/syntaxes/conditions/CondIsTicking.sk
new file mode 100644
index 00000000000..a4cbab33322
--- /dev/null
+++ b/src/test/skript/tests/syntaxes/conditions/CondIsTicking.sk
@@ -0,0 +1,14 @@
+test "is entity ticking":
+
+	spawn an adult zombie at location(512, 1, 512):
+		add entity to {_z::*}
+
+	spawn an adult zombie at (spawn of world "world"):
+		add entity to {_z::*}
+
+	assert {_z::1} isn't ticking with "Chunk isn't loaded, therefore should not tick"
+
+	assert {_z::2} is ticking with "Chunk is loaded, therefore should tick"
+
+	delete entities within {_z::*}
+
diff --git a/src/test/skript/tests/syntaxes/conditions/CondIsWithin.sk b/src/test/skript/tests/syntaxes/conditions/CondIsWithin.sk
index 757bfa49633..0bc71d177bf 100644
--- a/src/test/skript/tests/syntaxes/conditions/CondIsWithin.sk
+++ b/src/test/skript/tests/syntaxes/conditions/CondIsWithin.sk
@@ -1,4 +1,4 @@
-test "within condition" when running minecraft "1.17":
+test "within condition":
 	# two locations
 	set {_loc1} to location(0, 0, 0, "world")
 	set {_loc2} to location(20, 20, 20, "world")
@@ -24,32 +24,7 @@ test "within condition" when running minecraft "1.17":
 	assert ({_loc1} ~ vector(0,0.3,0)) is not within block at {_loc1} with "failed within block"
 
 	# entities
-	set {_loc} to spawn of world "world"
-	spawn a pig at {_loc}
-	set {_pig} to last spawned entity
-	assert {_loc} is within {_pig} with "failed within entity"
-	assert {_loc1} is not within {_pig} with "failed within entity"
-
-	delete random entity of {_pig}
-
-test "within condition" when running below minecraft "1.17":
-	# two locations
-	set {_loc1} to location(0, 0, 0, "world")
-	set {_loc2} to location(20, 20, 20, "world")
-	assert location(10, 10, 10, "world") is within {_loc1} and {_loc2} with "failed within two locs"
-	assert location(10, -10, 10, "world") is not within {_loc1} and {_loc2} with "failed within two locs"
-	assert location(0, 0, 0, "world") is not within {_none} and {_none} with "failed within two locs"
-
-	# chunks
-	set {_chunk1} to chunk at {_loc1}
-	assert location(10, 10, 10, "world") is within {_chunk1} with "failed within chunk"
-	assert location(-10, 10, -10, "world") is not within {_chunk1} with "failed within chunk"
-
-	# worlds
-	assert location(10, 10, 10, "world") is within world("world") with "failed within world"
-
-	# entities
-	set {_loc} to spawn of world "world"
+	set {_loc} to test-location
 	spawn a pig at {_loc}
 	set {_pig} to last spawned entity
 	assert {_loc} is within {_pig} with "failed within entity"
diff --git a/src/test/skript/tests/syntaxes/conditions/CondPastFuture.sk b/src/test/skript/tests/syntaxes/conditions/CondPastFuture.sk
new file mode 100644
index 00000000000..c2b8388565e
--- /dev/null
+++ b/src/test/skript/tests/syntaxes/conditions/CondPastFuture.sk
@@ -0,0 +1,35 @@
+test "date in past or future":
+
+	# now is not in the past or future
+	# there's a very slight chance that the date created by `now` and the date used in the condition will be a millisecond apart
+	# so these comparisons are not 100% reliable. It's approximately one in a million on my machine, but would increase on worse hardware.
+	# We check specifically for ExprNow to help avoid this.
+	assert now is not in the past with "now should not be in the past"
+	assert now is not in the future with "now should not be in the future"
+	assert now has not passed with "now should not have passed"
+
+	# yesterday is in the past
+	assert 1 day ago is in the past with "yesterday should be in the past"
+	assert 1 day ago is not in the future with "yesterday should not be in the future"
+	assert 1 day ago has passed with "yesterday should have passed"
+
+	# tomorrow is in the future
+	assert 1 day from now is not in the past with "tomorrow should not be in the past"
+	assert 1 day from now is in the future with "tomorrow should be in the future"
+	assert 1 day from now has not passed with "tomorrow should not have passed"
+
+	# null is not in the past or future
+	assert {_null} is not in the past with "null should not be in the past"
+	assert {_null} is not in the future with "null should not be in the future"
+	assert {_null} has not passed with "null should not have passed"
+
+	# multiple dates
+	set {_dates::*} to 1 day ago, 1 second ago, and 100 years ago
+	assert {_dates::*} are in the past with "all dates should be in the past"
+	assert {_dates::*} are not in the future with "all dates should not be in the future"
+	assert {_dates::*} have passed with "all dates should have passed"
+
+	set {_dates::*} to 1 day from now, 1 second from now, and 100 years from now
+	assert {_dates::*} are not in the past with "all dates should not be in the past"
+	assert {_dates::*} are in the future with "all dates should be in the future"
+	assert {_dates::*} have not passed with "all dates should not have passed"
diff --git a/src/test/skript/tests/syntaxes/effects/EffAllowAging.sk b/src/test/skript/tests/syntaxes/effects/EffAllowAging.sk
new file mode 100644
index 00000000000..e79a3f06e18
--- /dev/null
+++ b/src/test/skript/tests/syntaxes/effects/EffAllowAging.sk
@@ -0,0 +1,10 @@
+test "allow aging":
+	set {_spawn} to spawn of world "world"
+	spawn baby pig at {_spawn}
+	set {_pig} to last spawned pig
+	assert {_pig} can age with "baby pig can't age before locking"
+	lock age of {_pig}
+	assert {_pig} can't age with "baby pig can still age after locking"
+	unlock age of {_pig}
+	assert {_pig} can age with "baby pig can't age after unlocking"
+	delete all pigs
diff --git a/src/test/skript/tests/syntaxes/effects/EffBlockUpdate.sk b/src/test/skript/tests/syntaxes/effects/EffBlockUpdate.sk
new file mode 100644
index 00000000000..e0404e3a5f8
--- /dev/null
+++ b/src/test/skript/tests/syntaxes/effects/EffBlockUpdate.sk
@@ -0,0 +1,8 @@
+test "block update":
+	set {_loc} to spawn of world "world" ~ vector(10,10,10)
+	set {_blocks::*} to blocks in radius 2 of block at {_loc}
+
+	update blocks at {_blocks::*} as sand without physics updates
+	assert blocks at {_blocks::*} is sand with "1 or more blocks did not update with or without physics"
+	update blocks at {_blocks::*} as air without physics updates
+	assert blocks at {_blocks::*} is air with "1 or more blocks did not update to air"
diff --git a/src/test/skript/tests/syntaxes/effects/EffBreedable.sk b/src/test/skript/tests/syntaxes/effects/EffBreedable.sk
new file mode 100644
index 00000000000..6010f26cff4
--- /dev/null
+++ b/src/test/skript/tests/syntaxes/effects/EffBreedable.sk
@@ -0,0 +1,10 @@
+test "breedable":
+	set {_spawn} to spawn of world "world"
+	spawn baby chicken at {_spawn}
+	set {_chicken} to last spawned chicken
+	assert {_chicken} can't breed with "chicken could breed before growing up"
+	make {_chicken} breedable
+	assert {_chicken} can breed with "chicken can't breed after growing up"
+	make {_chicken} non-breedable
+	assert {_chicken} can't breed with "chicken can breed after growing up and preventing"
+	delete all chickens
diff --git a/src/test/skript/tests/syntaxes/effects/EffChargeCreeper.sk b/src/test/skript/tests/syntaxes/effects/EffChargeCreeper.sk
deleted file mode 100644
index 47e9e8016af..00000000000
--- a/src/test/skript/tests/syntaxes/effects/EffChargeCreeper.sk
+++ /dev/null
@@ -1,8 +0,0 @@
-test "charge creeper effect/condition":
-	spawn a creeper at spawn of world "world"
-	assert last spawned creeper is not charged with "spawning a normal creeper shouldn't spawn a charged one"
-	charge the last spawned creeper
-	assert last spawned creeper is charged with "a creeper should be charged after it is set as charged"
-	uncharge the last spawned creeper
-	assert last spawned creeper is not charged with "uncharging a charged creeper should uncharge it"
-	delete last spawned creeper
diff --git a/src/test/skript/tests/syntaxes/effects/EffContinue.sk b/src/test/skript/tests/syntaxes/effects/EffContinue.sk
index 2400e7441e0..366dd051522 100644
--- a/src/test/skript/tests/syntaxes/effects/EffContinue.sk
+++ b/src/test/skript/tests/syntaxes/effects/EffContinue.sk
@@ -4,16 +4,25 @@ test "continue effect":
 			continue
 		assert loop-value is not 5 with "continue in loop failed"
 	set {_i} to 0
+
 	while {_i} is smaller than 10:
 		increase {_i} by 1
 		if {_i} is equal to 5:
 			continue
 		assert {_i} is not 5 with "continue in while failed"
+
 	loop integers from 1 to 10:
 		continue this loop if loop-value is 5
-		assert loop-value is not 5 with "leveled continue failed"
+		assert loop-value is not 5 with "leveled continue failed #1"
 		loop integers from 11 to 20:
 			continue 2nd loop if loop-value-2 is 15
-			assert loop-value-2 is not 15 with "leveled continue failed"
+			assert loop-value-2 is not 15 with "leveled continue failed #2"
 			continue 1st loop if loop-value-1 is 10
-		assert loop-value is not 10 with "leveled continue failed"
+		assert loop-value is not 10 with "leveled continue failed #3"
+
+	set {_ran} to false
+	loop 10 times:
+		loop 10 times:
+			continue
+		set {_ran} to true
+	assert {_ran} is true with "continue in nested loop continued outermost loop"
diff --git a/src/test/skript/tests/syntaxes/effects/EffDetonate.sk b/src/test/skript/tests/syntaxes/effects/EffDetonate.sk
new file mode 100644
index 00000000000..f7f7c803009
--- /dev/null
+++ b/src/test/skript/tests/syntaxes/effects/EffDetonate.sk
@@ -0,0 +1,21 @@
+test "detonate entity effect":
+	spawn a creeper at event-location ~ vector(0, 100, 0)
+	assert last spawned entity is valid with "creepers should not detonate when they are first spawned"
+	detonate last spawned entity
+	assert last spawned entity isn't valid with "creepers should instantly detonate when spawned"
+
+test "detonate explosive minecart":
+	spawn a minecart with tnt at event-location
+	assert last spawned entity is valid with "minecarts with tnt should not detonate when they are first spawned"
+	detonate last spawned entity
+	assert last spawned entity isn't valid with "minecarts with tnt should instantly detonate when they are first spawned"
+
+test "detonate wind charge" when running minecraft "1.21":
+	spawn a wind charge at event-location ~ vector(0, 100, 0)
+	assert last spawned entity is valid with "wind charges should not detonate when they are first spawned"
+	detonate last spawned entity
+	assert last spawned entity isn't valid with "wind charges should instantly detonate when spawned"
+
+
+
+# The fireworks test cannot be added as fireworks are despawned a tick later and tests are instant
diff --git a/src/test/skript/tests/syntaxes/effects/EffDoIf.sk b/src/test/skript/tests/syntaxes/effects/EffDoIf.sk
index da17471d8d5..b9637ed3332 100644
--- a/src/test/skript/tests/syntaxes/effects/EffDoIf.sk
+++ b/src/test/skript/tests/syntaxes/effects/EffDoIf.sk
@@ -1,6 +1,6 @@
 test "do if":
-  set {_false} to false if 1 is 1
-  assert {_false} is false with "Do if didn't run when it should have"
+	set {_false} to false if 1 is 1
+	assert {_false} is false with "Do if didn't run when it should have"
 
-  set {_unset} to true if 1 is 2
-  assert {_unset} is not set with "Do if ran when it shouldn't have"
+	set {_unset} to true if 1 is 2
+	assert {_unset} is not set with "Do if ran when it shouldn't have"
diff --git a/src/test/skript/tests/syntaxes/effects/EffEquip.sk b/src/test/skript/tests/syntaxes/effects/EffEquip.sk
index a4a88a94f28..a2a91f68500 100644
--- a/src/test/skript/tests/syntaxes/effects/EffEquip.sk
+++ b/src/test/skript/tests/syntaxes/effects/EffEquip.sk
@@ -1,12 +1,77 @@
+aliases:
+	test any boots = diamond boots, iron boots, golden boots, chainmail boots, leather boots
+
 test "equip effect":
-	spawn a zombie at spawn of "world":
-		set {_entity} to event-entity
 
-	equip {_entity} with a diamond chestplate
-	assert chestplate of {_entity} is a diamond chestplate with "entity was not wearing a diamond chestplate"
-	set chestplate of {_entity} to air
+	# === ARMOUR ===
+
+	spawn a zombie at (spawn of world "world"):
+		set {_zombie} to entity
+
+	clear helmet of {_zombie}
+	clear chestplate of {_zombie}
+	clear leggings of {_zombie}
+	clear boots of {_zombie}
+
+	assert helmet of {_zombie} is air with "the modified zombie shouldn't be wearing a helmet"
+	assert chestplate of {_zombie} is air with "the modified zombie shouldn't be wearing a chestplate"
+	assert leggings of {_zombie} is air with "the modified zombie shouldn't be wearing leggings"
+	assert boots of {_zombie} is air with "the modified zombie shouldn't be wearing boots"
+
+	equip {_zombie} with iron helmet
+	equip {_zombie} with diamond chestplate
+	equip {_zombie} with diamond leggings
+	equip {_zombie} with test any boots
+	assert helmet of {_zombie} is iron helmet with "equipping a zombie with a helmet should do exactly that"
+	assert chestplate of {_zombie} is diamond chestplate with "equipping a zombie with a chestplate should do exactly that"
+	assert leggings of {_zombie} is diamond leggings with "equipping a zombie with leggings should do exactly that"
+	assert boots of {_zombie} is test any boots with "equipping a zombie with boots should do exactly that"
+
+	unequip {_zombie}'s armour
+	assert helmet of {_zombie} is air with "unequipping an entity should remove its armour"
+	assert chestplate of {_zombie} is air with "unequipping an entity should remove its armour"
+	assert leggings of {_zombie} is air with "unequipping an entity should remove its armour"
+	assert boots of {_zombie} is air with "unequipping an entity should remove its armour"
+
+	# === HORSE ARMOUR ===
+
+	spawn a horse at (spawn of world "world"):
+		set {_horse} to entity
+
+	equip {_horse} with diamond horse armor
+	assert {_horse} is wearing diamond horse armor with "equipping a horse with horse armour should do exactly that"
+
+	unequip diamond horse armor from {_horse}
+	assert {_horse} is not wearing diamond horse armor with "unequipping horse armour from a horse should do exactly that"
+
+	# === SADDLES ===
+
+	spawn a pig at (spawn of world "world"):
+		set {_pig} to entity
+
+	assert {_horse} and {_pig} don't have saddles with "normally spawned horses and pigs should not have saddles"
+
+	equip {_horse} and {_pig} with saddle
+	assert {_horse} and {_pig} have saddles with "equipping a horse or pig with a saddle should do exactly that"
+
+	unequip saddle from {_horse} and {_pig}
+	assert {_horse} and {_pig} don't have saddles with "unequipping a saddle from a horse or pig should do exactly that"
+
+	# === CLEANUP ===
+
+	delete entity within {_zombie}
+	delete entity within {_horse}
+	delete entity within {_pig}
+
+test "equip - wolf armor" when running minecraft "1.20.5":
+
+	spawn a wolf at (spawn of world "world"):
+		set {_wolf} to entity
+
+	equip {_wolf} with wolf armor
+	assert {_wolf} is wearing wolf armor with "equipping a wolf with wolf armor should do exactly that"
 
-	equip {_entity} with a diamond chestplate named "Test"
-	assert chestplate of {_entity} is a diamond chestplate named "Test" with "entity was not wearing a named diamond chestplate"
+	unequip wolf armor from {_wolf}
+	assert {_wolf} is not wearing wolf armor with "unequipping wolf armor from a wolf should do exactly that"
 
-	delete the entity within {_entity}
+	delete entity within {_wolf}
diff --git a/src/test/skript/tests/syntaxes/effects/EffExplodeCreeper.sk b/src/test/skript/tests/syntaxes/effects/EffExplodeCreeper.sk
index 3c29aa2a28f..8cf30bbd0eb 100644
--- a/src/test/skript/tests/syntaxes/effects/EffExplodeCreeper.sk
+++ b/src/test/skript/tests/syntaxes/effects/EffExplodeCreeper.sk
@@ -1,5 +1,5 @@
-test "explode creeper effect/condition" when running minecraft "1.15.2":
-	spawn a creeper at spawn of world "world"
+test "explode creeper effect/condition":
+	spawn a creeper at test-location
 	assert last spawned creeper is not going to explode with "creepers should not explode when they are first spawned"
 	start ignition of the last spawned creeper
 	assert last spawned creeper is going to explode with "creepers should explode when the ignition process is started"
diff --git a/src/test/skript/tests/syntaxes/effects/EffExplodeWithFire.sk b/src/test/skript/tests/syntaxes/effects/EffExplodeWithFire.sk
index fce4c2d37eb..1f317bb2ce2 100644
--- a/src/test/skript/tests/syntaxes/effects/EffExplodeWithFire.sk
+++ b/src/test/skript/tests/syntaxes/effects/EffExplodeWithFire.sk
@@ -1,5 +1,5 @@
 test "explode with fire effect/condition":
-	spawn a primed tnt at spawn of world "world"
+	spawn a primed tnt at test-location
 	assert last spawned primed tnt doesn't cause an incendiary explosion with "a primed tnt's explosion shouldn't cause fire by default"
 	make the last spawned primed tnt's explosion fiery
 	assert last spawned primed tnt causes an incendiary explosion with "a primed tnt's explosion should cause fire when set to"
diff --git a/src/test/skript/tests/syntaxes/effects/EffGlowingText.sk b/src/test/skript/tests/syntaxes/effects/EffGlowingText.sk
index d39b3e6988a..4fab70da34e 100644
--- a/src/test/skript/tests/syntaxes/effects/EffGlowingText.sk
+++ b/src/test/skript/tests/syntaxes/effects/EffGlowingText.sk
@@ -1,7 +1,7 @@
-test "glowing sign blocks" when running minecraft "1.17.1":
+test "glowing sign blocks":
 	set {_loc} to spawn of "world"
 	set {_original block} to type of block at {_loc}
-	set block at {_loc} to sign
+	set block at {_loc} to oak wall sign
 	assert block at {_loc} doesn't have glowing text with "Sign had glowing text erroneously (1)"
 	make block at {_loc} have glowing text
 	assert block at {_loc} has glowing text with "Sign had normal text erroneously"
@@ -9,8 +9,8 @@ test "glowing sign blocks" when running minecraft "1.17.1":
 	assert block at {_loc} doesn't have glowing text with "Sign had glowing text erroneously (2)"
 	set block at {_loc} to {_original block}
 
-test "glowing sign items" when running minecraft "1.17.1":
-	set {_sign} to floor sign
+test "glowing sign items":
+	set {_sign} to oak sign
 	assert {_sign} doesn't have glowing text with "Sign had glowing text erroneously (1)"
 	make {_sign} have glowing text
 	assert {_sign} has glowing text with "Sign had normal text erroneously"
diff --git a/src/test/skript/tests/syntaxes/effects/EffHandedness.sk b/src/test/skript/tests/syntaxes/effects/EffHandedness.sk
index f4df6141be5..7d55bc1abda 100644
--- a/src/test/skript/tests/syntaxes/effects/EffHandedness.sk
+++ b/src/test/skript/tests/syntaxes/effects/EffHandedness.sk
@@ -1,5 +1,5 @@
-test "left handedness" when running minecraft "1.17.1":
-	spawn skeleton at spawn of world "world":
+test "left handedness":
+	spawn skeleton at test-location:
 		make entity right handed
 		assert entity is not left handed with "zombie is left handed after being made right handed"
 		assert entity is right handed with "zombie is not right handed after being made right handed"
diff --git a/src/test/skript/tests/syntaxes/effects/EffHealth.sk b/src/test/skript/tests/syntaxes/effects/EffHealth.sk
index 719522ed0a6..ca417b36eec 100644
--- a/src/test/skript/tests/syntaxes/effects/EffHealth.sk
+++ b/src/test/skript/tests/syntaxes/effects/EffHealth.sk
@@ -7,9 +7,10 @@ test "health effect":
 	repair {_i} by 49
 	assert {_i}'s damage value is 1 with "repair item failed"
 
-	spawn cow at location(0, 64, 0, world "world")
+	spawn cow at test-location
 	set {_m} to last spawned cow
 	assert health of {_m} is 5 with "default cow health failed"
+
 	damage {_m} by 3
 	assert health of {_m} is 2 with "damage cow failed"
 	heal {_m} by 1
@@ -18,4 +19,13 @@ test "health effect":
 	assert health of {_m} is 3.5 with "heal cow failed"
 	heal {_m} by 99
 	assert health of {_m} is 5 with "heal cow failed"
+	delete the entity in {_m}
+
+	parse if running minecraft "1.20.4":
+		spawn cow at test-location
+		set {_m} to last spawned cow
+		assert health of {_m} is 5 with "default cow (with cause) health failed"
+		damage {_m} by 2 hearts with damage cause fall
+		assert health of {_m} is 3 with "damage cow (with cause) failed"
+
 	clear all entities
diff --git a/src/test/skript/tests/syntaxes/effects/EffInvisible.sk b/src/test/skript/tests/syntaxes/effects/EffInvisible.sk
index faf43e5602e..b0023d7d638 100644
--- a/src/test/skript/tests/syntaxes/effects/EffInvisible.sk
+++ b/src/test/skript/tests/syntaxes/effects/EffInvisible.sk
@@ -1,5 +1,5 @@
-test "entity invisibility" when running minecraft "1.16.3":
-	spawn pig at spawn of world "world":
+test "entity invisibility":
+	spawn pig at test-location:
 		make entity invisible
 		assert entity is invisible with "failed to make pig invisible"
 		make entity visible
diff --git a/src/test/skript/tests/syntaxes/effects/EffLidStates.sk b/src/test/skript/tests/syntaxes/effects/EffLidStates.sk
new file mode 100644
index 00000000000..f5e99ea6c36
--- /dev/null
+++ b/src/test/skript/tests/syntaxes/effects/EffLidStates.sk
@@ -0,0 +1,18 @@
+test "lid states":
+	set {_loc} to spawn of world "world" ~ vector(3,0,0)
+	set block at {_loc} to chest
+	set {_locs::*} to {_loc}
+	loop 2 times:
+		add {_loc} ~ vector(loop-number,0,0) to {_locs::*}
+	set block at {_locs::2} to ender chest
+	set block at {_locs::3} to barrel
+
+	open the lids for (blocks at {_locs::*})
+	assert the lids of (blocks at {_locs::*}) are opened with "1 or more lidded blocks are not open"
+	assert the lids of (blocks at {_locs::*}) are not closed with "1 or more lidded block are closed"
+
+	close the lids for (blocks at {_locs::*})
+	assert the lids of (blocks at {_locs::*}) are closed with "1 or more lidded block are not closed"
+	assert the lids of (blocks at {_locs::*}) are not opened with "1 or more lidded blocks are open"
+
+	set blocks at {_locs::*} to air
diff --git a/src/test/skript/tests/syntaxes/effects/EffMakeAdultOrBaby.sk b/src/test/skript/tests/syntaxes/effects/EffMakeAdultOrBaby.sk
new file mode 100644
index 00000000000..749a8159edc
--- /dev/null
+++ b/src/test/skript/tests/syntaxes/effects/EffMakeAdultOrBaby.sk
@@ -0,0 +1,21 @@
+test "make mob adult":
+	set {_spawn} to spawn of world "world"
+	spawn baby zombie at {_spawn}
+	set {_zombie} to last spawned zombie
+	assert {_zombie} is a baby with "spawned zombie was an adult"
+	make {_zombie} an adult
+	assert {_zombie} is an adult with "spawned zombie is still a baby zombie"
+	make {_zombie} a baby
+	assert {_zombie} is not an adult with "spawned zombie didn't become a baby zombie"
+	delete all zombies
+
+test "make animal adult":
+	set {_spawn} to spawn of world "world"
+	spawn baby sheep at {_spawn}
+	set {_sheep} to last spawned sheep
+	assert {_sheep} is a baby with "spawned sheep was an adult"
+	make {_sheep} an adult
+	assert {_sheep} is an adult with "spawned sheep is still a baby sheep"
+	make {_sheep} a baby
+	assert {_sheep} is not an adult with "spawned sheep didn't become a baby sheep"
+	delete all sheep
diff --git a/src/test/skript/tests/syntaxes/effects/EffPotion.sk b/src/test/skript/tests/syntaxes/effects/EffPotion.sk
index 0db81c9d2d7..2750a6f19d8 100644
--- a/src/test/skript/tests/syntaxes/effects/EffPotion.sk
+++ b/src/test/skript/tests/syntaxes/effects/EffPotion.sk
@@ -1,5 +1,5 @@
 test "potion effect":
-	spawn a pig at spawn of world "world"
+	spawn a pig at test-location
 	set {_pig} to last spawned pig
 	set {_potion} to potion effect of slowness of tier 5 for 10 seconds
 	apply {_potion} to {_pig}
diff --git a/src/test/skript/tests/syntaxes/effects/EffPvP.sk b/src/test/skript/tests/syntaxes/effects/EffPvP.sk
index bb41b776670..37cee2ea12f 100644
--- a/src/test/skript/tests/syntaxes/effects/EffPvP.sk
+++ b/src/test/skript/tests/syntaxes/effects/EffPvP.sk
@@ -1,6 +1,6 @@
 test "pvp effect":
-  set {_world} to first element out of all worlds
-  disable pvp in {_world}
-  assert pvp is disabled in {_world} with "PvP was not disabled"
-  enable pvp in {_world}
-  assert pvp is enabled in {_world} with "PvP was not enabled"
+	set {_world} to first element out of all worlds
+	disable pvp in {_world}
+	assert pvp is disabled in {_world} with "PvP was not disabled"
+	enable pvp in {_world}
+	assert pvp is enabled in {_world} with "PvP was not enabled"
diff --git a/src/test/skript/tests/syntaxes/effects/EffRegisterTag.sk b/src/test/skript/tests/syntaxes/effects/EffRegisterTag.sk
new file mode 100644
index 00000000000..d3cde7b75aa
--- /dev/null
+++ b/src/test/skript/tests/syntaxes/effects/EffRegisterTag.sk
@@ -0,0 +1,7 @@
+test "register tags":
+	register a custom item tag named "oak" containing oak log, oak planks, and oak wood
+	assert custom tag "oak" is set with "tag was not registered"
+	assert tag contents of tag "skript:oak" contains oak wood, oak log, and oak planks with "tag doesn't contain the right items"
+
+	register an entity type tag named "skript:little_guy" using a baby zombie
+	assert a baby zombie is tagged as custom tag "little_guy" with "failed to classify baby zombie as a little guy"
diff --git a/src/test/skript/tests/syntaxes/effects/EffReplace.sk b/src/test/skript/tests/syntaxes/effects/EffReplace.sk
index 26c38b89690..63828c0218c 100644
--- a/src/test/skript/tests/syntaxes/effects/EffReplace.sk
+++ b/src/test/skript/tests/syntaxes/effects/EffReplace.sk
@@ -48,3 +48,26 @@ test "replace strings":
 	assert {_list::1} is "(replaced)" with "Incorrect ExpressionList replacement value (1)"
 	assert {_list::2} is "2" with "Incorrect ExpressionList replacement value (2)"
 	assert {_list::3} is "(replaced)2" with "Incorrect ExpressionList replacement value (3)"
+
+	# Regex replacing
+	set {_x} to "abc123aACAB"
+	regex replace "123a" in {_x} with "123"
+	assert {_x} is "abc123ACAB" with "regex replace failed"
+	regex replace "\d" with "x" in {_x}
+	assert {_x} is "abcxxxACAB" with "regex replace failed"
+	regex replace "^[acb]+" in {_x} with "y"
+	assert {_x} is "yxxxACAB" with "regex replace failed"
+	regex replace "(?i)[bAc]" in {_x} with "z"
+	assert {_x} is "yxxxzzzz" with "regex replace failed"
+
+	set {_x} to "a" parsed as number
+	regex replace "a" in {_x} with "b"
+	assert {_x} is not set with "regex replace with invalid value succeeded"
+
+	set {_y} to "a"
+	regex replace {_x} in {_y} with "b"
+	assert {_y} is "a" with "regex replace with invalid pattern succeeded"
+	regex replace {_x} in {_y} with {_x}
+	assert {_y} is "a" with "regex replace with invalid pattern and replacement succeeded"
+	regex replace "a" in {_y} with {_x}
+	assert {_y} is "a" with "regex replace with invalid pattern succeeded"
diff --git a/src/test/skript/tests/syntaxes/effects/EffRotate.sk b/src/test/skript/tests/syntaxes/effects/EffRotate.sk
new file mode 100644
index 00000000000..2de71407a8e
--- /dev/null
+++ b/src/test/skript/tests/syntaxes/effects/EffRotate.sk
@@ -0,0 +1,74 @@
+test "rotate around global axis":
+	set {_v::1} to vector(1, 1, 1)
+	set {_v::2} to quaternion(1, 0, 0, 0)
+
+	spawn block display at spawn of world "world":
+		set {_v::3} to entity
+
+	rotate {_v::*} around y axis by 90 degrees
+	assert {_v::1} is vector(1, 1, -1) with "rotate vector around y axis failed"
+	assert {_v::2} is quaternion(0.7071067690849304, 0, 0.7071067690849304, 0) with "rotate quaternion around y axis failed"
+	assert left rotation of {_v::3} is quaternion(0.7071067690849304, 0, 0.7071067690849304, 0) with "rotate display around y axis failed"
+
+	rotate {_v::*} around x axis by -90 degrees
+	assert {_v::1} is vector(1, -1, -1) with "rotate vector around x axis failed"
+	assert {_v::2} is quaternion(0.4999999701976776, -0.4999999701976776, 0.4999999701976776, -0.4999999701976776) with "rotate quaternion around x axis failed"
+	assert left rotation of {_v::3} is quaternion(0.4999999701976776, -0.4999999701976776, 0.4999999701976776, -0.4999999701976776) with "rotate display around x axis failed"
+
+	rotate {_v::*} around z axis by -90 degrees
+	assert {_v::1} is vector(-1, -1, -1) with "rotate vector around z axis failed"
+	assert {_v::2} is quaternion(0, 0, 0.7071067094802856, -0.7071067094802856) with "rotate quaternion around z axis failed"
+	assert left rotation of {_v::3} is quaternion(0, 0, 0.7071067094802856, -0.7071067094802856) with "rotate display around z axis failed"
+
+	delete entity within {_v::3}
+
+test "rotate around local axis":
+	set {_v::1} to vector(1, 1, 1)
+	set {_v::2} to quaternion(1, 0, 0, 0)
+	spawn block display at spawn of world "world":
+		set {_v::3} to entity
+
+	rotate {_v::*} around local y axis by 90 degrees
+	assert {_v::1} is vector(1,1,1) with "rotate vector around local y axis unexpectedly modified vector"
+	assert {_v::2} is quaternion(0.7071067690849304, 0, 0.7071067690849304, 0) with "rotate quaternion around local y axis failed"
+	assert left rotation of {_v::3} is quaternion(0.7071067690849304, 0, 0.7071067690849304, 0) with "rotate display around local y axis failed"
+
+	rotate {_v::*} around local x axis by 90 degrees
+	assert {_v::1} is vector(1,1,1) with "rotate vector around local x axis unexpectedly modified vector"
+	assert {_v::2} is quaternion(0.4999999701976776, 0.4999999701976776, 0.4999999701976776, -0.4999999701976776) with "rotate quaternion around local x axis failed"
+	assert left rotation of {_v::3} is quaternion(0.4999999701976776, 0.4999999701976776, 0.4999999701976776, -0.4999999701976776) with "rotate display around local x axis failed"
+
+	rotate {_v::*} around local z axis by 90 degrees
+	assert {_v::1} is vector(1,1,1) with "rotate vector around local z axis unexpectedly modified vector"
+	assert {_v::2} is quaternion(0.7071067094802856, 0.7071067094802856, 0, 0) with "rotate quaternion around local z axis failed"
+	assert left rotation of {_v::3} is quaternion(0.7071067094802856, 0.7071067094802856, 0, 0) with "rotate display around local z axis failed"
+
+	delete entity within {_v::3}
+
+test "vector rotate around vector":
+	set {_x} to vector(1, 0, 0)
+	set {_y} to vector(0, 1, 0)
+	set {_z} to vector(0, 0, 1)
+
+	set {_v} to {_x}
+	rotate {_v} around {_y} by -90 degrees
+	assert {_v} is {_z} with "rotate around y vector failed"
+
+	rotate {_v} around {_x} by -90 degrees
+	assert {_v} is {_y} with "rotate around x vector failed"
+
+	rotate {_v} around {_z} by -90 degrees
+	assert {_v} is {_x} with "rotate around z vector failed"
+
+	rotate {_v} around vector(1, 1, 1) by 180 degrees
+	assert {_v} is vector(-1/3, 2/3, 2/3) with "rotate around non-orthogonal vector failed"
+
+	set {_v} to vector(2, 0, 0)
+	rotate {_v} around vector(0, 10, 0) by 90 degrees
+	assert {_v} is vector(0, 0, -2) with "rotate around non-unit vector failed"
+
+
+test "quaternion rotate by ZYX rotation":
+	set {_q} to quaternion(1,0,0,0)
+	rotate {_q} by x 90, y 90, z 90
+	assert {_q} is quaternion(0.7071067094802856, 0, 0.7071067094802856, 0) with "failed to rotate quaternion by ZYX"
diff --git a/src/test/skript/tests/syntaxes/effects/EffRun.sk b/src/test/skript/tests/syntaxes/effects/EffRun.sk
new file mode 100644
index 00000000000..2b0d68c74d8
--- /dev/null
+++ b/src/test/skript/tests/syntaxes/effects/EffRun.sk
@@ -0,0 +1,60 @@
+options:
+	path: "../../../../../../src/test/skript/tests/syntaxes/expressions/"
+	misc: "../../../../../../src/test/skript/tests/misc/"
+
+	# Princess test script is in another castle, Mario!
+	# paths are relativised to the /scripts/ directory
+	# but we are loading these scripts from the test folder :(
+
+using script reflection
+
+function testEffRun0():
+	set {EffRun} to true
+
+local function testEffRun1():
+	set {EffRun} to true
+
+test "run functions":
+	delete {EffRun}
+	set {_function} to function "testEffRun0()"
+	run {_function}
+	assert {EffRun} is true with "function didn't run"
+
+	delete {EffRun}
+	set {_function} to function "testEffRun1()"
+	run {_function}
+	assert {EffRun} is true with "local function didn't run"
+	delete {EffRun}
+
+test "run external functions":
+	set {_script} to the script named {@misc} + "dummy.sk"
+	set {_function} to function "testDummy()" from {_script}
+	assert {_function} exists with "function wasn't found"
+	run {_function} # does nothing, just fishing for errors :)
+
+	set {_script} to the script named {@path} + "ExprFunction.sk"
+	delete {ExprFunction}
+
+	set {_function} to function "testExprFunction0()" from {_script}
+	assert {_function} exists with "function wasn't found"
+	run {_function}
+	assert {ExprFunction} is true with "function didn't run"
+	delete {ExprFunction}
+
+	set {_function} to function "testExprFunction1()" from {_script}
+	assert {_function} exists with "function wasn't found"
+	run {_function}
+	assert {ExprFunction} is true with "function didn't run"
+	delete {ExprFunction}
+
+	set {_function} to function "testExprFunction2()" from {_script}
+	assert {_function} exists with "function wasn't found"
+	run {_function} with arguments "hello" and 0
+	assert {ExprFunction} is true with "function with args didn't run"
+	delete {ExprFunction}
+
+	set {_function} to function "testExprFunction3()" from {_script}
+	assert {_function} exists with "function wasn't found"
+	run {_function}
+	assert {ExprFunction} is true with "external local function didn't run"
+	delete {ExprFunction}
diff --git a/src/test/skript/tests/syntaxes/effects/EffScriptFile.sk b/src/test/skript/tests/syntaxes/effects/EffScriptFile.sk
new file mode 100644
index 00000000000..226f372c61b
--- /dev/null
+++ b/src/test/skript/tests/syntaxes/effects/EffScriptFile.sk
@@ -0,0 +1,53 @@
+options:
+	path: "../../../../../../src/test/skript/tests/"
+
+	# Princess test script is in another castle, Mario!
+	# paths are relativised to the /scripts/ directory
+	# but we are loading these scripts from the test folder :(
+
+using script reflection
+
+test "enable script":
+	set {_path} to {@path} + "misc/-disabled.sk"
+	set {EffScriptFile} to false
+	load script named {_path}
+	assert {EffScriptFile} is true with "load event didn't run"
+	delete {EffScriptFile}
+
+test "reload script":
+	set {_path} to {@path} + "misc/disabled.sk"
+	set {EffScriptFile} to false
+	reload (script named {_path})
+	assert {EffScriptFile} is true with "load event didn't run"
+	delete {EffScriptFile}
+
+test "unload + load script":
+	set {_path} to {@path} + "misc/disabled.sk"
+
+	set {_script} to script named {_path}
+	assert {_script} exists with "script wasn't found"
+	unload {_script}
+
+	# Unloading no longer disables the script
+	# so the script should be in the same place
+
+	set {EffScriptFile} to false
+	set {_script} to script named {_path}
+	assert {_script} exists with "script moved when unloaded"
+	load {_script}
+	# we make sure the script loaded even though it wasn't disabled
+	assert {EffScriptFile} is true with "load event didn't run"
+
+	set {EffScriptFile} to false
+	load {_script}
+	# we attempt to load a loaded script
+	# this used to throw an exception, now it should be skipped
+	assert {EffScriptFile} is false with "load ran when already loaded"
+
+	delete {EffScriptFile}
+
+test "disable script":
+	set {_path} to {@path} + "misc/disabled.sk"
+	disable script named {_path}
+	delete {EffScriptFile}
+
diff --git a/src/test/skript/tests/syntaxes/effects/EffSort.sk b/src/test/skript/tests/syntaxes/effects/EffSort.sk
index 4d832cd61fa..c683f9ad711 100644
--- a/src/test/skript/tests/syntaxes/effects/EffSort.sk
+++ b/src/test/skript/tests/syntaxes/effects/EffSort.sk
@@ -3,6 +3,10 @@ test "sorting":
 	sort {_numbers::*}
 	assert {_numbers::*} is integers from 1 to 50 with "improper sorting of numbers"
 
+	set {_numbers::*} to shuffled integers from 1 to 50
+	sort {_numbers::*} in descending order
+	assert {_numbers::*} is integers from 50 to 1 with "improper sorting of numbers in descending order"
+
 	set {_numbers::*} to shuffled integers from 1 to 5
 	sort {_numbers::*} by input * 20 + 4 - 3 # linear transformations don't affect order
 	assert {_numbers::*} is integers from 1 to 5 with "improper custom sorting of numbers"
diff --git a/src/test/skript/tests/syntaxes/effects/EffSpawn.sk b/src/test/skript/tests/syntaxes/effects/EffSpawn.sk
deleted file mode 100644
index 2224e0d8b8c..00000000000
--- a/src/test/skript/tests/syntaxes/effects/EffSpawn.sk
+++ /dev/null
@@ -1,13 +0,0 @@
-test "spawn cats by type" when running minecraft "1.15.2":
-	delete all cats
-	set {_l} to location of spawn of world "world"
-	spawn 5 all black cats at {_l}
-	assert size of all cats = 5 with "Size of all cats is not 5"
-	assert size of all all black cats = 5 with "Size of all all black cats is not 5"
-	spawn 2 siamese cats at {_l}
-	assert size of all cats = 7 with "Size of all cats is not 7"
-	assert size of all siamese cats = 2 with "Size of all siamese cats is not 2"
-	delete all siamese cats
-	assert size of all cats = 5 with "Size of all cats is not 5 after delete 2 siamese cats"
-	delete all cats
-	assert size of all cats = 0 with "Size of all cats is greater than 0 after all were deleted"
\ No newline at end of file
diff --git a/src/test/skript/tests/syntaxes/effects/EffTeleport.sk b/src/test/skript/tests/syntaxes/effects/EffTeleport.sk
new file mode 100644
index 00000000000..f138a4daa29
--- /dev/null
+++ b/src/test/skript/tests/syntaxes/effects/EffTeleport.sk
@@ -0,0 +1,19 @@
+test "teleport":
+	spawn pig at location(0, 0, 0):
+		set {_pig} to entity
+	teleport {_pig} to location(1, 30, 1)
+	assert location of {_pig} is location(1, 30, 1) with "failed to teleport entity"
+	delete entity within {_pig}
+
+test "teleport flags":
+	spawn pig at location(0, 0, 0):
+		set {_pig} to entity
+	spawn pig at location(0, 0, 0):
+		make entity ride {_pig}
+		set {_pig2} to entity
+	teleport {_pig} to location(1, 30, 1) retaining passengers, xyz velocity, and yaw and pitch velocity
+	assert location of {_pig} is location(1, 30, 1) with "failed to teleport entity"
+	assert passenger of {_pig} is {_pig2} with "failed to retain passenger"
+
+	delete entity within {_pig2}
+	delete entity within {_pig}
diff --git a/src/test/skript/tests/syntaxes/effects/EffTextDisplayCanSeeThtroughBlocks.sk b/src/test/skript/tests/syntaxes/effects/EffTextDisplayCanSeeThtroughBlocks.sk
new file mode 100644
index 00000000000..ffcb160f5ad
--- /dev/null
+++ b/src/test/skript/tests/syntaxes/effects/EffTextDisplayCanSeeThtroughBlocks.sk
@@ -0,0 +1,19 @@
+test "text display see through blocks":
+	spawn item display at spawn of world "world":
+		set {_id} to entity
+
+	assert {_id} isn't visible through walls with "item display can be seen through walls"
+	force {_id} to be visible through walls
+	assert {_id} isn't visible through walls with "item display can be seen through walls"
+
+	delete entity within {_id}
+	spawn text display at spawn of world "world":
+		set {_td} to entity
+
+	assert {_td} isn't visible through walls with "text display can be seen through walls by default"
+	force {_td} to be visible through walls
+	assert {_td} is visible through walls with "failed to make see through"
+	prevent {_td} from being visible through walls
+	assert {_td} isn't visible through walls with "failed to prevent see through"
+
+	delete entity within {_td}
diff --git a/src/test/skript/tests/syntaxes/effects/EffTextDisplayDropShadow.sk b/src/test/skript/tests/syntaxes/effects/EffTextDisplayDropShadow.sk
new file mode 100644
index 00000000000..9516a0a7106
--- /dev/null
+++ b/src/test/skript/tests/syntaxes/effects/EffTextDisplayDropShadow.sk
@@ -0,0 +1,19 @@
+test "text display drop shadow":
+	spawn an item display at spawn of world "world":
+		set {_id} to entity
+
+	assert {_id} doesn't have drop shadow with "item display has drop shadow"
+	add drop shadow to {_id}
+	assert {_id} doesn't have drop shadow with "item display has drop shadow"
+
+	delete entity within {_id}
+	spawn a text display at spawn of world "world":
+		set {_td} to entity
+
+	assert {_td} doesn't have drop shadow with "text display has drop shadow by default"
+	add drop shadow to {_td}
+	assert {_td}'s text has drop shadow with "failed to set drop shadow"
+	remove drop shadow from text of {_td}
+	assert {_td}'s text doesn't have drop shadow with "failed to remove drop shadow"
+
+	delete entity within {_td}
diff --git a/src/test/skript/tests/syntaxes/effects/EffTransform.sk b/src/test/skript/tests/syntaxes/effects/EffTransform.sk
new file mode 100644
index 00000000000..bff9d67cbf0
--- /dev/null
+++ b/src/test/skript/tests/syntaxes/effects/EffTransform.sk
@@ -0,0 +1,29 @@
+test "transform effect":
+	set {_a::*} to integers between -10 and 10
+	assert size of {_a::*} is 21 with "invalid starting size"
+
+	transform {_a::*} using input + 2
+	assert {_a::*} is integers between -8 and 12 with "failed to transform with +2"
+
+	set {_a::*} to integers between -10 and 10
+	assert size of {_a::*} is 21 with "invalid starting size"
+
+	transform {_a::*} using input index
+	assert size of {_a::*} is 21 with "failed to transform using index"
+
+	loop {_a::*}:
+		assert loop-value is loop-index with "failed to transform to loop-index"
+
+	clear {_a::*}
+	set {_a::a} to "a"
+	set {_a::b} to "b"
+	set {_a::c} to "c"
+
+	transform {_a::*} using 1
+	assert {_a::*} is 1, 1, and 1 with "failed to transform with constant value"
+	assert indices of {_a::*} is "a", "b", and "c" with "transform failed to maintain indices"
+
+	transform {_a::*} using input and 2
+	assert {_a::*} is 1, 2, 1, 2, 1 and 2 with "failed to transform with plural expression"
+	assert indices of {_a::*} is "1", "2", "3", "4", "5" and "6" with "transform failed to re-set indices"
+
diff --git a/src/test/skript/tests/syntaxes/effects/EffVectorRotateAroundAnother.sk b/src/test/skript/tests/syntaxes/effects/EffVectorRotateAroundAnother.sk
deleted file mode 100644
index 07d21ec5730..00000000000
--- a/src/test/skript/tests/syntaxes/effects/EffVectorRotateAroundAnother.sk
+++ /dev/null
@@ -1,21 +0,0 @@
-test "vector rotate around vector":
-	set {_x} to vector(1, 0, 0)
-	set {_y} to vector(0, 1, 0)
-	set {_z} to vector(0, 0, 1)
-
-	set {_v} to {_x}
-	rotate {_v} around {_y} by -90 degrees
-	assert {_v} is {_z} with "rotate around y vector failed (expected %{_z}%, got %{_v}%)"
-
-	rotate {_v} around {_x} by -90 degrees
-	assert {_v} is {_y} with "rotate around x vector failed (expected %{_y}%, got %{_v}%)"
-
-	rotate {_v} around {_z} by -90 degrees
-	assert {_v} is {_x} with "rotate around z vector failed (expected %{_x}%, got %{_v}%)"
-
-	rotate {_v} around vector(1, 1, 1) by 180 degrees
-	assert {_v} is vector(-1/3, 2/3, 2/3) with "rotate around non-orthogonal vector failed (expected %vector(-1/3, 2/3, 2/3)%, got %{_v}%)"
-
-	set {_v} to vector(2, 0, 0)
-	rotate {_v} around vector(0, 10, 0) by 90 degrees
-	assert {_v} is vector(0, 0, -2) with "rotate around non-unit vector failed (expected %vector(0, 0, -2)%, got %{_v}%)"
diff --git a/src/test/skript/tests/syntaxes/effects/EffVectorRotateXYZ.sk b/src/test/skript/tests/syntaxes/effects/EffVectorRotateXYZ.sk
deleted file mode 100644
index 72adc840f8f..00000000000
--- a/src/test/skript/tests/syntaxes/effects/EffVectorRotateXYZ.sk
+++ /dev/null
@@ -1,11 +0,0 @@
-test "vector rotate around axis":
-
-	set {_v} to vector(1, 1, 1)
-	rotate {_v} around y axis by 90 degrees
-	assert {_v} is vector(1, 1, -1) with "rotate around y vector failed (expected %vector(1, 1, -1)%, got %{_v}%)"
-
-	rotate {_v} around x axis by -90 degrees
-	assert {_v} is vector(1, -1, -1) with "rotate around x vector failed (expected %vector(1, -1, -1)%, got %{_v}%)"
-
-	rotate {_v} around z axis by -90 degrees
-	assert {_v} is vector(-1, -1, -1) with "rotate around z vector failed (expected %vector(-1, -1, -1)%, got %{_v}%)"
diff --git a/src/test/skript/tests/syntaxes/effects/EffVisualEffect.sk b/src/test/skript/tests/syntaxes/effects/EffVisualEffect.sk
index a4791d1752a..88c82694a53 100644
--- a/src/test/skript/tests/syntaxes/effects/EffVisualEffect.sk
+++ b/src/test/skript/tests/syntaxes/effects/EffVisualEffect.sk
@@ -1,6 +1,6 @@
 # we want to ensure particles parse and play on all versions
 test "visual effects":
-	set {_} to location of spawn of world "world"
+	set {_} to test-location
 	play angry villager at {_}
 	play air breaking at {_}
 	play sprinting dust of air at {_}
diff --git a/src/test/skript/tests/syntaxes/expressions/ExprARGB.sk b/src/test/skript/tests/syntaxes/expressions/ExprARGB.sk
new file mode 100644
index 00000000000..854fddf55ee
--- /dev/null
+++ b/src/test/skript/tests/syntaxes/expressions/ExprARGB.sk
@@ -0,0 +1,20 @@
+test "argb":
+
+	set {_colour} to rgb(0, 0, 0, 0)
+	assert {_colour}'s red value is 0 with "failed to get red"
+	assert {_colour}'s green value is 0 with "failed to get green"
+	assert blue value of {_colour} is 0 with "failed to get blue"
+	assert alpha value of {_colour} is 0 with "failed to get alpha"
+
+	set {_colour} to rgb(9, 102, 55, 10)
+	assert {_colour}'s red value is 9 with "failed to get red"
+	assert {_colour}'s green value is 102 with "failed to get green"
+	assert blue value of {_colour} is 55 with "failed to get blue"
+	assert alpha value of {_colour} is 10 with "failed to get alpha"
+
+	set {_colour} to red
+	assert {_colour}'s red value is 176 with "failed to get red"
+	assert {_colour}'s green value is 46 with "failed to get green"
+	assert blue value of {_colour} is 38 with "failed to get blue"
+	assert alpha value of {_colour} is 255 with "failed to get alpha"
+
diff --git a/src/test/skript/tests/syntaxes/expressions/ExprAmount.sk b/src/test/skript/tests/syntaxes/expressions/ExprAmount.sk
new file mode 100644
index 00000000000..d4cc336b031
--- /dev/null
+++ b/src/test/skript/tests/syntaxes/expressions/ExprAmount.sk
@@ -0,0 +1,12 @@
+test "amount of objects":
+	set {_objects::*} to (1 and 2)
+	set {_amount} to amount of {_objects::*}
+	assert {_amount} is 2 with "was wrong"
+	set {_objects::*} to ("hello", "there" and 1)
+	set {_amount} to amount of {_objects::*}
+	assert {_amount} is 3 with "was wrong"
+
+test "amount of items":
+	assert amount of (3 of stone) is 3 with "was wrong"
+	set {_item} to 3 of stone
+	assert amount of {_item} is 3 with "was wrong"
diff --git a/src/test/skript/tests/syntaxes/expressions/ExprArithmetic.sk b/src/test/skript/tests/syntaxes/expressions/ExprArithmetic.sk
index ef17ec0d979..5a81450c29d 100644
--- a/src/test/skript/tests/syntaxes/expressions/ExprArithmetic.sk
+++ b/src/test/skript/tests/syntaxes/expressions/ExprArithmetic.sk
@@ -1,247 +1,247 @@
 test "number - number operations":
 
-    # --Addition/Subtraction--
-
-    assert (1 + 1) is (2) with "1 + 1 is not 2"
-    assert (2 + 2) is (4) with "2 + 2 is not 4"
-    assert (3 - 3) is (0) with "3 - 3 is not 0"
-    assert (4 - 2) is (2) with "4 - 2 is not 2"
-    assert (5 + 1) is (6) with "5 + 1 is not 6"
-    assert (6 - -2) is (8) with "6 - -2 is not 8"
-    assert (4-(40)) is (-36) with "4 - 40 is not -36"
-
-    # --Multiplication--
-    
-    assert (1*5) is (5) with "1 * 5 is not 5"
-    assert (2*5) is (10) with "2 * 5 is not 10"
-    assert (3*-5) is (-15) with "3 * -5 is not 15"
-    assert (4*0) is (0) with "4 * 0 is not 0"
-    assert (5*infinity value) is (infinity value) with "5 * infinity is not infinity"
-
-    # --Division--
-
-    assert (1/5) is (0.2) with "1 / 5 is not 0.2"
-    assert (2/5) is (0.4) with "2 / 5 is not 0.4"
-    assert (3/-5) is (-0.6) with "3 / -5 is not -0.6"
-    assert (4/0) is (infinity value) with "4 / 0 is not infinity"
-    assert (5/0) is (infinity value) with "5 / 0 is not infinity"
-    assert isNaN(0/0) is true with "0 / 0 is not NaN"
-    assert (5/2.5) is (2) with "5 / 2.5 is not 2"
-
-    # --Exponents--
-
-    assert (1^5) is (1) with "1 ^ 5 is not 1"
-    assert (2^5) is (32) with "2 ^ 5 is not 32"
-    assert (3^-5) is (0.00411522633) with "3 ^ -5 is not 0.00411522633"
-    assert (4^0) is (1) with "4 ^ 0 is not 1"
-    assert (5^0) is (1) with "5 ^ 0 is not 1"
-    assert (0^0) is (1) with "0 ^ 0 is not 1"
-    assert (5^2.5) - 55.901 < 0.001 with "5 ^ 2.5 is not 55.9"
-
-    # --Order of Operations--
-
-    assert (1 + 2 - 1 * 3) is (0) with "1 + 2 - 1 * 3 is not 0"
-    assert (1 + 2 - 1 / 2 * 3 ) is (1.5) with "1 + 2 - 1 / 2 * 3  is not 1.5"
-    assert (1 + (2) - 1 / (2) * 3) is (1.5) with "1 + (2) - 1 / (2) * 3 is not 1.5"
-    assert (1 + (2 - 1 / 2) * 3) is (5.5) with "1 + (2 - 1 / 2) * 3 is not 5.5"
-    assert (1 + 2 - 1 / 2 * 3 + 4 - 5 * 6 / 2 ) is (-9.5) with "1 + 2 - 1 / 2 * 3 + 4 - 5 * 6 / 2  is not -9.5"
-    assert (1 + (1 - 2) * 3) is (-2) with "1 + (1 - 2) * 3 is not -2"
-
-    # --Edge Cases--
-
-    assert (0^99999) is (0) with "0^99999 is not 0"
-    assert (1 + 2.3 + 3.01) is (6.31) with "1 + 2.3 + 3.01 is not 6.31"
-    assert (0.1 + 0.1 + 0.1) is (0.30000000000000004) with "0.1 + 0.1 + 0.1 is not 0.30000000000000004"
-    assert (1/-infinity value) is (-0) with "1/-infinity value is not -0"
-
-
-    # --Standard Operations--
-
-    set {_x} to 1
-    set {_y} to 2
-    set {_z} to 3
-    assert ({_x}) is (1) with "{_x} is not 1"
-    assert ({_y}) is (2) with "{_y} is not 2"
-    assert ({_z}) is (3) with "{_z} is not 3"
-    assert ({_x} + {_y} + {_z}) is (6) with "1 + 2 + 3 is not 6"
-    assert ({_x} + {_y} - {_z}) is (0) with "1 + 2 - 3 is not 0"
-    assert ({_x} + {_y} * {_z}) is (7) with "1 + 2 * 3 is not 7"
-    assert ({_x} + {_y} / {_z}) is (1.6666666666666667) with "1 + 2 / 3 is not 1.6666666666666667"
-    assert ({_x} + {_y} ^ {_z}) is (9) with "1 + 2 ^ 3 is not 9"
-    assert ({_x} - {_y} + {_z}) is (2) with "1 - 2 + 3 is not 2"
-    assert ({_x} - {_y} - {_z}) is (-4) with "1 - 2 - 3 is not -4"
-    assert ({_x} - {_y} * {_z}) is (-5) with "1 - 2 * 3 is not -5"
-    assert ({_x} - {_y} / {_z}) is (0.3333333333333333) with "1 - 2 / 3 is not 0.3333333333333333"
-    assert ({_x} - {_y} ^ {_z}) is (-7) with "1 - 2 ^ 3 is not -7"
-    assert ({_x} * {_y} + {_z}) is (5) with "1 * 2 + 3 is not 5"
-    assert ({_x} * {_y} - {_z}) is (-1) with "1 * 2 - 3 is not -1"
-    assert ({_x} * {_y} * {_z}) is (6) with "1 * 2 * 3 is not 6"
-    assert ({_x} * {_y} / {_z}) is (0.6666666666666666) with "1 * 2 / 3 is not 0.6666666666666666"
-    assert ({_x} * {_y} ^ {_z}) is (8) with "1 * 2 ^ 3 is not 8"
-    assert ({_x} / {_y} + {_z}) is (3.5) with "1 / 2 + 3 is not 3.5"
-    assert ({_x} / {_y} - {_z}) is (-2.5) with "1 / 2 - 3 is not -2.5"
-    assert ({_x} / {_y} * {_z}) is (1.5) with "1 / 2 * 3 is not 1.5"
-    assert ({_x} / {_y} / {_z}) is (0.16666666666666666) with "1 / 2 / 3 is not 0.16666666666666666"
-    assert ({_x} / {_y} ^ {_z}) is (0.125) with "1 / 2 ^ 3 is not 0.125"
-    assert ({_x} ^ {_y} + {_z}) is (4) with "1 ^ 2 + 3 is not 4"
-    assert ({_x} ^ {_y} - {_z}) is (-2) with "1 ^ 2 - 3 is not -2"
-    assert ({_x} ^ {_y} * {_z}) is (3) with "1 ^ 2 * 3 is not 3"
-    assert ({_x} ^ {_y} / {_z}) is (0.3333333333333333) with "1 ^ 2 / 3 is not 0.3333333333333333"
-    assert ({_x} ^ {_y} ^ {_z}) is (1) with "1 ^ 2 ^ 3 is not 1"
-
-    # --Non-Numbers--
-
-    set {_x} to 1
-    set {_y} to {_}
-    set {_z} to 3
-
-    assert ({_y} / 3) is (0) with "<none> / 3 is not 0"
-    assert ({_x}) is (1) with "{_x} is not 1"
-    assert ({_y} + 1 + 1) is (2) with "<none> + 1 + 1 is not 2"
-    assert (1 + {_y} + 1) is (2) with "1 + <none> + 1 is not 2"
-    assert ({_z}) is (3) with "{_z} is not 3"
-    assert ({_x} + {_y} + {_z}) is (4) with "1 + <none> + 3 is not 4"
-    assert ({_x} + {_y} - {_z}) is (-2) with "1 + <none> - 3 is not -2"
-    assert ({_x} + {_y} * {_z}) is (1) with "1 + <none> * 3 is not 1"
-    assert ({_x} + {_y} / {_z}) is (1) with "1 + <none> / 3 is not 1"
-    assert ({_x} + {_y} ^ {_z}) is (1) with "1 + <none> ^ 3 is not 1"
-    assert ({_x} - {_y} + {_z}) is (4) with "1 - <none> + 3 is not 4"
-    assert ({_x} - {_y} - {_z}) is (-2) with "1 - <none> - 3 is not -2"
-    assert ({_x} - {_y} * {_z}) is (1) with "1 - <none> * 3 is not 1"
-    assert ({_x} - {_y} / {_z}) is (1) with "1 - <none> / 3 is not 1"
-    assert ({_x} - {_y} ^ {_z}) is (1) with "1 - <none> ^ 3 is not 1"
-    assert ({_x} * {_y} + {_z}) is (3) with "1 * <none> + 3 is not 3"
-    assert ({_x} * {_y} - {_z}) is (-3) with "1 * <none> - 3 is not -3"
-    assert ({_x} * {_y} * {_z}) is (0) with "1 * <none> * 3 is not 0"
-    assert ({_x} * {_y} / {_z}) is (0) with "1 * <none> / 3 is not 0"
-    assert ({_x} * {_y} ^ {_z}) is (0) with "1 * <none> ^ 3 is not 0"
-    assert ({_x} / {_y} + {_z}) is (infinity value) with "1 / <none> + 3 is not infinity"
-    assert ({_x} / {_y} - {_z}) is (infinity value) with "1 / <none> - 3 is not infinity"
-    assert ({_x} / {_y} * {_z}) is (infinity value) with "1 / <none> * 3 is not infinity"
-    assert ({_x} / {_y} / {_z}) is (infinity value) with "1 / <none> / 3 is not infinity"
-    assert ({_x} / {_y} ^ {_z}) is (infinity value) with "1 / <none> ^ 3 is not infinity"
-    assert ({_x} ^ {_y} + {_z}) is (4) with "1 ^ <none> + 3 is not 4"
-    assert ({_x} ^ {_y} - {_z}) is (-2) with "1 ^ <none> - 3 is not -2"
-    assert ({_x} ^ {_y} * {_z}) is (3) with "1 ^ <none> * 3 is not 3"
-    assert ({_x} ^ {_y} / {_z}) is (0.333333333333) with "1 ^ <none> / 3 is not 0.333333333333"
-    assert ({_x} ^ {_y} ^ {_z}) is (1) with "1 ^ <none> ^ 3 is not 1"
-
-    # --Difference--
-    assert (difference between 1 and 2) is (1) with "difference between 1 and 2 is not 1"
-    assert (difference between 2 and 1) is (1) with "difference between 2 and 1 is not 1"
-    assert (difference between 1 and 1) is (0) with "difference between 1 and 1 is not 0"
-    assert (difference between 1 and 0) is (1) with "difference between 1 and 0 is not 1"
-    assert (difference between 0 and 1) is (1) with "difference between 0 and 1 is not 1"
-    assert (difference between 0 and 0) is (0) with "difference between 0 and 0 is not 0"
-    assert (difference between 1 and infinity value) is (infinity value) with "difference between 1 and infinity is not infinity"
-    assert (difference between infinity value and 1) is (infinity value) with "difference between infinity and 1 is not infinity"
-    assert isNaN(difference between infinity value and infinity value) is true with "difference between infinity and infinity is not NaN"
-    assert isNaN(difference between 1 and NaN value) is true with "difference between 1 and NaN is not NaN"
-    assert isNaN(difference between NaN value and 1) is true with "difference between NaN and 1 is not NaN"
-    assert isNaN(difference between NaN value and NaN value) is true with "difference between NaN and NaN is not NaN"
+	# --Addition/Subtraction--
+
+	assert (1 + 1) is (2) with "1 + 1 is not 2"
+	assert (2 + 2) is (4) with "2 + 2 is not 4"
+	assert (3 - 3) is (0) with "3 - 3 is not 0"
+	assert (4 - 2) is (2) with "4 - 2 is not 2"
+	assert (5 + 1) is (6) with "5 + 1 is not 6"
+	assert (6 - -2) is (8) with "6 - -2 is not 8"
+	assert (4-(40)) is (-36) with "4 - 40 is not -36"
+
+	# --Multiplication--
+
+	assert (1*5) is (5) with "1 * 5 is not 5"
+	assert (2*5) is (10) with "2 * 5 is not 10"
+	assert (3*-5) is (-15) with "3 * -5 is not 15"
+	assert (4*0) is (0) with "4 * 0 is not 0"
+	assert (5*infinity value) is (infinity value) with "5 * infinity is not infinity"
+
+	# --Division--
+
+	assert (1/5) is (0.2) with "1 / 5 is not 0.2"
+	assert (2/5) is (0.4) with "2 / 5 is not 0.4"
+	assert (3/-5) is (-0.6) with "3 / -5 is not -0.6"
+	assert (4/0) is (infinity value) with "4 / 0 is not infinity"
+	assert (5/0) is (infinity value) with "5 / 0 is not infinity"
+	assert isNaN(0/0) is true with "0 / 0 is not NaN"
+	assert (5/2.5) is (2) with "5 / 2.5 is not 2"
+
+	# --Exponents--
+
+	assert (1^5) is (1) with "1 ^ 5 is not 1"
+	assert (2^5) is (32) with "2 ^ 5 is not 32"
+	assert (3^-5) is (0.00411522633) with "3 ^ -5 is not 0.00411522633"
+	assert (4^0) is (1) with "4 ^ 0 is not 1"
+	assert (5^0) is (1) with "5 ^ 0 is not 1"
+	assert (0^0) is (1) with "0 ^ 0 is not 1"
+	assert (5^2.5) - 55.901 < 0.001 with "5 ^ 2.5 is not 55.9"
+
+	# --Order of Operations--
+
+	assert (1 + 2 - 1 * 3) is (0) with "1 + 2 - 1 * 3 is not 0"
+	assert (1 + 2 - 1 / 2 * 3 ) is (1.5) with "1 + 2 - 1 / 2 * 3 is not 1.5"
+	assert (1 + (2) - 1 / (2) * 3) is (1.5) with "1 + (2) - 1 / (2) * 3 is not 1.5"
+	assert (1 + (2 - 1 / 2) * 3) is (5.5) with "1 + (2 - 1 / 2) * 3 is not 5.5"
+	assert (1 + 2 - 1 / 2 * 3 + 4 - 5 * 6 / 2 ) is (-9.5) with "1 + 2 - 1 / 2 * 3 + 4 - 5 * 6 / 2 is not -9.5"
+	assert (1 + (1 - 2) * 3) is (-2) with "1 + (1 - 2) * 3 is not -2"
+
+	# --Edge Cases--
+
+	assert (0^99999) is (0) with "0^99999 is not 0"
+	assert (1 + 2.3 + 3.01) is (6.31) with "1 + 2.3 + 3.01 is not 6.31"
+	assert (0.1 + 0.1 + 0.1) is (0.30000000000000004) with "0.1 + 0.1 + 0.1 is not 0.30000000000000004"
+	assert (1/-infinity value) is (-0) with "1/-infinity value is not -0"
+
+
+	# --Standard Operations--
+
+	set {_x} to 1
+	set {_y} to 2
+	set {_z} to 3
+	assert ({_x}) is (1) with "{_x} is not 1"
+	assert ({_y}) is (2) with "{_y} is not 2"
+	assert ({_z}) is (3) with "{_z} is not 3"
+	assert ({_x} + {_y} + {_z}) is (6) with "1 + 2 + 3 is not 6"
+	assert ({_x} + {_y} - {_z}) is (0) with "1 + 2 - 3 is not 0"
+	assert ({_x} + {_y} * {_z}) is (7) with "1 + 2 * 3 is not 7"
+	assert ({_x} + {_y} / {_z}) is (1.6666666666666667) with "1 + 2 / 3 is not 1.6666666666666667"
+	assert ({_x} + {_y} ^ {_z}) is (9) with "1 + 2 ^ 3 is not 9"
+	assert ({_x} - {_y} + {_z}) is (2) with "1 - 2 + 3 is not 2"
+	assert ({_x} - {_y} - {_z}) is (-4) with "1 - 2 - 3 is not -4"
+	assert ({_x} - {_y} * {_z}) is (-5) with "1 - 2 * 3 is not -5"
+	assert ({_x} - {_y} / {_z}) is (0.3333333333333333) with "1 - 2 / 3 is not 0.3333333333333333"
+	assert ({_x} - {_y} ^ {_z}) is (-7) with "1 - 2 ^ 3 is not -7"
+	assert ({_x} * {_y} + {_z}) is (5) with "1 * 2 + 3 is not 5"
+	assert ({_x} * {_y} - {_z}) is (-1) with "1 * 2 - 3 is not -1"
+	assert ({_x} * {_y} * {_z}) is (6) with "1 * 2 * 3 is not 6"
+	assert ({_x} * {_y} / {_z}) is (0.6666666666666666) with "1 * 2 / 3 is not 0.6666666666666666"
+	assert ({_x} * {_y} ^ {_z}) is (8) with "1 * 2 ^ 3 is not 8"
+	assert ({_x} / {_y} + {_z}) is (3.5) with "1 / 2 + 3 is not 3.5"
+	assert ({_x} / {_y} - {_z}) is (-2.5) with "1 / 2 - 3 is not -2.5"
+	assert ({_x} / {_y} * {_z}) is (1.5) with "1 / 2 * 3 is not 1.5"
+	assert ({_x} / {_y} / {_z}) is (0.16666666666666666) with "1 / 2 / 3 is not 0.16666666666666666"
+	assert ({_x} / {_y} ^ {_z}) is (0.125) with "1 / 2 ^ 3 is not 0.125"
+	assert ({_x} ^ {_y} + {_z}) is (4) with "1 ^ 2 + 3 is not 4"
+	assert ({_x} ^ {_y} - {_z}) is (-2) with "1 ^ 2 - 3 is not -2"
+	assert ({_x} ^ {_y} * {_z}) is (3) with "1 ^ 2 * 3 is not 3"
+	assert ({_x} ^ {_y} / {_z}) is (0.3333333333333333) with "1 ^ 2 / 3 is not 0.3333333333333333"
+	assert ({_x} ^ {_y} ^ {_z}) is (1) with "1 ^ 2 ^ 3 is not 1"
+
+	# --Non-Numbers--
+
+	set {_x} to 1
+	set {_y} to {_}
+	set {_z} to 3
+
+	assert ({_y} / 3) is (0) with "<none> / 3 is not 0"
+	assert ({_x}) is (1) with "{_x} is not 1"
+	assert ({_y} + 1 + 1) is (2) with "<none> + 1 + 1 is not 2"
+	assert (1 + {_y} + 1) is (2) with "1 + <none> + 1 is not 2"
+	assert ({_z}) is (3) with "{_z} is not 3"
+	assert ({_x} + {_y} + {_z}) is (4) with "1 + <none> + 3 is not 4"
+	assert ({_x} + {_y} - {_z}) is (-2) with "1 + <none> - 3 is not -2"
+	assert ({_x} + {_y} * {_z}) is (1) with "1 + <none> * 3 is not 1"
+	assert ({_x} + {_y} / {_z}) is (1) with "1 + <none> / 3 is not 1"
+	assert ({_x} + {_y} ^ {_z}) is (1) with "1 + <none> ^ 3 is not 1"
+	assert ({_x} - {_y} + {_z}) is (4) with "1 - <none> + 3 is not 4"
+	assert ({_x} - {_y} - {_z}) is (-2) with "1 - <none> - 3 is not -2"
+	assert ({_x} - {_y} * {_z}) is (1) with "1 - <none> * 3 is not 1"
+	assert ({_x} - {_y} / {_z}) is (1) with "1 - <none> / 3 is not 1"
+	assert ({_x} - {_y} ^ {_z}) is (1) with "1 - <none> ^ 3 is not 1"
+	assert ({_x} * {_y} + {_z}) is (3) with "1 * <none> + 3 is not 3"
+	assert ({_x} * {_y} - {_z}) is (-3) with "1 * <none> - 3 is not -3"
+	assert ({_x} * {_y} * {_z}) is (0) with "1 * <none> * 3 is not 0"
+	assert ({_x} * {_y} / {_z}) is (0) with "1 * <none> / 3 is not 0"
+	assert ({_x} * {_y} ^ {_z}) is (0) with "1 * <none> ^ 3 is not 0"
+	assert ({_x} / {_y} + {_z}) is (infinity value) with "1 / <none> + 3 is not infinity"
+	assert ({_x} / {_y} - {_z}) is (infinity value) with "1 / <none> - 3 is not infinity"
+	assert ({_x} / {_y} * {_z}) is (infinity value) with "1 / <none> * 3 is not infinity"
+	assert ({_x} / {_y} / {_z}) is (infinity value) with "1 / <none> / 3 is not infinity"
+	assert ({_x} / {_y} ^ {_z}) is (infinity value) with "1 / <none> ^ 3 is not infinity"
+	assert ({_x} ^ {_y} + {_z}) is (4) with "1 ^ <none> + 3 is not 4"
+	assert ({_x} ^ {_y} - {_z}) is (-2) with "1 ^ <none> - 3 is not -2"
+	assert ({_x} ^ {_y} * {_z}) is (3) with "1 ^ <none> * 3 is not 3"
+	assert ({_x} ^ {_y} / {_z}) is (0.333333333333) with "1 ^ <none> / 3 is not 0.333333333333"
+	assert ({_x} ^ {_y} ^ {_z}) is (1) with "1 ^ <none> ^ 3 is not 1"
+
+	# --Difference--
+	assert (difference between 1 and 2) is (1) with "difference between 1 and 2 is not 1"
+	assert (difference between 2 and 1) is (1) with "difference between 2 and 1 is not 1"
+	assert (difference between 1 and 1) is (0) with "difference between 1 and 1 is not 0"
+	assert (difference between 1 and 0) is (1) with "difference between 1 and 0 is not 1"
+	assert (difference between 0 and 1) is (1) with "difference between 0 and 1 is not 1"
+	assert (difference between 0 and 0) is (0) with "difference between 0 and 0 is not 0"
+	assert (difference between 1 and infinity value) is (infinity value) with "difference between 1 and infinity is not infinity"
+	assert (difference between infinity value and 1) is (infinity value) with "difference between infinity and 1 is not infinity"
+	assert isNaN(difference between infinity value and infinity value) is true with "difference between infinity and infinity is not NaN"
+	assert isNaN(difference between 1 and NaN value) is true with "difference between 1 and NaN is not NaN"
+	assert isNaN(difference between NaN value and 1) is true with "difference between NaN and 1 is not NaN"
+	assert isNaN(difference between NaN value and NaN value) is true with "difference between NaN and NaN is not NaN"
 
 test "vector - vector operations":
-    # --Addition/Subtraction--
-    set {_v1} to vector(1, 2, 3)
-    set {_v2} to vector(4, 5, 6)
-
-    assert ({_v1} + {_v2}) is (vector(5, 7, 9)) with "{_v1} + {_v2} is not vector(5, 7, 9)"
-    assert ({_v1} - {_v2}) is (vector(-3, -3, -3)) with "{_v1} - {_v2} is not vector(-3, -3, -3)"
-    assert ({_v1} * {_v2}) is (vector(4, 10, 18)) with "{_v1} * {_v2} is not vector(4, 10, 18)"
-    assert ({_v1} / {_v2}) is (vector(0.25, 0.4, 0.5)) with "{_v1} / {_v2} is not vector(0.25, 0.4, 0.5)"
-
-    # --Zero Vectors--
-
-    set {_v1} to vector(0,0,0)
-    set {_v2} to vector(1,2,3)
-    assert ({_v1} + {_v2}) is (vector(1, 2, 3)) with "vector(0,0,0) + vector(1,2,3) is not vector(1, 2, 3)"
-    assert ({_v1} - {_v2}) is (vector(-1, -2, -3)) with "vector(0,0,0) - vector(1,2,3) is not vector(-1, -2, -3)"
-    assert ({_v1} * {_v2}) is (vector(0, 0, 0)) with "vector(0,0,0) * vector(1,2,3) is not vector(0, 0, 0)"
-    assert ({_v1} / {_v2}) is (vector(0, 0, 0)) with "vector(0,0,0) / vector(1,2,3) is not vector(0, 0, 0)"
-    assert ({_v2} + {_v1}) is (vector(1, 2, 3)) with "vector(1,2,3) + vector(0,0,0) is not vector(1, 2, 3)"
-    assert ({_v2} - {_v1}) is (vector(1, 2, 3)) with "vector(1,2,3) - vector(0,0,0) is not vector(1, 2, 3)"
-    assert ({_v2} * {_v1}) is (vector(0, 0, 0)) with "vector(1,2,3) * vector(0,0,0) is not vector(0, 0, 0)"
-    assert vector_equals(({_v2} / {_v1}), infinity value, infinity value, infinity value) is true with "vector(1,2,3) / vector(0,0,0) is not vector(infinity, infinity, infinity)"
-
-    # --Non-Vectors--
-    set {_v1} to vector(1, 2, 3)
-    set {_v2} to "test"
-    assert ({_v1} + {_v2}) is not set with "vector plus string is set"
-    assert ({_v1} - {_v2}) is not set with "vector minus string is set"
-    assert ({_v1} * {_v2}) is not set with "vector multiplied by string is set"
-    assert ({_v1} / {_v2}) is not set with "vector divided by string is set"
-    assert ({_v2} + {_v1}) is not set with "string plus vector is set"
-    assert ({_v2} - {_v1}) is not set with "string minus vector is set"
-    assert ({_v2} * {_v1}) is not set with "string multiplied by vector is set"
-    assert ({_v2} / {_v1}) is not set with "string divided by vector is set"
-
-    # --Edge Cases--
-    set {_v1} to vector(1, infinity value, 3)
-    set {_v2} to vector(4, 5, NaN value)
-    assert vector_equals(({_v1} + {_v2}), 5, infinity value, NaN value) is true with "vector(1, infinity, 3) + vector(4, 5, NaN) is not vector(5, infinity, NaN)"
-    assert vector_equals(({_v1} - {_v2}), -3, infinity value, NaN value) is true with "vector(1, infinity, 3) - vector(4, 5, NaN) is not vector(-3, infinity, NaN)"
-    assert vector_equals(({_v1} * {_v2}), 4, infinity value, NaN value) is true with "vector(1, infinity, 3) * vector(4, 5, NaN) is not vector(4, infinity, NaN)"
-    assert vector_equals(({_v1} / {_v2}), 0.25, infinity value, NaN value) is true with "vector(1, infinity, 3) / vector(4, 5, NaN) is not vector(0.25, infinity, NaN)"
-    assert vector_equals(({_v2} + {_v1}), 5, infinity value, NaN value) is true with "vector(4, 5, NaN) + vector(1, infinity, 3) is not vector(5, infinity, NaN)"
-    assert vector_equals(({_v2} - {_v1}), 3, -infinity value, NaN value) is true with "vector(4, 5, NaN) - vector(1, infinity, 3) is not vector(3, -infinity, NaN)"
-    assert vector_equals(({_v2} * {_v1}), 4, infinity value, NaN value) is true with "vector(4, 5, NaN) * vector(1, infinity, 3) is not vector(4, infinity, NaN)"
-    assert vector_equals(({_v2} / {_v1}), 4, 0, NaN value) is true with "vector(4, 5, NaN) / vector(1, infinity, 3) is not vector(4, 0, NaN)"
-
-    # --Difference--
-
-    set {_v1} to vector(1, 2, 3)
-    set {_v2} to vector(4, 5, 6)
-    assert (difference between {_v1} and {_v2}) is (vector(3, 3, 3)) with "difference between vector(1,2,3) and vector(4,5,6) is not vector(3, 3, 3)"
-    assert (difference between {_v2} and {_v1}) is (vector(3, 3, 3)) with "difference between vector(4,5,6) and vector(1,2,3) is not vector(3, 3, 3)"
-    assert (difference between {_v1} and {_v1}) is (vector(0, 0, 0)) with "difference between vector(1,2,3) and vector(1,2,3) is not vector(0, 0, 0)"
-    assert (difference between {_v1} and vector(0,0,0)) is (vector(1, 2, 3)) with "difference between vector(1,2,3) and vector(0,0,0) is not vector(1, 2, 3)"
-    assert (difference between vector(0,0,0) and {_v1}) is (vector(1, 2, 3)) with "difference between vector(0,0,0) and {_v1} is not vector(1, 2, 3)"
-    assert vector_equals(difference between {_v1} and vector(infinity value, -infinity value, NaN value), infinity value, infinity value, NaN value) is true with "difference between vector(1,2,3) and vector(infinity, -infinity, NaN) is not vector(infinity, infinity, NaN)"
+	# --Addition/Subtraction--
+	set {_v1} to vector(1, 2, 3)
+	set {_v2} to vector(4, 5, 6)
+
+	assert ({_v1} + {_v2}) is (vector(5, 7, 9)) with "{_v1} + {_v2} is not vector(5, 7, 9)"
+	assert ({_v1} - {_v2}) is (vector(-3, -3, -3)) with "{_v1} - {_v2} is not vector(-3, -3, -3)"
+	assert ({_v1} * {_v2}) is (vector(4, 10, 18)) with "{_v1} * {_v2} is not vector(4, 10, 18)"
+	assert ({_v1} / {_v2}) is (vector(0.25, 0.4, 0.5)) with "{_v1} / {_v2} is not vector(0.25, 0.4, 0.5)"
+
+	# --Zero Vectors--
+
+	set {_v1} to vector(0,0,0)
+	set {_v2} to vector(1,2,3)
+	assert ({_v1} + {_v2}) is (vector(1, 2, 3)) with "vector(0,0,0) + vector(1,2,3) is not vector(1, 2, 3)"
+	assert ({_v1} - {_v2}) is (vector(-1, -2, -3)) with "vector(0,0,0) - vector(1,2,3) is not vector(-1, -2, -3)"
+	assert ({_v1} * {_v2}) is (vector(0, 0, 0)) with "vector(0,0,0) * vector(1,2,3) is not vector(0, 0, 0)"
+	assert ({_v1} / {_v2}) is (vector(0, 0, 0)) with "vector(0,0,0) / vector(1,2,3) is not vector(0, 0, 0)"
+	assert ({_v2} + {_v1}) is (vector(1, 2, 3)) with "vector(1,2,3) + vector(0,0,0) is not vector(1, 2, 3)"
+	assert ({_v2} - {_v1}) is (vector(1, 2, 3)) with "vector(1,2,3) - vector(0,0,0) is not vector(1, 2, 3)"
+	assert ({_v2} * {_v1}) is (vector(0, 0, 0)) with "vector(1,2,3) * vector(0,0,0) is not vector(0, 0, 0)"
+	assert vector_equals(({_v2} / {_v1}), infinity value, infinity value, infinity value) is true with "vector(1,2,3) / vector(0,0,0) is not vector(infinity, infinity, infinity)"
+
+	# --Non-Vectors--
+	set {_v1} to vector(1, 2, 3)
+	set {_v2} to "test"
+	assert ({_v1} + {_v2}) is not set with "vector plus string is set"
+	assert ({_v1} - {_v2}) is not set with "vector minus string is set"
+	assert ({_v1} * {_v2}) is not set with "vector multiplied by string is set"
+	assert ({_v1} / {_v2}) is not set with "vector divided by string is set"
+	assert ({_v2} + {_v1}) is not set with "string plus vector is set"
+	assert ({_v2} - {_v1}) is not set with "string minus vector is set"
+	assert ({_v2} * {_v1}) is not set with "string multiplied by vector is set"
+	assert ({_v2} / {_v1}) is not set with "string divided by vector is set"
+
+	# --Edge Cases--
+	set {_v1} to vector(1, infinity value, 3)
+	set {_v2} to vector(4, 5, NaN value)
+	assert vector_equals(({_v1} + {_v2}), 5, infinity value, NaN value) is true with "vector(1, infinity, 3) + vector(4, 5, NaN) is not vector(5, infinity, NaN)"
+	assert vector_equals(({_v1} - {_v2}), -3, infinity value, NaN value) is true with "vector(1, infinity, 3) - vector(4, 5, NaN) is not vector(-3, infinity, NaN)"
+	assert vector_equals(({_v1} * {_v2}), 4, infinity value, NaN value) is true with "vector(1, infinity, 3) * vector(4, 5, NaN) is not vector(4, infinity, NaN)"
+	assert vector_equals(({_v1} / {_v2}), 0.25, infinity value, NaN value) is true with "vector(1, infinity, 3) / vector(4, 5, NaN) is not vector(0.25, infinity, NaN)"
+	assert vector_equals(({_v2} + {_v1}), 5, infinity value, NaN value) is true with "vector(4, 5, NaN) + vector(1, infinity, 3) is not vector(5, infinity, NaN)"
+	assert vector_equals(({_v2} - {_v1}), 3, -infinity value, NaN value) is true with "vector(4, 5, NaN) - vector(1, infinity, 3) is not vector(3, -infinity, NaN)"
+	assert vector_equals(({_v2} * {_v1}), 4, infinity value, NaN value) is true with "vector(4, 5, NaN) * vector(1, infinity, 3) is not vector(4, infinity, NaN)"
+	assert vector_equals(({_v2} / {_v1}), 4, 0, NaN value) is true with "vector(4, 5, NaN) / vector(1, infinity, 3) is not vector(4, 0, NaN)"
+
+	# --Difference--
+
+	set {_v1} to vector(1, 2, 3)
+	set {_v2} to vector(4, 5, 6)
+	assert (difference between {_v1} and {_v2}) is (vector(3, 3, 3)) with "difference between vector(1,2,3) and vector(4,5,6) is not vector(3, 3, 3)"
+	assert (difference between {_v2} and {_v1}) is (vector(3, 3, 3)) with "difference between vector(4,5,6) and vector(1,2,3) is not vector(3, 3, 3)"
+	assert (difference between {_v1} and {_v1}) is (vector(0, 0, 0)) with "difference between vector(1,2,3) and vector(1,2,3) is not vector(0, 0, 0)"
+	assert (difference between {_v1} and vector(0,0,0)) is (vector(1, 2, 3)) with "difference between vector(1,2,3) and vector(0,0,0) is not vector(1, 2, 3)"
+	assert (difference between vector(0,0,0) and {_v1}) is (vector(1, 2, 3)) with "difference between vector(0,0,0) and {_v1} is not vector(1, 2, 3)"
+	assert vector_equals(difference between {_v1} and vector(infinity value, -infinity value, NaN value), infinity value, infinity value, NaN value) is true with "difference between vector(1,2,3) and vector(infinity, -infinity, NaN) is not vector(infinity, infinity, NaN)"
 
 test "number - vector operations":
-    set {_v1} to vector(1, 2, 3)
-    set {_v2} to 2
-    assert ({_v1} + 2) is not set with "vector plus number is set"
-    assert ({_v1} - 2) is not set with "vector minus number is set"
-    assert ({_v1} * 2) is (vector(2, 4, 6)) with "vector(1,2,3) * 2 is not vector(2, 4, 6)"
-    assert ({_v1} / 2) is (vector(0.5, 1, 1.5)) with "vector(1,2,3) / 2 is not vector(0.5, 1, 1.5)"
-    assert ({_v1} ^ 2) is not set with "vector to the power of a number is set"
-    assert ({_v1} * 0) is (vector(0, 0, 0)) with "vector(1,2,3) * 0 is not vector(0, 0, 0)"
-    assert vector_equals(({_v1} / 0), infinity value, infinity value, infinity value) is true with "vector(1,2,3) / 0 is not vector(infinity, infinity, infinity)"
-    assert vector_equals(({_v1} * -infinity value), -infinity value, -infinity value, -infinity value) is true with "vector(1,2,3) * -infinity is not vector(-infinity, -infinity, -infinity)"
-    assert vector_equals(({_v1} / -infinity value), -0, -0, -0) is true with "vector(1,2,3) / -infinity value is not vector(-0, -0, -0)"
-    assert vector_equals(({_v1} * NaN value), NaN value, NaN value, NaN value) is true with "vector(1,2,3) * NaN is not vector(NaN, NaN, NaN)"
-    assert vector_equals(({_v1} / NaN value), NaN value, NaN value, NaN value) is true with "vector(1,2,3) / NaN is not vector(NaN, NaN, NaN)"
+	set {_v1} to vector(1, 2, 3)
+	set {_v2} to 2
+	assert ({_v1} + 2) is not set with "vector plus number is set"
+	assert ({_v1} - 2) is not set with "vector minus number is set"
+	assert ({_v1} * 2) is (vector(2, 4, 6)) with "vector(1,2,3) * 2 is not vector(2, 4, 6)"
+	assert ({_v1} / 2) is (vector(0.5, 1, 1.5)) with "vector(1,2,3) / 2 is not vector(0.5, 1, 1.5)"
+	assert ({_v1} ^ 2) is not set with "vector to the power of a number is set"
+	assert ({_v1} * 0) is (vector(0, 0, 0)) with "vector(1,2,3) * 0 is not vector(0, 0, 0)"
+	assert vector_equals(({_v1} / 0), infinity value, infinity value, infinity value) is true with "vector(1,2,3) / 0 is not vector(infinity, infinity, infinity)"
+	assert vector_equals(({_v1} * -infinity value), -infinity value, -infinity value, -infinity value) is true with "vector(1,2,3) * -infinity is not vector(-infinity, -infinity, -infinity)"
+	assert vector_equals(({_v1} / -infinity value), -0, -0, -0) is true with "vector(1,2,3) / -infinity value is not vector(-0, -0, -0)"
+	assert vector_equals(({_v1} * NaN value), NaN value, NaN value, NaN value) is true with "vector(1,2,3) * NaN is not vector(NaN, NaN, NaN)"
+	assert vector_equals(({_v1} / NaN value), NaN value, NaN value, NaN value) is true with "vector(1,2,3) / NaN is not vector(NaN, NaN, NaN)"
 
 test "timespan arithmetic":
-    set {_t1} to 1 second
-    set {_t2} to 2 seconds
-    assert ({_t1} + {_t2}) is (3 seconds) with "1 second + 2 seconds is not 3 seconds"
-    assert ({_t1} - {_t2}) is (0 seconds) with "1 second - 2 seconds is not 0 seconds"
-    assert ({_t1} * 2) is (2 seconds) with "1 second * 2 is not 2 seconds"
-    assert ({_t1} / 2) is (0.5 seconds) with "1 second / 2 is not 0.5 seconds"
+	set {_t1} to 1 second
+	set {_t2} to 2 seconds
+	assert ({_t1} + {_t2}) is (3 seconds) with "1 second + 2 seconds is not 3 seconds"
+	assert ({_t1} - {_t2}) is (0 seconds) with "1 second - 2 seconds is not 0 seconds"
+	assert ({_t1} * 2) is (2 seconds) with "1 second * 2 is not 2 seconds"
+	assert ({_t1} / 2) is (0.5 seconds) with "1 second / 2 is not 0.5 seconds"
 
-    assert (2 * {_t1}) is (2 seconds) with "2 * 1 second is not 2 seconds"
-    assert (2 / {_t1}) is not set with "number divided by timespan is set" 
+	assert (2 * {_t1}) is (2 seconds) with "2 * 1 second is not 2 seconds"
+	assert (2 / {_t1}) is not set with "number divided by timespan is set"
 
-    assert ({_t1} + 2) is not set with "timespan plus number is set"
+	assert ({_t1} + 2) is not set with "timespan plus number is set"
 
-    assert {_t1} / {_t2} is 0.5 with "timespan / timespan failed"
-    assert {_t1} / 1 tick is 20 with "timespan / timespan of different units failed"
-    assert 0 seconds / {_t2} is 0 with "0 timespan / timespan failed"
-    assert {_t1} / 0 seconds is infinity value with "timespan / 0 timespan failed"
-    assert isNaN(0 seconds / 0 ticks) is true with "0 timespan / 0 timespan failed", expected NaN value, got (0 seconds / 0 ticks)
+	assert {_t1} / {_t2} is 0.5 with "timespan / timespan failed"
+	assert {_t1} / 1 tick is 20 with "timespan / timespan of different units failed"
+	assert 0 seconds / {_t2} is 0 with "0 timespan / timespan failed"
+	assert {_t1} / 0 seconds is infinity value with "timespan / 0 timespan failed"
+	assert isNaN(0 seconds / 0 ticks) is true with "0 timespan / 0 timespan failed", expected NaN value, got (0 seconds / 0 ticks)
 
 test "date arithmetic":
-    set {_d1} to now
-    set {_d2} to 1 day before {_d1}
-    assert ({_d1} + {_d2}) is not set with ""
-
-    assert ({_d1} + 1 day) is (1 day after {_d1}) with "now + 1 day is not 1 day from now"
-    assert ({_d1} - 1 day) is (1 day before {_d1}) with "now - 1 day is not 1 day ago"
-    assert ({_d1} + 1 week) is (1 week after {_d1}) with "now + 1 week is not 1 week from now"
-    assert ({_d1} - 1 week) is (1 week before {_d1}) with "now - 1 week is not 1 week ago"
-    assert ({_d1} + 1) is not set with ""
+	set {_d1} to now
+	set {_d2} to 1 day before {_d1}
+	assert ({_d1} + {_d2}) is not set with ""
+
+	assert ({_d1} + 1 day) is (1 day after {_d1}) with "now + 1 day is not 1 day from now"
+	assert ({_d1} - 1 day) is (1 day before {_d1}) with "now - 1 day is not 1 day ago"
+	assert ({_d1} + 1 week) is (1 week after {_d1}) with "now + 1 week is not 1 week from now"
+	assert ({_d1} - 1 week) is (1 week before {_d1}) with "now - 1 week is not 1 week ago"
+	assert ({_d1} + 1) is not set with ""
 
 local function vector_equals(vec: vector, x: number, y: number, z: number) :: boolean:
 	return false if component_equals((x of {_vec}), {_x}) is false
diff --git a/src/test/skript/tests/syntaxes/expressions/ExprArmorSlot.sk b/src/test/skript/tests/syntaxes/expressions/ExprArmorSlot.sk
index bb41dbd844a..b001387ea2c 100644
--- a/src/test/skript/tests/syntaxes/expressions/ExprArmorSlot.sk
+++ b/src/test/skript/tests/syntaxes/expressions/ExprArmorSlot.sk
@@ -1,14 +1,32 @@
 test "armour slot":
-	spawn zombie at spawn of world "world":
-		set boots of event-entity to gold boots
-		assert boots of event-entity are gold boots with "Gold boots were not applied"
+	spawn zombie at test-location:
+		set boots of event-entity to golden boots
+		assert boots of event-entity are golden boots with "Gold boots were not applied"
 		set leggings of event-entity to iron leggings
 		assert leggings of event-entity are iron leggings with "Iron leggings were not applied"
 		set chestplate of event-entity to diamond chestplate
 		assert chestplate of event-entity is diamond chestplate with "Diamond chestplate was not applied"
-		set helmet of event-entity to dirt block
-		assert helmet of event-entity is dirt block with "Dirt helmet was not applied"
-		assert armour of event-entity contains dirt block, diamond chestplate, iron leggings and gold boots with "Armour contents were not correct"
+		set helmet of event-entity to dirt
+		assert helmet of event-entity is dirt with "Dirt helmet was not applied"
+		assert armour of event-entity contains dirt, diamond chestplate, iron leggings and golden boots with "Armour contents were not correct"
 		clear armour of event-entity
-		assert armour of event-entity does not contain dirt block, diamond chestplate, iron leggings and gold boots with "Failed to clear EquipmentSlots"
+		assert armour of event-entity does not contain dirt, diamond chestplate, iron leggings and golden boots with "Failed to clear EquipmentSlots"
 		delete event-entity
+
+test "body armor wolf" when running minecraft "1.20.5":
+	spawn wolf at spawn of world "world":
+		set {_entity} to event-entity
+
+	set body armor of {_entity} to wolf armor
+	assert body armor of {_entity} is wolf armor with "Body armor of entity is not wolf armor"
+	clear body armor of {_entity}
+	assert body armor of {_entity} is air with "Body armor of entity did not get cleared"
+	clear entity within {_entity}
+
+test "invalid body armor":
+	loop a zombie, a skeleton, a zombie horse and a skeleton horse:
+		spawn loop-value at spawn of world "world":
+			assert (body armor of event-entity) is not set with "Entity body armor is accessible"
+			set body armor of event-entity to diamond chestplate
+			assert (body armor of event-entity) is not set with "Entity body armor is accessible"
+			clear event-entity
diff --git a/src/test/skript/tests/syntaxes/expressions/ExprArrowsStuck.sk b/src/test/skript/tests/syntaxes/expressions/ExprArrowsStuck.sk
index aa577e45d4c..44a6b9007e3 100644
--- a/src/test/skript/tests/syntaxes/expressions/ExprArrowsStuck.sk
+++ b/src/test/skript/tests/syntaxes/expressions/ExprArrowsStuck.sk
@@ -1,5 +1,5 @@
 test "arrows stuck":
-	spawn zombie at spawn of world "world":
+	spawn zombie at test-location:
 		assert arrows stuck in event-entity is 0 with "entity spawned with arrows stuck"
 		set arrows stuck in event-entity to 31
 		assert arrows stuck in event-entity is 31 with "arrows stuck set failed"
diff --git a/src/test/skript/tests/syntaxes/expressions/ExprBannerItem.sk b/src/test/skript/tests/syntaxes/expressions/ExprBannerItem.sk
new file mode 100644
index 00000000000..7df18be4a5a
--- /dev/null
+++ b/src/test/skript/tests/syntaxes/expressions/ExprBannerItem.sk
@@ -0,0 +1,7 @@
+test "banner item":
+	set {_pattern} to a creeper banner pattern item
+	assert {_pattern} is set with "Creeper banner pattern should return an item"
+
+	parse:
+		set {_invalid} to a base banner pattern item
+	assert {_invalid} is not set with "Base banner pattern type should not get an item (unless updated)"
diff --git a/src/test/skript/tests/syntaxes/expressions/ExprBeaconValues.sk b/src/test/skript/tests/syntaxes/expressions/ExprBeaconValues.sk
new file mode 100644
index 00000000000..5928dc8cebe
--- /dev/null
+++ b/src/test/skript/tests/syntaxes/expressions/ExprBeaconValues.sk
@@ -0,0 +1,18 @@
+on load:
+	#Note: Can not test 'secondary effect' due to the requirements in order to set it are too long of a time
+	# Than that can be allowed in this test
+
+	set {_loc} to spawn of world "world" ~ vector(5,5,5)
+	set block at {_loc} to beacon
+
+	set {_block} to block at {_loc}
+	set primary beacon effect of {_block} to haste
+	assert primary beacon effect of {_block} is haste with "Set beacon primary effect to haste"
+	clear primary beacon effect of {_block}
+	assert primary beacon effect of {_block} is not set with "Clear beacon primary effect"
+	set range of {_block} to 10
+	assert range of {_block} is 10 with "Set beacon range to 10"
+	add 5 to range of {_block}
+	assert range of {_block} is 15 with "Add 5 to beacon range"
+
+	set block at {_loc} to air
diff --git a/src/test/skript/tests/syntaxes/expressions/ExprBlockData.sk b/src/test/skript/tests/syntaxes/expressions/ExprBlockData.sk
index 8fd992f8ce1..043d2eaf591 100644
--- a/src/test/skript/tests/syntaxes/expressions/ExprBlockData.sk
+++ b/src/test/skript/tests/syntaxes/expressions/ExprBlockData.sk
@@ -1,7 +1,7 @@
-test "block data" when running minecraft "1.14.4":
-	set {_b} to block at spawn of world "world"
+test "block data":
+	set {_b} to block at test-location
 	set block at {_b} to campfire[lit=false;waterlogged=true]
-	assert block at {_b} is an unlit campfire with "block at spawn should be an unlit campfire"
+	assert block at {_b} is campfire[lit=false] with "block at spawn should be an unlit campfire"
 
 	assert block at {_b} = campfire[lit=false;waterlogged=true] with "block should have been an unlit, waterlogged campfire"
 	assert block at {_b} = campfire[waterlogged=true] with "block should have been a waterlogged campfire"
diff --git a/src/test/skript/tests/syntaxes/expressions/ExprBlockSound.sk b/src/test/skript/tests/syntaxes/expressions/ExprBlockSound.sk
new file mode 100644
index 00000000000..2e22f1b2d08
--- /dev/null
+++ b/src/test/skript/tests/syntaxes/expressions/ExprBlockSound.sk
@@ -0,0 +1,46 @@
+test "block sounds (1.20+)":
+
+	# === SETUP ===
+
+	set {_before} to blockdata of (block at (spawn of world "world"))
+	set {_20} to whether running minecraft "1.20"
+	set {_empty} to "INTENTIONALLY_EMPTY" if running minecraft "1.20" else "BLOCK.STONE.PLACE"
+
+	# === TESTS ===
+
+	set {_stone::*} to getObjects(stone)
+	assert break sound of {_stone::*} is "BLOCK.STONE.BREAK" with "break sound of stone wasn't BLOCK.STONE.BREAK"
+	assert fall sound of {_stone::*} is "BLOCK.STONE.FALL" with "fall sound of stone wasn't BLOCK.STONE.FALL"
+	assert hit sound of {_stone::*} is "BLOCK.STONE.HIT" with "hit sound of stone wasn't BLOCK.STONE.HIT"
+	assert place sound of {_stone::*} is "BLOCK.STONE.PLACE" with "place sound of stone wasn't BLOCK.STONE.PLACE"
+	assert step sound of {_stone::*} is "BLOCK.STONE.STEP" with "step sound of stone wasn't BLOCK.STONE.STEP"
+
+	set {_wool::*} to getObjects(white wool)
+	assert break sound of {_wool::*} is "BLOCK.WOOL.BREAK" with "break sound of stone wasn't BLOCK.WOOL.BREAK"
+	assert fall sound of {_wool::*} is "BLOCK.WOOL.FALL" with "fall sound of stone wasn't BLOCK.WOOL.FALL"
+	assert hit sound of {_wool::*} is "BLOCK.WOOL.HIT" with "hit sound of stone wasn't BLOCK.WOOL.HIT"
+	assert place sound of {_wool::*} is "BLOCK.WOOL.PLACE" with "place sound of stone wasn't BLOCK.WOOL.PLACE"
+	assert step sound of {_wool::*} is "BLOCK.WOOL.STEP" with "step sound of stone wasn't BLOCK.WOOL.STEP"
+
+	assert break sound of (water, lava and bubble column) is ("INTENTIONALLY_EMPTY" if {_20} is true else "BLOCK.STONE.BREAK") with "break sound of water, lava, or bubble column wasn't INTENTIONALLY_EMPTY"
+	assert fall sound of (water, lava and bubble column) is ("INTENTIONALLY_EMPTY" if {_20} is true else "BLOCK.STONE.FALL") with "fall sound of water, lava, or bubble column wasn't INTENTIONALLY_EMPTY"
+	assert hit sound of (water, lava and bubble column) is ("INTENTIONALLY_EMPTY" if {_20} is true else "BLOCK.STONE.HIT") with "hit sound of water, lava, or bubble column wasn't INTENTIONALLY_EMPTY"
+	assert place sound of (water, lava and bubble column) is ("INTENTIONALLY_EMPTY" if {_20} is true else "BLOCK.STONE.PLACE") with "place sound of water, lava, or bubble column wasn't INTENTIONALLY_EMPTY"
+	assert step sound of (water, lava and bubble column) is ("INTENTIONALLY_EMPTY" if {_20} is true else "BLOCK.STONE.STEP") with "step sound of water, lava, or bubble column wasn't INTENTIONALLY_EMPTY"
+
+	assert break sound of (diamond, diamond sword and {_none}) is not set with "break sound of non-block item shouldn't be set"
+	assert fall sound of (diamond, diamond sword and {_none}) is not set with "fall sound of non-block item shouldn't be set"
+	assert hit sound of (diamond, diamond sword and {_none}) is not set with "hit sound of non-block item shouldn't be set"
+	assert place sound of (diamond, diamond sword and {_none}) is not set with "place sound of non-block item shouldn't be set"
+	assert step sound of (diamond, diamond sword and {_none}) is not set with "step sound of non-block item shouldn't be set"
+
+	# === CLEANUP ===
+
+	set blockdata of {_block} to {_before}
+
+local function getObjects(i: itemtype) :: objects:
+	if (block at (spawn of world "world")) is not {_i}:
+		set block at (spawn of world "world") to {_i}
+	set {_block} to block at (spawn of world "world")
+	set {_data} to blockdata of {_block}
+	return {_block}, {_data} and {_i}
diff --git a/src/test/skript/tests/syntaxes/expressions/ExprBookAuthor.sk b/src/test/skript/tests/syntaxes/expressions/ExprBookAuthor.sk
index e417bfac3fb..abecb84843b 100644
--- a/src/test/skript/tests/syntaxes/expressions/ExprBookAuthor.sk
+++ b/src/test/skript/tests/syntaxes/expressions/ExprBookAuthor.sk
@@ -1,5 +1,5 @@
 test "book author":
-	set {_i} to book with text
+	set {_i} to written book
 	assert {_i}'s book author is not set with "non-existent book author failed"
 	set {_i}'s book author to "aB1$😀"
-	assert caseEquals({_i}'s book author, "aB1$😀") is true with "set book author failed"
+	assert case_equals({_i}'s book author, "aB1$😀") is true with "set book author failed"
diff --git a/src/test/skript/tests/syntaxes/expressions/ExprBookPages.sk b/src/test/skript/tests/syntaxes/expressions/ExprBookPages.sk
index a2f7b7e3a7c..5bc9fb63a42 100644
--- a/src/test/skript/tests/syntaxes/expressions/ExprBookPages.sk
+++ b/src/test/skript/tests/syntaxes/expressions/ExprBookPages.sk
@@ -1,6 +1,4 @@
 test "book pages":
-	set {_i} to book with text
-	assert {_i}'s book pages is not set with "non-existent book pages failed"
 	set {_i} to a written book
 	assert {_i}'s book pages is not set with "non-existent book pages failed 2"
 	set pages of {_i} to "&aPages testing" and "test 2"
diff --git a/src/test/skript/tests/syntaxes/expressions/ExprBookTitle.sk b/src/test/skript/tests/syntaxes/expressions/ExprBookTitle.sk
index 3d72ffaa202..41ee41a7f5e 100644
--- a/src/test/skript/tests/syntaxes/expressions/ExprBookTitle.sk
+++ b/src/test/skript/tests/syntaxes/expressions/ExprBookTitle.sk
@@ -1,5 +1,5 @@
 test "book title":
-	set {_i} to book with text
+	set {_i} to written book
 	assert {_i}'s book title is not set with "non-existent book title failed"
 	set {_i}'s book title to "aB1$😀"
-	assert caseEquals({_i}'s book title, "aB1$😀") is true with "set book title failed"
+	assert case_equals({_i}'s book title, "aB1$😀") is true with "set book title failed"
diff --git a/src/test/skript/tests/syntaxes/expressions/ExprColorOf.sk b/src/test/skript/tests/syntaxes/expressions/ExprColorOf.sk
new file mode 100644
index 00000000000..06e9931c958
--- /dev/null
+++ b/src/test/skript/tests/syntaxes/expressions/ExprColorOf.sk
@@ -0,0 +1,30 @@
+# TODO: write tests for non-display colors
+
+# test "color of blocks":
+
+# test "color of items":
+
+# test "color of entities":
+
+# test "color of fireworks":
+
+test "color of displays":
+	spawn a text display at spawn of world "world":
+		set {_e} to entity
+
+	assert color of {_e} is rgb(0,0,0, 64) with "default background colour failed"
+
+	set colour of {_e} to red
+	assert color of {_e} is red with "failed to set background colour"
+
+	set colour of {_e} to rgb(1, 50, 200)
+	assert color of {_e} is rgb(1, 50, 200) with "failed to set background colour to rgb"
+
+	reset colour of {_e}
+	assert color of {_e} is rgb(0, 0, 0, 64) with "delete background colour failed"
+
+	set color of all text displays to rgb(0, 10, 0)
+	assert color of all text displays is rgb(0, 10, 0) with "set all background colour failed"
+
+	delete entity within {_e}
+
diff --git a/src/test/skript/tests/syntaxes/expressions/ExprCommandBlockCommand.sk b/src/test/skript/tests/syntaxes/expressions/ExprCommandBlockCommand.sk
new file mode 100644
index 00000000000..a57e0b41fd0
--- /dev/null
+++ b/src/test/skript/tests/syntaxes/expressions/ExprCommandBlockCommand.sk
@@ -0,0 +1,40 @@
+test "command block command":
+
+	set {_l} to location(0,1,0,world)
+	set {_original} to blockdata of block at {_l}
+	set block at {_l} to command block
+	spawn a minecart with command block at (spawn of world "world"):
+		set {_e} to entity
+	spawn a zombie at (spawn of world "world"):
+		set {_z} to entity
+	set {_b} to block at {_l}
+
+	assert command block command of {_b} is not set with "a new command block shouldn't have an associated command"
+	assert command block command of {_e} is not set with "a new minecart with command block shouldn't have an associated command"
+
+	set command block command of {_b} to "say asdf"
+	set command block command of {_e} to "say asdf"
+	assert command block command of {_b} is "say asdf" with "setting the command of a command block should do exactly that"
+	assert command block command of {_e} is "say asdf" with "setting the command of a minecart with command block should do exactly that"
+	assert command of {_b} is "say asdf" with "testing for possible future conflicts (block)"
+	assert command of {_e} is "say asdf" with "testing for possible future conflicts (entity)"
+
+	clear command block command of {_b}
+	clear command block command of {_e}
+	assert command block command of {_b} is not set with "clearing/deleting/resetting the command of a command block should return null"
+	assert command block command of {_e} is not set with "clearing/deleting/resetting the command of a minecart with command block should return null"
+	assert command of {_b} is not set with "testing for possible future conflicts (block)"
+	assert command of {_e} is not set with "testing for possible future conflicts (entity)"
+
+	set block at {_b} to stone
+	assert command block command of {_b} is not set with "the command of a non-command block should return null"
+	assert command block command of {_z} is not set with "the command of a non-minecart with command block should return null"
+
+	set command block command of {_b} to "say asdf"
+	set command block command of {_z} to "say asdf"
+	assert command block command of {_b} is not set with "setting the command of a non-command block shouldn't do anything"
+	assert command block command of {_z} is not set with "setting the command of a non-minecart with command block shouldn't do anything"
+
+	delete entity within {_e}
+	delete entity within {_z}
+	set block at {_l} to {_original}
diff --git a/src/test/skript/tests/syntaxes/expressions/ExprConfig.sk b/src/test/skript/tests/syntaxes/expressions/ExprConfig.sk
new file mode 100644
index 00000000000..ed0fb693fa2
--- /dev/null
+++ b/src/test/skript/tests/syntaxes/expressions/ExprConfig.sk
@@ -0,0 +1,41 @@
+using script reflection
+
+test "skript config":
+	set {_config} to the skript config
+	assert {_config} exists with "config doesn't exist"
+
+	set {_value} to the boolean value at "color codes reset formatting" in {_config}
+	assert {_value} exists with "navigation failed"
+	assert {_value} is true with "colour codes do not reset formatting (direct)"
+	delete {_value}
+
+	set {_node} to the node "number accuracy" of {_config}
+	set {_value} to the number value of {_node}
+	assert {_value} is 2 with "number accuracy wasn't 2 (indirect)"
+	delete {_value}
+
+	set {_node} to the node "effect command token" of {_config}
+	set {_value} to the text value of {_node}
+	assert {_value} is "!" with "effect command token (indirect)"
+	delete {_value}
+
+	set {_node} to the node "language" of {_config}
+	set {_value} to the text value of {_node}
+	assert {_value} is "english" with "language (indirect)"
+	delete {_value}
+
+	set {_count} to 0
+	loop the nodes of {_config}:
+		add 1 to {_count}
+	assert {_count} is greater than 10 with "too few nodes in config!"
+
+test "script config":
+	set {_config} to the current script
+	set {_node} to node "test ""script config""" of {_config}
+	set {_line} to the first element of nodes of {_node}
+	assert name of {_line} is "set {_config} to the current script" with "our first line was wrong"
+
+	set {_count} to 0
+	loop the nodes of {_node}:
+		add 1 to {_count}
+	assert {_count} is 7 with "wrong number of lines in this section"
diff --git a/src/test/skript/tests/syntaxes/expressions/ExprCustomModelData.sk b/src/test/skript/tests/syntaxes/expressions/ExprCustomModelData.sk
index 824f67d1a83..f1e24481f5f 100644
--- a/src/test/skript/tests/syntaxes/expressions/ExprCustomModelData.sk
+++ b/src/test/skript/tests/syntaxes/expressions/ExprCustomModelData.sk
@@ -1,4 +1,4 @@
-test "custom model data expressions/condition" when running minecraft "1.15.2":
+test "custom model data expressions/condition":
 	set {_item} to a diamond sword with custom model data 456
 	assert {_item} has custom model data with "{_item} does not have custom model data"
 	if {_item} has custom model data:
diff --git a/src/test/skript/tests/syntaxes/expressions/ExprDisplayBillboard.sk b/src/test/skript/tests/syntaxes/expressions/ExprDisplayBillboard.sk
new file mode 100644
index 00000000000..9745ca70abd
--- /dev/null
+++ b/src/test/skript/tests/syntaxes/expressions/ExprDisplayBillboard.sk
@@ -0,0 +1,50 @@
+test "display billboard":
+
+	spawn a text display at spawn of world "world":
+		set {_e} to entity
+
+	assert bill-boarding of {_e} is fixed with "incorrect default bill-boarding"
+
+	set bill-boarding of {_e} to vertical
+	assert bill-boarding of {_e} is vertical with "failed to set bill-boarding"
+	set bill-boarding of {_e} to horizontal
+	assert bill-boarding of {_e} is horizontal with "failed to set bill-boarding"
+	set bill-boarding of {_e} to center
+	assert bill-boarding of {_e} is center with "failed to set bill-boarding"
+	reset bill-boarding of {_e}
+	assert bill-boarding of {_e} is fixed with "failed to reset bill-boarding"
+
+	delete entity within {_e}
+
+	spawn an item display at spawn of world "world":
+		set {_e} to entity
+
+	assert bill-boarding of {_e} is fixed with "incorrect default bill-boarding"
+
+	set bill-boarding of {_e} to vertical
+	assert bill-boarding of {_e} is vertical with "failed to set bill-boarding"
+	set bill-boarding of {_e} to horizontal
+	assert bill-boarding of {_e} is horizontal with "failed to set bill-boarding"
+	set bill-boarding of {_e} to center
+	assert bill-boarding of {_e} is center with "failed to set bill-boarding"
+	reset bill-boarding of {_e}
+	assert bill-boarding of {_e} is fixed with "failed to reset bill-boarding"
+
+	delete entity within {_e}
+
+
+	spawn a block display at spawn of world "world":
+		set {_e} to entity
+
+	assert bill-boarding of {_e} is fixed with "incorrect default bill-boarding"
+
+	set bill-boarding of {_e} to vertical
+	assert bill-boarding of {_e} is vertical with "failed to set bill-boarding"
+	set bill-boarding of {_e} to horizontal
+	assert bill-boarding of {_e} is horizontal with "failed to set bill-boarding"
+	set bill-boarding of {_e} to center
+	assert bill-boarding of {_e} is center with "failed to set bill-boarding"
+	reset bill-boarding of {_e}
+	assert bill-boarding of {_e} is fixed with "failed to reset bill-boarding"
+
+	delete entity within {_e}
diff --git a/src/test/skript/tests/syntaxes/expressions/ExprDisplayBrightness.sk b/src/test/skript/tests/syntaxes/expressions/ExprDisplayBrightness.sk
new file mode 100644
index 00000000000..ee291f39cab
--- /dev/null
+++ b/src/test/skript/tests/syntaxes/expressions/ExprDisplayBrightness.sk
@@ -0,0 +1,88 @@
+test "display brightness":
+	spawn block display at spawn of world "world":
+		set {_e::1} to entity
+	spawn item display at spawn of world "world":
+		set {_e::2} to entity
+	spawn text display at spawn of world "world":
+		set {_e::3} to entity
+
+	assert brightness override of {_e::*} is not set with "default displays have unexpected brightness override"
+	assert block light level override of {_e::*} is not set with "default displays have unexpected sky light override"
+	assert sky light override of {_e::*} is not set with "default displays have unexpected block light override"
+
+	# brightness overrides
+	set brightness override of {_e::*} to 2
+	assert brightness override of {_e::*} is 2, 2, 2, 2, 2, and 2 with "failed setting brightness"
+	assert block light level override of {_e::*} is 2 with "failed setting brightness"
+	assert sky light override of {_e::*} is 2 with "failed setting brightness"
+
+	set brightness override of {_e::*} to -1
+	assert brightness override of {_e::*} is 0, 0, 0, 0, 0, and 0 with "failed setting brightness"
+	assert block light level override of {_e::*} is 0 with "failed setting brightness"
+	assert sky light override of {_e::*} is 0 with "failed setting brightness"
+
+	reset brightness override of {_e::*}
+	assert brightness override of {_e::*} is not set with "failed resetting brightness"
+	assert block light level override of {_e::*} is not set with "failed resetting brightness"
+	assert sky light override of {_e::*} is not set with "failed resetting brightness"
+
+	# sky light
+
+	set sky light override of {_e::*} to 5
+	assert brightness override of {_e::*} is 5 with "failed setting sky light"
+	assert block light level override of {_e::*} is 5 with "failed setting initial block light"
+	assert sky light override of {_e::*} is 5 with "failed setting sky light"
+
+	set sky light override of {_e::*} to -1
+	assert brightness override of {_e::*} is 5, 0, 5, 0, 5, and 0 with "failed setting sky light"
+	assert block light level override of {_e::*} is 5 with "failed setting sky light"
+	assert sky light override of {_e::*} is 0 with "failed setting sky light"
+
+	add 5 to sky light override of {_e::*}
+	assert brightness override of {_e::*} is 5 with "failed adding sky light"
+	assert block light level override of {_e::*} is 5 with "failed adding sky light"
+	assert sky light override of {_e::*} is 5 with "failed adding sky light"
+
+	set sky light override of {_e::*} to {_}
+	assert brightness override of {_e::*} is 5 with "failed setting sky light"
+	assert block light level override of {_e::*} is 5 with "failed setting sky light"
+	assert sky light override of {_e::*} is 5 with "failed setting sky light"
+
+	remove 10 from sky light override of {_e::*}
+	assert brightness override of {_e::*} is 5, 0, 5, 0, 5, and 0 with "failed adding sky light"
+	assert block light level override of {_e::*} is 5 with "failed adding sky light"
+	assert sky light override of {_e::*} is 0 with "failed adding sky light"
+
+	clear brightness override of {_e::*}
+	assert brightness override of {_e::*} is not set with "failed deleting brightness"
+	assert block light level override of {_e::*} is not set with "failed deleting brightness"
+	assert sky light override of {_e::*} is not set with "failed deleting brightness"
+
+	# block light
+
+	set block light override of {_e::*} to 5
+	assert brightness override of {_e::*} is 5 with "failed setting block light"
+	assert block light level override of {_e::*} is 5 with "failed setting initial block light"
+	assert sky light override of {_e::*} is 5 with "failed setting block light"
+
+	set block light override of {_e::*} to infinity value
+	assert brightness override of {_e::*} is 15, 5, 15, 5, 15, and 5 with "failed setting block light"
+	assert block light level override of {_e::*} is 15 with "failed setting block light"
+	assert sky light override of {_e::*} is 5 with "failed setting block light"
+
+	add 5 to block light override of {_e::*}
+	assert brightness override of {_e::*} is 15, 5, 15, 5, 15, and 5 with "failed adding block light"
+	assert block light level override of {_e::*} is 15 with "failed adding block light"
+	assert sky light override of {_e::*} is 5 with "failed adding block light"
+
+	set block light override of {_e::*} to {_}
+	assert brightness override of {_e::*} is 15, 5, 15, 5, 15, and 5 with "failed setting block light"
+	assert block light level override of {_e::*} is 15 with "failed setting block light"
+	assert sky light override of {_e::*} is 5 with "failed setting block light"
+
+	remove 10 from block light override of {_e::*}
+	assert brightness override of {_e::*} is 5 with "failed adding block light"
+	assert block light level override of {_e::*} is 5 with "failed adding block light"
+	assert sky light override of {_e::*} is 5 with "failed adding block light"
+
+	delete entities within {_e::*}
diff --git a/src/test/skript/tests/syntaxes/expressions/ExprDisplayGlowOverride.sk b/src/test/skript/tests/syntaxes/expressions/ExprDisplayGlowOverride.sk
new file mode 100644
index 00000000000..90e97f0170a
--- /dev/null
+++ b/src/test/skript/tests/syntaxes/expressions/ExprDisplayGlowOverride.sk
@@ -0,0 +1,21 @@
+test "display glow color override":
+
+	spawn block display at spawn of world "world":
+		set {_e::1} to entity
+	spawn item display at spawn of world "world":
+		set {_e::2} to entity
+	spawn text display at spawn of world "world":
+		set {_e::3} to entity
+
+	assert glow colour override of {_e::*} is not set with "default override was set"
+
+	set glow colour override of {_e::*} to blue
+	assert glow colour override of {_e::*} is blue with "failed to set to colour"
+
+	set glow colour override of {_e::*} to rgb(1, 2, 3)
+	assert glow colour override of {_e::*} is rgb(1, 2, 3) with "failed to set to rgb colour"
+
+	reset glow colour override of {_e::*}
+	assert glow colour override of {_e::*} is not set with "failed to reset override"
+
+	delete entities within {_e::*}
diff --git a/src/test/skript/tests/syntaxes/expressions/ExprDisplayHeightWidth.sk b/src/test/skript/tests/syntaxes/expressions/ExprDisplayHeightWidth.sk
new file mode 100644
index 00000000000..0ae29375a50
--- /dev/null
+++ b/src/test/skript/tests/syntaxes/expressions/ExprDisplayHeightWidth.sk
@@ -0,0 +1,39 @@
+test "display height/width":
+
+	spawn block display at spawn of world "world":
+		set {_e::1} to entity
+	spawn item display at spawn of world "world":
+		set {_e::2} to entity
+	spawn text display at spawn of world "world":
+		set {_e::3} to entity
+
+	assert display width of {_e::*} is 0 with "default width was not 0"
+	assert display height of {_e::*} is 0 with "default height was not 0"
+
+	set display height of {_e::*} to 5
+	assert display height of {_e::*} is 5 with "failed to set to height"
+	assert display width of {_e::*} is 0 with "setting height modified width"
+
+	set display width of {_e::*} to 0.1
+	assert display height of {_e::*} is 5 with "setting width modified height"
+	assert display width of {_e::*} is 0.1 with "failed to set to width"
+
+	set display height of {_e::*} to infinity value
+	assert display height of {_e::*} is 5 with "set to height to infinity"
+
+	set display height of {_e::*} to -10
+	assert display height of {_e::*} is 0 with "set to height to negative value"
+
+	add 20 to display height of {_e::*}
+	assert display height of {_e::*} is 20 with "add 20 to height"
+
+	subtract 25 from display height of {_e::*}
+	assert display height of {_e::*} is 0 with "subtract 25 from height"
+
+	subtract -2.5 from display height of {_e::*}
+	assert display height of {_e::*} is 2.5 with "subtract -2.5 from height"
+
+	reset display height of {_e::*}
+	assert display height of {_e::*} is 0 with "reset height"
+
+	delete entities within {_e::*}
diff --git a/src/test/skript/tests/syntaxes/expressions/ExprDisplayInterpolation.sk b/src/test/skript/tests/syntaxes/expressions/ExprDisplayInterpolation.sk
new file mode 100644
index 00000000000..7d2d204c1ed
--- /dev/null
+++ b/src/test/skript/tests/syntaxes/expressions/ExprDisplayInterpolation.sk
@@ -0,0 +1,33 @@
+test "display interpolation":
+
+	spawn block display at spawn of world "world":
+		set {_e::1} to entity
+	spawn item display at spawn of world "world":
+		set {_e::2} to entity
+	spawn text display at spawn of world "world":
+		set {_e::3} to entity
+
+	assert interpolation delay of {_e::*} is 0 ticks with "default delay was not 0"
+	assert interpolation duration of {_e::*} is 0 seconds with "default duration was not 0"
+
+	set interpolation delay of {_e::*} to 5 ticks
+	assert interpolation delay of {_e::*} is 5 ticks with "failed to set to delay"
+	assert interpolation duration of {_e::*} is 0 seconds with "setting height modified duration"
+
+	set interpolation duration of {_e::*} to 0.1 seconds
+	assert interpolation delay of {_e::*} is 5 ticks with "setting width modified delay"
+	assert interpolation duration of {_e::*} is 0.1 seconds with "failed to set to duration"
+
+	set interpolation delay of {_e::*} to 0 ticks
+	assert interpolation delay of {_e::*} is 0 ticks with "set to delay to 0 value"
+
+	add 20 ticks to interpolation delay of {_e::*}
+	assert interpolation delay of {_e::*} is 20 ticks with "add 20 to delay"
+
+	subtract 25 ticks from interpolation delay of {_e::*}
+	assert interpolation delay of {_e::*} is 0 ticks with "subtract 25 from delay"
+
+	reset interpolation delay of {_e::*}
+	assert interpolation delay of {_e::*} is 0 seconds with "reset delay"
+
+	delete entities within {_e::*}
diff --git a/src/test/skript/tests/syntaxes/expressions/ExprDisplayShadow.sk b/src/test/skript/tests/syntaxes/expressions/ExprDisplayShadow.sk
new file mode 100644
index 00000000000..746f2fa2cdc
--- /dev/null
+++ b/src/test/skript/tests/syntaxes/expressions/ExprDisplayShadow.sk
@@ -0,0 +1,39 @@
+test "display radius/strength":
+
+	spawn block display at spawn of world "world":
+		set {_e::1} to entity
+	spawn item display at spawn of world "world":
+		set {_e::2} to entity
+	spawn text display at spawn of world "world":
+		set {_e::3} to entity
+
+	assert shadow strength of {_e::*} is 1 with "default strength was not 0"
+	assert shadow radius of {_e::*} is 0 with "default radius was not 0"
+
+	set shadow radius of {_e::*} to 5
+	assert shadow radius of {_e::*} is 5 with "failed to set to radius"
+	assert shadow strength of {_e::*} is 1 with "setting radius modified strength"
+
+	set shadow strength of {_e::*} to 0.1
+	assert shadow radius of {_e::*} is 5 with "setting strength modified radius"
+	assert shadow strength of {_e::*} is 0.1 with "failed to set to strength"
+
+	set shadow radius of {_e::*} to infinity value
+	assert shadow radius of {_e::*} is 5 with "set to radius to infinity"
+
+	set shadow radius of {_e::*} to -10
+	assert shadow radius of {_e::*} is 0 with "set to radius to negative value"
+
+	add 20 to shadow radius of {_e::*}
+	assert shadow radius of {_e::*} is 20 with "add 20 to radius"
+
+	subtract 25 from shadow radius of {_e::*}
+	assert shadow radius of {_e::*} is 0 with "subtract 25 from radius"
+
+	subtract -2.5 from shadow radius of {_e::*}
+	assert shadow radius of {_e::*} is 2.5 with "subtract -2.5 from radius"
+
+	reset shadow radius of {_e::*}
+	assert shadow radius of {_e::*} is 0 with "reset radius"
+
+	delete entities within {_e::*}
diff --git a/src/test/skript/tests/syntaxes/expressions/ExprDisplayTeleportationDuration.sk b/src/test/skript/tests/syntaxes/expressions/ExprDisplayTeleportationDuration.sk
new file mode 100644
index 00000000000..9f57c210169
--- /dev/null
+++ b/src/test/skript/tests/syntaxes/expressions/ExprDisplayTeleportationDuration.sk
@@ -0,0 +1,30 @@
+test "display teleportation duration" when running minecraft "1.20.4":
+
+	spawn block display at spawn of world "world":
+		set {_e::1} to entity
+	spawn item display at spawn of world "world":
+		set {_e::2} to entity
+	spawn text display at spawn of world "world":
+		set {_e::3} to entity
+
+	assert teleportation duration of {_e::*} is 0 ticks with "default duration was not 0"
+
+	set teleportation duration of {_e::*} to 5 ticks
+	assert teleportation duration of {_e::*} is 5 ticks with "failed to set to duration"
+
+	set interpolation duration of {_e::*} to 0.1 seconds
+	assert teleportation duration of {_e::*} is 5 ticks with "setting width modified duration"
+
+	set teleportation duration of {_e::*} to 0 ticks
+	assert teleportation duration of {_e::*} is 0 ticks with "set to duration to 0 value"
+
+	add 20 ticks to teleportation duration of {_e::*}
+	assert teleportation duration of {_e::*} is 20 ticks with "add 20 to duration"
+
+	subtract 25 ticks from teleportation duration of {_e::*}
+	assert teleportation duration of {_e::*} is 0 ticks with "subtract 25 from duration"
+
+	reset teleportation duration of {_e::*}
+	assert teleportation duration of {_e::*} is 0 seconds with "reset duration"
+
+	delete entities within {_e::*}
diff --git a/src/test/skript/tests/syntaxes/expressions/ExprDisplayTransformation.sk b/src/test/skript/tests/syntaxes/expressions/ExprDisplayTransformation.sk
new file mode 100644
index 00000000000..fc3ac3c5315
--- /dev/null
+++ b/src/test/skript/tests/syntaxes/expressions/ExprDisplayTransformation.sk
@@ -0,0 +1,59 @@
+test "display transformation rotations":
+
+	spawn block display at spawn of world "world":
+		set {_e::1} to entity
+	spawn item display at spawn of world "world":
+		set {_e::2} to entity
+	spawn text display at spawn of world "world":
+		set {_e::3} to entity
+
+	assert left rotation of {_e::*} is quaternion(1, 0, 0, 0) with "default left rotation was wrong"
+	assert right rotation of {_e::*} is quaternion(1, 0, 0, 0) with "default right rotation was wrong"
+
+	set left rotation of {_e::*} to quaternion(1, 2, 3, 4)
+	assert left rotation of {_e::*} is quaternion(1, 2, 3, 4) with "failed to set left rotation"
+	assert right rotation of {_e::*} is quaternion(1, 0, 0, 0) with "setting left affected right rotation"
+	
+	set left rotation of {_e::*} to quaternion(1, infinity value, 3, 4)
+	assert left rotation of {_e::*} is quaternion(1, 2, 3, 4) with "set left rotation to invalid value"
+
+	set right rotation of {_e::*} to axisAngle(45, vector(0, 0, 1))
+	assert left rotation of {_e::*} is quaternion(1, 2, 3, 4) with "setting right affected left rotation"
+	assert right rotation of {_e::*} is quaternion(0.923879504, 0, 0, 0.382683455) with "failed to set right to an axisangle"
+
+	reset left rotation of {_e::*}
+	assert left rotation of {_e::*} is quaternion(1, 0, 0, 0) with "failed to reset left"
+
+	delete entities within {_e::*}
+
+
+test "display transformation translation / scales":
+	spawn block display at spawn of world "world":
+		set {_e::1} to entity
+	spawn item display at spawn of world "world":
+		set {_e::2} to entity
+	spawn text display at spawn of world "world":
+		set {_e::3} to entity
+
+	assert display scale of {_e::*} is vector(1,1,1) with "default display scale was wrong"
+	assert display translation of {_e::*} is vector(0,0,0) with "default display translation was wrong"
+
+	set display scale of {_e::*} to vector(1,2,1)
+	assert display scale of {_e::*} is vector(1,2,1) with "failed to set display scale"
+	assert display translation of {_e::*} is vector(0,0,0) with "setting display scale affected display translation"
+
+	set display translation of {_e::*} to vector(1,-2,1)
+	assert display scale of {_e::*} is vector(1,2,1) with "setting display translation affected display scale"
+	assert display translation of {_e::*} is vector(1,-2,1) with "failed to set display translation"
+	
+	set display scale of {_e::*} to vector(NaN value, 0, 0)
+	assert display scale of {_e::*} is vector(1,2,1) with "set display scale to invalid value"
+	
+	reset display scale of {_e::*}
+	assert display scale of {_e::*} is vector(1,1,1) with "failed to reset display scale"
+	
+	reset display translation of {_e::*}
+	assert display translation of {_e::*} is vector(0,0,0) with "failed to reset display scale"
+	
+
+	delete entities within {_e::*}
diff --git a/src/test/skript/tests/syntaxes/expressions/ExprDisplayViewRange.sk b/src/test/skript/tests/syntaxes/expressions/ExprDisplayViewRange.sk
new file mode 100644
index 00000000000..ba4bfbbb09e
--- /dev/null
+++ b/src/test/skript/tests/syntaxes/expressions/ExprDisplayViewRange.sk
@@ -0,0 +1,27 @@
+test "display view range":
+
+	spawn block display at spawn of world "world":
+		set {_e::1} to entity
+	spawn item display at spawn of world "world":
+		set {_e::2} to entity
+	spawn text display at spawn of world "world":
+		set {_e::3} to entity
+
+	assert view range of {_e::*} is 1 with "default view range is incorrect"
+
+	set view range of {_e::*} to 0
+	assert view range of {_e::*} is 0 with "failed to set view range"
+
+	add 20.1 to view range of {_e::*}
+	assert view range of {_e::*} is 20.1 with "failed to add to view range"
+
+	remove 50.75 from view range of {_e::*}
+	assert view range of {_e::*} is 0 with "failed to remove from view range"
+
+	reset view range of {_e::*}
+	assert view range of {_e::*} is 1 with "failed to reset view range"
+
+	set view range of {_e::*} to NaN value
+	assert view range of {_e::*} is 1 with "set view range to NaN value changed value"
+
+	delete entities within {_e::*}
diff --git a/src/test/skript/tests/syntaxes/expressions/ExprDomestication.sk b/src/test/skript/tests/syntaxes/expressions/ExprDomestication.sk
new file mode 100644
index 00000000000..005e8821dd0
--- /dev/null
+++ b/src/test/skript/tests/syntaxes/expressions/ExprDomestication.sk
@@ -0,0 +1,86 @@
+test "domestication":
+	spawn a horse at (spawn of world "world"):
+		set {_e} to entity
+	spawn a zombie at (spawn of world "world"):
+		set {_z} to entity
+
+	# normal values, horse entity
+	set max domestication level of {_e} to 100
+	set domestication level of {_e} to 50
+	assert max domestication level of {_e} is 100 with "setting the max domestication of a horse should do exactly that"
+	assert domestication level of {_e} is 50 with "setting the domestication of a horse should do exactly that"
+
+	add 10 to max domestication level of {_e}
+	add 10 to domestication level of {_e}
+	assert max domestication level of {_e} is 110 with "adding to the max domestication of a horse should do exactly that"
+	assert domestication level of {_e} is 60 with "adding to the domestication of a horse should do exactly that"
+
+	subtract 10 from max domestication level of {_e}
+	subtract 10 from domestication level of {_e}
+	assert max domestication level of {_e} is 100 with "removing from the max domestication of a horse should do exactly that"
+	assert domestication level of {_e} is 50 with "removing from the domestication of a horse should do exactly that"
+
+	subtract 60 from max domestication level of {_e}
+	assert domestication level of {_e} is 40 with "removing from the max domestication level of a horse should also clamp the domestication level if need be"
+
+	reset max domestication level of {_e}
+	reset domestication level of {_e}
+	assert max domestication level of {_e} is 1 with "resetting the max domestication of a horse should do exactly that"
+	assert domestication level of {_e} is 1 with "resetting the domestication of a horse should do exactly that"
+
+	set domestication level of {_e} to (max domestication level of {_e}) + 1
+	add 100 to domestication level of {_e}
+	assert domestication level of {_e} is (max domestication level of {_e}) with "the domestication level of a horse should never exceed it's max domestication level"
+
+	set domestication level of {_e} to 0
+	subtract 100 from domestication level of {_e}
+	assert domestication level of {_e} is 1 with "the domestication level of a horse should never be less than 1"
+
+	set max domestication level of {_e} to 0
+	subtract 100 from max domestication level of {_e}
+	assert max domestication level of {_e} is 1 with "the max domestication level of a horse should never be less than 1"
+
+	# infinity values
+	add infinity value to max domestication level of {_e}
+	assert max domestication level of {_e} is 1 with "infinity value shouldn't affect the max domestication level of a horse when added"
+	subtract infinity value from max domestication level of {_e}
+	assert max domestication level of {_e} is 1 with "infinity value should result in 1 when subtracted from the max domestication level of a horse"
+	set max domestication level of {_e} to infinity value # set is done last so the domestication level tests can also go to infinity
+	assert max domestication level of {_e} is 2147483647 with "infinity value should set the max domestication level of a horse to the max integer value"
+
+	add infinity value to domestication level of {_e}
+	assert domestication level of {_e} is 1 with "infinity value shouldn't affect the domestication level of a horse when added"
+	subtract infinity value from domestication level of {_e}
+	assert domestication level of {_e} is 1 with "infinity value should result in 1 when subtracted from the domestication level of a horse"
+	set domestication level of {_e} to infinity value
+	assert domestication level of {_e} is 2147483647 with "infinity value should set the domestication level of a horse to the max integer value"
+
+	# NaN values
+	add NaN value to max domestication level of {_e}
+	assert max domestication level of {_e} is 2147483647 with "NaN value should result in 2147483647 when added to the max domestication level of a horse"
+	set max domestication level of {_e} to NaN value
+	assert max domestication level of {_e} is 1 with "NaN value should result in 1 when used to set the max domestication level of a horse"
+	subtract NaN value from max domestication level of {_e}
+	assert max domestication level of {_e} is 1 with "NaN value should not allow the max domestication level of a horse to drop below 1"
+
+	add NaN value to domestication level of {_e}
+	assert domestication level of {_e} is 1 with "NaN value should result in 1 when used to change the domestication level of a horse"
+	set domestication level of {_e} to NaN value
+	assert domestication level of {_e} is 1 with "NaN value should result in 1 when used to set the domestication level of a horse"
+	subtract NaN value from domestication level of {_e}
+	assert domestication level of {_e} is 1 with "NaN value should result in 1 when used to change the domestication level of a horse"
+
+	# non-horse entity
+	assert max domestication level of {_z} is not set with "the max domestication of a non-horse should be null"
+	assert domestication level of {_z} is not set with "the domestication of a non-horse should be null"
+	set max domestication level of {_z} to 1
+	set domestication level of {_z} to 1
+	add 1 to max domestication level of {_z}
+	add 1 to domestication level of {_z}
+	subtract 1 from max domestication level of {_z}
+	subtract 1 from domestication level of {_z}
+	assert max domestication level of {_z} is not set with "changing the max domestication of a non-horse should do nothing"
+	assert domestication level of {_z} is not set with "changing the domestication of a non-horse should do nothing"
+
+	delete entity within {_e}
+	delete entity within {_z}
diff --git a/src/test/skript/tests/syntaxes/expressions/ExprEntities.sk b/src/test/skript/tests/syntaxes/expressions/ExprEntities.sk
index 57f58f4df47..8ee6acedf52 100644
--- a/src/test/skript/tests/syntaxes/expressions/ExprEntities.sk
+++ b/src/test/skript/tests/syntaxes/expressions/ExprEntities.sk
@@ -4,12 +4,49 @@ test "entities in chunk":
 		add event-entity to {_sheep::*}
 		add 1 to {_count}
 	assert {_count} and size of entities within {_sheep::*} is 10 with "Did not count 10 on the entities within {_sheep::*}: %{_sheep::*}%"
-	assert size of all entities in chunk at spawn of world "world" >= 10 with "Size of all entities in spawn chunk is not > 10: %size of all entities in chunk at spawn of world "world"%"
 
-	loop all sheep in chunk at spawn of world "world":
-		add loop-entity to {_e::*}
-	assert size of {_e::*} >= 10 with "Size of all sheep in spawn chunk is not >= 10 (iterating): %size of {_e::*}%"
+	set {_radius center} to location(-24, -60, -24, world "world")
+	spawn 2 sheep at location(-26, -60, -24, world "world")
+	spawn 2 sheep at location(-25, -58, -25, world "world")
+	spawn 2 sheep at location(-24, -60, -23, world "world")
+	spawn 2 sheep at location(-23, -60, -22, world "world")
+	spawn 2 sheep at location(-22, -60, -25, world "world")
 
+	set {_corner::1} to location(20, -62, 20, world "world")
+	set {_corner::2} to location(28, -58, 28, world "world")
+	spawn 2 sheep at location(21, -60, 21, world "world")
+	spawn 2 sheep at location(22, -59, 25, world "world")
+	spawn 2 sheep at location(24, -60, 23, world "world")
+	spawn 2 sheep at location(26, -60, 28, world "world")
+	spawn 2 sheep at location(28, -60, 20, world "world")
+
+	assert size of all entities in chunk at spawn of world "world" >= 10 with "Size of all entities in spawn chunk is not >= 10"
+	assert size of all entities in radius 3 of {_radius center} >= 10 with "Size of all entities in radius 3 of -24, -60, -24 is not >= 10"
+	assert size of all entities within {_corner::1} and {_corner::2} >= 10 with "Size of all entities within cuboid is not >= 10"
+
+
+	loop all entities in chunk at spawn of world "world":
+		add loop-entity to {_chunk::*}
+	assert size of {_chunk::*} >= 10 with "Size of all entities in spawn chunk is not >= 10 (iterating)"
+
+	loop all sheep in radius 3 of {_radius center}:
+		add loop-entity to {_radius::*}
+	assert size of {_radius::*} >= 10 with "Size of all sheep in radius 3 of spawn is not >= 10 (iterating)"
+
+	loop all sheep within {_corner::1} and {_corner::2}:
+		add loop-entity to {_cuboid::*}
+	assert size of {_cuboid::*} >= 10 with "Size of all sheep within cuboid is not >= 10 (iterating)"
+
+
+	delete all entities in chunk at spawn of world "world"
+	assert size of all entities in chunk at spawn of world "world" = 0 with "Size of all entities in spawn chunk != 0"
+
+	delete all entities in radius 3 of {_radius center}
+	assert size of all entities in radius 3 of {_radius center} = 0 with "Size of all entities in radius 3 of spawn != 0"
+
+	delete all entities within {_corner::1} and {_corner::2}
+	assert size of all entities within {_corner::1} and {_corner::2} = 0 with "Size of all entities in cuboid != 0"
+  
 	clear entities within {_e::*}
 	assert entities within {_e::*} where [entity input is valid] is not set with "Not all the sheep were cleared"
 	clear all entities
diff --git a/src/test/skript/tests/syntaxes/expressions/ExprEntityAttribute.sk b/src/test/skript/tests/syntaxes/expressions/ExprEntityAttribute.sk
index ed04483dbe0..00846ce12e2 100644
--- a/src/test/skript/tests/syntaxes/expressions/ExprEntityAttribute.sk
+++ b/src/test/skript/tests/syntaxes/expressions/ExprEntityAttribute.sk
@@ -1,5 +1,5 @@
 test "attributes 1":
-	spawn cow at spawn of world "world":
+	spawn cow at test-location:
 		assert movement speed attribute of event-entity is set with "attribute get failed"
 		set movement speed attribute of event-entity to 3.14
 		assert movement speed attribute of event-entity is 3.14 with "attribute set failed"
@@ -15,7 +15,7 @@ test "attributes 1":
 
 test "attributes 2" when minecraft version is not "1.9.4":
 	# Test the Reset ChangeMode only on versions that have it
-	spawn cow at spawn of world "world":
+	spawn cow at test-location:
 		reset movement speed attribute of event-entity
 		assert movement speed attribute of event-entity is set with "attribute reset failed" # No need to compare with a fixed constant
 		delete event-entity
diff --git a/src/test/skript/tests/syntaxes/expressions/ExprEntitySnapshot.sk b/src/test/skript/tests/syntaxes/expressions/ExprEntitySnapshot.sk
new file mode 100644
index 00000000000..f059554bf06
--- /dev/null
+++ b/src/test/skript/tests/syntaxes/expressions/ExprEntitySnapshot.sk
@@ -0,0 +1,17 @@
+test "entity snapshots" when running minecraft "1.20.2":
+	spawn a pig at test-location:
+		set the max health of entity to 20
+		set the health of entity to 20
+		set {_snapshot} to entity snapshot of entity
+		clear entity
+	assert {_snapshot} is an entity snapshot with "Get entity snapshot is not an entity snapshot"
+	assert type of {_snapshot} is a pig with "Entity type of entity snapshot should be a pig"
+	spawn {_snapshot} at test-location:
+		assert the max health of entity is 20 with "Max health did not stick to the spawned entity"
+		assert the health of entity is 20 with "Health did not stick to the spawned entity"
+		clear entity
+
+	set {_item} to a zombie spawn egg
+	set the spawn egg entity of {_item} to {_snapshot}
+	if running minecraft "1.20.5":
+		assert the spawn egg entity of {_item} is {_snapshot} with "Spawn egg entity is not stored snapshot"
diff --git a/src/test/skript/tests/syntaxes/expressions/ExprEntitySound.sk b/src/test/skript/tests/syntaxes/expressions/ExprEntitySound.sk
new file mode 100644
index 00000000000..d3cb3c0751b
--- /dev/null
+++ b/src/test/skript/tests/syntaxes/expressions/ExprEntitySound.sk
@@ -0,0 +1,17 @@
+test "entity sounds":
+	spawn a zombie at (spawn of world "world"):
+		assert damage sound of entity is "ENTITY.ZOMBIE.HURT" with "damage sound of zombie should return ENTITY.ZOMBIE.HURT"
+		assert death sound of entity is "ENTITY.ZOMBIE.DEATH" with "death sound of zombie should return ENTITY.ZOMBIE.DEATH"
+		assert swim sound of entity is "ENTITY.HOSTILE.SWIM" with "swim sound of zombie should return ENTITY.HOSTILE.SWIM"
+		assert normal fall damage sound of entity is "ENTITY.HOSTILE.SMALL_FALL" with "fall sound of zombie should return ENTITY.HOSTILE.SMALL_FALL"
+		assert high fall damage sound of entity is "ENTITY.HOSTILE.BIG_FALL" with "high fall sound of zombie should return ENTITY.HOSTILE.BIG_FALL"
+		assert fall damage sound from a height of 10 of entity is "ENTITY.HOSTILE.BIG_FALL" with "fall sound from height of 10 sound of zombie should return ENTITY.HOSTILE.BIG_FALL"
+		assert fall damage sound from a height of {_none} of entity is "ENTITY.HOSTILE.SMALL_FALL" with "fall sound from invalid height sound of zombie should return ENTITY.HOSTILE.SMALL_FALL"
+		assert splash sound of entity is "ENTITY.HOSTILE.SPLASH" with "splash sound of zombie should return ENTITY.HOSTILE.SPLASH"
+		assert speedy splash sound of entity is "ENTITY.GENERIC.SPLASH" with "speedy splash sound of zombie should return ENTITY.GENERIC.SPLASH"
+		assert eating sound of entity is "ENTITY.GENERIC.EAT" with "eating sound of zombie should return ENTITY.GENERIC.EAT"
+		assert eating sound of entity using golden apple is "ENTITY.GENERIC.EAT" with "eating sound of zombie using golden apple should return ENTITY.GENERIC.EAT"
+		assert drinking sound of entity is "ENTITY.GENERIC.DRINK" with "drinking sound of zombie should return ENTITY.GENERIC.DRINK"
+		assert drinking sound of entity using potion is "ENTITY.GENERIC.DRINK" with "drinking sound of zombie using potion should return ENTITY.GENERIC.DRINK"
+		assert ambient sound of entity is "ENTITY.ZOMBIE.AMBIENT" with "ambient sound of zombie should return ENTITY.ZOMBIE.AMBIENT"
+		delete entity
diff --git a/src/test/skript/tests/syntaxes/expressions/ExprEntityTamer.sk b/src/test/skript/tests/syntaxes/expressions/ExprEntityTamer.sk
index 5c84c516ae7..8d9aa911491 100644
--- a/src/test/skript/tests/syntaxes/expressions/ExprEntityTamer.sk
+++ b/src/test/skript/tests/syntaxes/expressions/ExprEntityTamer.sk
@@ -1,5 +1,5 @@
 test "entity tamer expression/condition":
-	spawn a wolf at spawn of world "world":
+	spawn a wolf at test-location:
 		assert event-entity is tameable with "entity is tameable condition not passing, last spawned wolf is not tameable"
 		set owner of event-entity to "Notch" parsed as offline player
 		assert "%owner of event-entity%" = "Notch" with "Owner of last spawned wolf was not set"
diff --git a/src/test/skript/tests/syntaxes/expressions/ExprExplosiveYield.sk b/src/test/skript/tests/syntaxes/expressions/ExprExplosiveYield.sk
index d724cb5060c..7dcb67b6a2d 100644
--- a/src/test/skript/tests/syntaxes/expressions/ExprExplosiveYield.sk
+++ b/src/test/skript/tests/syntaxes/expressions/ExprExplosiveYield.sk
@@ -1,12 +1,12 @@
 test "explosive yield":
-	spawn a primed tnt at spawn of world "world"
+	spawn a primed tnt at test-location
 	assert explosive yield of last spawned tnt is 4 with "explosive yield of tnt is 4 by default"
 	set explosive yield of last spawned tnt to 10
 	assert explosive yield of last spawned tnt is 10 with "an explosive's explosive yield should be 10 if it is set to 10"
 	delete last spawned primed tnt
 
-test "creeper explosive yield" when running minecraft "1.12.2":
-	spawn a creeper at spawn of world "world"
+test "creeper explosive yield":
+	spawn a creeper at test-location
 	assert explosive yield of last spawned creeper is 3 with "explosive yield of a creeper is 3 by default"
 	set explosive yield of last spawned creeper to 10
 	assert explosive yield of last spawned creeper is 10 with "a creeper's explosive yield should be 10 if it is set to 10"
diff --git a/src/test/skript/tests/syntaxes/expressions/ExprFreezeTicks.sk b/src/test/skript/tests/syntaxes/expressions/ExprFreezeTicks.sk
index 7caec6fcb3f..3a0d47e5137 100644
--- a/src/test/skript/tests/syntaxes/expressions/ExprFreezeTicks.sk
+++ b/src/test/skript/tests/syntaxes/expressions/ExprFreezeTicks.sk
@@ -1,5 +1,5 @@
-test "freeze time" when running minecraft "1.18":
-	spawn cow at spawn of world "world":
+test "freeze time":
+	spawn cow at test-location:
 		assert freeze time of entity is set with "freeze time get failed"
 		set freeze time of entity to 3 seconds
 		assert freeze time of entity is 3 seconds with "freeze time set failed"
diff --git a/src/test/skript/tests/syntaxes/expressions/ExprFunction.sk b/src/test/skript/tests/syntaxes/expressions/ExprFunction.sk
new file mode 100644
index 00000000000..86ae9a58fd2
--- /dev/null
+++ b/src/test/skript/tests/syntaxes/expressions/ExprFunction.sk
@@ -0,0 +1,42 @@
+options:
+	misc: "../../../../../../src/test/skript/tests/misc/"
+
+	# Princess test script is in another castle, Mario!
+	# paths are relativised to the /scripts/ directory
+	# but we are loading these scripts from the test folder :(
+
+using script reflection
+
+function testExprFunction0():
+	set {ExprFunction} to true
+
+function testExprFunction1() :: boolean:
+	set {ExprFunction} to true
+	return true
+
+function testExprFunction2(first: text, second: number) :: boolean:
+	set {ExprFunction} to true
+	if {_first} does not exist:
+		return false
+	if {_second} is greater than 3:
+		return true
+	else:
+		return false
+
+local function testExprFunction3():
+	set {ExprFunction} to true
+
+test "get functions":
+	assert (function "testExprFunction0") exists with "function wasn't found"
+	assert (function "testExprFunction1") exists with "function wasn't found"
+	assert (function "testExprFunction2") exists with "function wasn't found"
+	assert (function "testExprFunction3") exists with "local function wasn't found"
+	set {_script} to the current script
+	assert (function "testExprFunction3" from {_script}) exists with "local function wasn't found"
+	set {_script} to the script named {@misc} + "dummy.sk"
+	assert (function "testExprFunction3" from {_script}) doesn't exist with "our function was found somewhere else"
+	assert (function "testDummy" from {_script}) exists with "couldn't see local function from another script"
+
+test "get all functions":
+	set {_functions::*} to all functions from the current script
+	assert size of {_functions::*} is 4 with "found wrong number of functions"
diff --git a/src/test/skript/tests/syntaxes/expressions/ExprFurnaceSlot.sk b/src/test/skript/tests/syntaxes/expressions/ExprFurnace.sk
similarity index 66%
rename from src/test/skript/tests/syntaxes/expressions/ExprFurnaceSlot.sk
rename to src/test/skript/tests/syntaxes/expressions/ExprFurnace.sk
index 9413338b374..111dbfcd714 100644
--- a/src/test/skript/tests/syntaxes/expressions/ExprFurnaceSlot.sk
+++ b/src/test/skript/tests/syntaxes/expressions/ExprFurnace.sk
@@ -1,7 +1,7 @@
 test "furnace slot":
 	# init
-	set block at location(0, 0, 0, world) to furnace
-	set {_furnace} to block at location(0, 0, 0, world)
+	set test-block to furnace
+	set {_furnace} to test-block
 
 	# ore slot test
 	set ore slot of {_furnace} to 32 iron ores
@@ -28,4 +28,27 @@ test "furnace slot":
 	assert result slot of {_furnace} is air with "expected result slot to have nothing, but it had '%result slot of {_furnace}%'"
 
 	# cleanup
+	set test-block to air
+
+test "furnace expressions":
+	set {_loc} to location(0, 0, 0, world)
+	set block at {_loc} to furnace
+	set block at location(0, 0, 0, world) to furnace
+	set {_furnace} to block at location(0, 0, 0, world)
+
+	set the cook time of {_furnace} to 10 seconds
+	assert the cook time of {_furnace} is 10 seconds with "Set furnace cook time to 10"
+	clear the cook time of {_furnace}
+	assert the cook time of {_furnace} is 0 seconds with "Clear furnace cook time"
+
+	set the total cook time of {_furnace} to 20 seconds
+	assert the total cook time of {_furnace} is 20 seconds with "Set furnace total cook time to 20"
+	clear the total cook time of {_furnace}
+	assert the total cook time of {_furnace} is 0 seconds with "Clear furnace total cook time"
+
+	set the fuel burn time of {_furnace} to 50 seconds
+	assert the fuel burn time of {_furnace} is 50 seconds with "Set furnace fuel burn time to 50"
+	clear the fuel burn time of {_furnace}
+	assert the fuel burn time of {_furnace} is 0 seconds with "Clear furnace fuel burn time"
+
 	set block at location(0, 0, 0, world) to air
diff --git a/src/test/skript/tests/syntaxes/expressions/ExprInventory.sk b/src/test/skript/tests/syntaxes/expressions/ExprInventory.sk
index b4165f8eddd..62570788d51 100644
--- a/src/test/skript/tests/syntaxes/expressions/ExprInventory.sk
+++ b/src/test/skript/tests/syntaxes/expressions/ExprInventory.sk
@@ -1,12 +1,12 @@
 test "item inventory":
-  set {_shulker} to any shulker box
-  assert inventory of {_shulker} is set with "Failed to get shulker inventory"
-  set slot 1 of inventory of {_shulker} to dirt
-  assert slot 1 of inventory of {_shulker} is dirt with "Failed to set slot in shulker inventory"
+	set {_shulker} to a shulker box
+	assert inventory of {_shulker} is set with "Failed to get shulker inventory"
+	set slot 1 of inventory of {_shulker} to dirt
+	assert slot 1 of inventory of {_shulker} is dirt with "Failed to set slot in shulker inventory"
 
-  set {_chest} to chest
-  assert inventory of {_chest} is set with "Failed to get chest inventory"
-  set slot 1 of inventory of {_chest} to dirt
-  assert slot 1 of inventory of {_chest} is dirt with "Failed to set slot in chest inventory"
+	set {_chest} to chest
+	assert inventory of {_chest} is set with "Failed to get chest inventory"
+	set slot 1 of inventory of {_chest} to dirt
+	assert slot 1 of inventory of {_chest} is dirt with "Failed to set slot in chest inventory"
 
-  assert inventory of dirt is not set with "Inventory was found for an item without an inventory"
+	assert inventory of dirt is not set with "Inventory was found for an item without an inventory"
diff --git a/src/test/skript/tests/syntaxes/expressions/ExprItemDisplayTransform.sk b/src/test/skript/tests/syntaxes/expressions/ExprItemDisplayTransform.sk
new file mode 100644
index 00000000000..d97f06d5e34
--- /dev/null
+++ b/src/test/skript/tests/syntaxes/expressions/ExprItemDisplayTransform.sk
@@ -0,0 +1,40 @@
+test "item display transforms":
+
+	spawn block display at spawn of world "world":
+		set {_bd} to entity
+
+	assert item transform of {_bd} is not set with "block display has item transform"
+	set item transform of {_bd} to fixed
+	assert item transform of {_bd} is not set with "block display has item transform"
+	reset item transform of {_bd}
+	assert item transform of {_bd} is not set with "block display has item transform"
+
+	delete entity within {_bd}
+	spawn item display of a diamond sword at spawn of world "world":
+		set {_id} to entity
+
+	assert item transform of {_id} is no transform with "item display has wrong default transform"
+
+	set item transform of {_id} to third person left hand
+	assert item transform of {_id} is third person left hand with "failed to set item transform"
+	set item transform of {_id} to third person right hand
+	assert item transform of {_id} is third person right hand with "failed to set item transform"
+	set item transform of {_id} to first person left hand
+	assert item transform of {_id} is first person left hand with "failed to set item transform"
+	set item transform of {_id} to first person right hand
+	assert item transform of {_id} is first person right hand with "failed to set item transform"
+	set item transform of {_id} to no transform
+	assert item transform of {_id} is no transform with "failed to set item transform"
+	set item transform of {_id} to fixed
+	assert item transform of {_id} is fixed with "failed to set item transform"
+	set item transform of {_id} to head
+	assert item transform of {_id} is head with "failed to set item transform"
+	set item transform of {_id} to gui
+	assert item transform of {_id} is gui with "failed to set item transform"
+	set item transform of {_id} to ground
+	assert item transform of {_id} is ground with "failed to set item transform"
+
+	reset item transform of {_id}
+	assert item transform of {_id} is no transform with "failed to reset item transform"
+
+	delete entity within {_id}
diff --git a/src/test/skript/tests/syntaxes/expressions/ExprItemFlags.sk b/src/test/skript/tests/syntaxes/expressions/ExprItemFlags.sk
new file mode 100644
index 00000000000..eb5e7acc058
--- /dev/null
+++ b/src/test/skript/tests/syntaxes/expressions/ExprItemFlags.sk
@@ -0,0 +1,18 @@
+test "item flags":
+	set {_i} to diamond sword of unbreaking 2
+
+	add hide enchants to item flags of {_i}
+	assert item flags of {_i} is hide enchants with "Hide Enchants did not get added to item."
+
+	remove hide enchants from item flags of {_i}
+	assert item flags of {_i} isn't set with "Hide Enchants did not get removed from item."
+
+	set item flags of {_i} to hide attributes
+	assert item flags of {_i} is hide attributes with "Item flags did not get set."
+
+	reset item flags of {_i}
+	assert item flags of {_i} isn't set with "Item Flags did not reset."
+
+	set {_i} to diamond sword of unbreaking 2 with item flags hide enchants
+	assert item flags of {_i} is hide enchants with "Item does not have hide enchants item flag"
+
diff --git a/src/test/skript/tests/syntaxes/expressions/ExprItemWithEnchantmentGlint.sk b/src/test/skript/tests/syntaxes/expressions/ExprItemWithEnchantmentGlint.sk
new file mode 100644
index 00000000000..b722628c25c
--- /dev/null
+++ b/src/test/skript/tests/syntaxes/expressions/ExprItemWithEnchantmentGlint.sk
@@ -0,0 +1,46 @@
+aliases:
+	test any wool = white wool, red wool, black wool
+
+test "item enchantment glint" when running minecraft "1.20.5":
+	# Glint
+	set {_item} to diamond with enchantment glint
+	assert {_item} has enchantment glint override with "Item expected to have enchantment glint override #1"
+	assert {_item} is forced to glint with "Item expected to be forced to glint #1"
+	delete {_item}
+
+	set {_item} to diamond
+	make {_item} glint
+	assert {_item} has enchantment glint override with "Item expected to have enchantment glint override #2"
+	assert {_item} is forced to glint with "Item expected to be forced to glint #2"
+	delete {_item}
+
+	set {_item} to diamond without enchantment glint
+	assert {_item} has enchantment glint override with "Item expected to have enchantment glint override #3"
+	assert {_item} is forced to not glint with "Item expected to be forced to not glint #1"
+	delete {_item}
+
+	# Not Glint
+	set {_item} to diamond
+	make {_item} not glint
+	assert {_item} has enchantment glint override with "Item expected to have enchantment glint override #4"
+	assert {_item} is forced to not glint with "Item expected to be forced to not glint #2"
+	delete {_item}
+
+	# Without Glint Enforcement
+	set {_item} to diamond
+	assert {_item} does not have enchantment glint override with "Item expected to not have enchantment glint override #1"
+
+	set {_item} to {_item} with enchantment glint
+	clear enchantment glint override of {_item}
+	assert {_item} does not have enchantment glint override with "Item expected to not have enchantment glint override #2"
+
+test "item enchantment glint - edge cases" when running minecraft "1.20.5":
+	assert {_null} is forced to glint to fail with "Condition 'item is forced to glint' expected to fail with non itemtypes #1"
+	assert {_null} has enchantment glint override to fail with "Condition 'item has enchantment glint override' expected to fail with non itemtypes #1"
+	assert (test any wool) does not have enchantment glint override with "Condition 'does not have enchantment glint override' failed with plural itemtype aliases"
+	assert diamond with enchantment glint = diamond with enchantment glint with "Item with enchantment glint comparison failed #1"
+	assert diamond with enchantment glint != diamond without enchantment glint with "Item with enchantment glint comparison failed #2"
+	assert diamond != diamond with enchantment glint with "Item with enchantment glint comparison failed #3"
+	assert diamond with enchantment glint and stone with enchantment glint is forced to glint with "Both items expected to be forced to glint #1"
+	assert diamond without enchantment glint and stone without enchantment glint is forced to not glint with "Both items expected to be forced to glint #2"
+	assert diamond with enchantment glint and stone without enchantment glint have enchantment glint override with "Both items expected to have enchantment glint override"
diff --git a/src/test/skript/tests/syntaxes/expressions/ExprJoinSplit.sk b/src/test/skript/tests/syntaxes/expressions/ExprJoinSplit.sk
new file mode 100644
index 00000000000..b50e0e07995
--- /dev/null
+++ b/src/test/skript/tests/syntaxes/expressions/ExprJoinSplit.sk
@@ -0,0 +1,27 @@
+test "join strings":
+	assert join "a", "b" and "c" is "abc" with "join strings without delimiter failed"
+	assert join "a", "b" and "c" with " " is "a b c" with "join strings with delimiter failed"
+
+test "split strings on string":
+	assert split "abc" at "[a-z]" is "abc" with "split with regex chars failed"
+
+	assert split "a b c" at " " is "a", "b" and "c" with "split failed"
+	assert split "a b c" at " " with case sensitivity is "a", "b" and "c" with "split with case sensitivity failed"
+	assert split "a b c" at " " without trailing string is "a", "b" and "c" with "split without trailing string failed"
+
+	assert split "abc" at "" is "a", "b", "c" and "" with "split with empty delimiter failed"
+	assert split "abc" at "" with case sensitivity is "a", "b", "c" and "" with "split with empty delimiter with case sensitivity failed"
+	assert split "abc" at "" without trailing string is "a", "b" and "c" with "split with empty delimiter without trailing string failed"
+	assert split "abc" at "" with case sensitivity without trailing string is "a", "b" and "c" with "split with empty delimiter with case sensitivity without trailing string failed"
+
+	assert split "-x-X" at "x" is "-", "-" and "" with "split with delimiter at end failed"
+	assert split "-x-X" at "x" with case sensitivity is "-" and "-X" with "split with delimiter at end with case sensitivity failed"
+	assert split "-x-X" at "x" without trailing string is "-" and "-" with "split with delimiter at end without trailing string failed"
+	assert split "-x-X" at "x" with case sensitivity without trailing string is "-" and "-X" with "split with delimiter at end with case sensitivity without trailing string failed"
+
+test "split strings on regex":
+	assert regex split "a b c" at " " is "a", "b" and "c" with "regex split failed"
+	assert regex split "a b_c" at "( |_)" is "a", "b" and "c" with "regex split with regex failed"
+
+	assert regex split "-a-b-c" at "[a-z]" is "-", "-", "-" and "" with "regex split with delimiter at end failed"
+	assert regex split "-a-b-c" at "[a-z]" without trailing string is "-", "-" and "-" with "regex split with delimiter at end without trailing string failed"
diff --git a/src/test/skript/tests/syntaxes/expressions/ExprLocationFromVector.sk b/src/test/skript/tests/syntaxes/expressions/ExprLocationFromVector.sk
index 46ca2a34633..238178fa357 100644
--- a/src/test/skript/tests/syntaxes/expressions/ExprLocationFromVector.sk
+++ b/src/test/skript/tests/syntaxes/expressions/ExprLocationFromVector.sk
@@ -1,7 +1,7 @@
 test "location from vector":
 	set {_world} to world "world"
 
-	set {_vector} to vector(x coordinate of spawn of {_world}, y coordinate of spawn of {_world}, z coordinate of spawn of {_world})
+	set {_vector} to vector((x coordinate of spawn of {_world}), (y coordinate of spawn of {_world}), (z coordinate of spawn of {_world}))
 	set {_location} to location of {_vector} in {_world}
 	assert {_location} is spawn of {_world} with "location from vector failed, expected %spawn of {_world}%, got %{_vector}%"
 
diff --git a/src/test/skript/tests/syntaxes/expressions/ExprLocationVectorOffset.sk b/src/test/skript/tests/syntaxes/expressions/ExprLocationVectorOffset.sk
index d33bf64c7a3..4512b7dc0d7 100644
--- a/src/test/skript/tests/syntaxes/expressions/ExprLocationVectorOffset.sk
+++ b/src/test/skript/tests/syntaxes/expressions/ExprLocationVectorOffset.sk
@@ -1,5 +1,5 @@
 test "location vector offset":
-	set {_location} to the spawn of world "world"
+	set {_location} to the test-location
 	set {_offset} to {_location} offset by vector(0, 0, 0)
 	assert {_offset} is {_location} with "no offset equality check failed"
 	assert the distance between {_offset} and {_location} is 0 with "0 offset check failed"
diff --git a/src/test/skript/tests/syntaxes/expressions/ExprLoopValue.sk b/src/test/skript/tests/syntaxes/expressions/ExprLoopValue.sk
new file mode 100644
index 00000000000..584d41d5de9
--- /dev/null
+++ b/src/test/skript/tests/syntaxes/expressions/ExprLoopValue.sk
@@ -0,0 +1,68 @@
+test "previous and next loop value":
+	loop 5 times:
+		if any:
+			{_last} is set
+			previous loop-number is set
+		then:
+			assert {_last} = previous loop-number with "previous loop number does not match"
+		if {_next} is set:
+			assert loop-number = {_next} with "current loop number does not match the expected next loop number"
+		set {_last} to loop-number
+		set {_next} to next loop-number
+
+	clear {_last}
+	clear {_next}
+
+	set {_list::iron} to iron ingot
+	set {_list::gold} to gold ingot
+	set {_list::diamond} to diamond
+	set {_list::emerald} to emerald
+	set {_list::netherite} to netherite ingot
+	loop {_list::*}:
+		if any:
+			{_last} is set
+			previous loop-value is set
+		then:
+			assert {_last} = previous loop-value with "previous loop value does not match"
+		if {_next} is set:
+			assert loop-value = {_next} with "current loop value does not match the expected next loop value"
+		set {_last} to loop-value
+		set {_next} to next loop-value
+
+	clear {_last}
+	clear {_next}
+
+	loop {_list::*}:
+		if any:
+			{_last} is set
+			previous loop-index is set
+		then:
+			assert {_last} = previous loop-index with "previous loop index does not match"
+		if {_next} is set:
+			assert loop-index = {_next} with "current loop index does not match the expected next loop index"
+		set {_last} to loop-index
+		set {_next} to next loop-index
+
+	clear {_list::*}
+
+	set {_count} to 0
+	loop {_list::*}:
+		set {_count} to loop-iteration
+	assert {_count} = 0 with "Looping nothing should not be more than 0"
+
+	add diamond to {_list::*}
+	loop {_list::*}:
+		assert previous loop-value is not set with "Looping one object should not have a previous loop-value"
+		assert next loop-value is not set with "Looping one object should not have a next loop-value"
+		assert loop-value is a diamond with "Current loop-value should be a diamond"
+
+test "loop peeking":
+	parse:
+		loop test loop peeking disabled:
+			set {_next} to next loop-value
+	assert last parse logs contains "The expression 'test loop peeking' does not allow the usage of 'next loop-value'." with "Disabled loop peeking did not error."
+
+	parse:
+		loop test loop peeking enabled:
+			set {_next} to next loop-value
+	assert last parse logs does not contain "The expression 'test loop peeking' does not allow the usage of 'next loop-value'." with "Enabled loop peeking should not error."
diff --git a/src/test/skript/tests/syntaxes/expressions/ExprLootContext.sk b/src/test/skript/tests/syntaxes/expressions/ExprLootContext.sk
new file mode 100644
index 00000000000..e71e7828484
--- /dev/null
+++ b/src/test/skript/tests/syntaxes/expressions/ExprLootContext.sk
@@ -0,0 +1,43 @@
+test "loot context":
+
+	set {_context} to a loot context at test-location
+	assert loot location of {_context} is test-location with "loot context location failed"
+
+	spawn a pig at test-location
+	set {_pig} to last spawned pig
+
+	set {_context} to a loot context at test-location:
+		assert loot context is set with "loot context not set"
+		set looted entity to {_pig}
+		set loot luck value to 10
+		set loot location to location(1,1,1, world "world")
+		assert loot location is location(1,1,1, world "world") with "loot context location set failed"
+
+	assert looted entity of {_context} is {_pig} with "loot context entity failed"
+	assert loot luck value of {_context} is 10 with "simple loot context luck value failed"
+
+	delete entity within {_pig}
+
+	set {_context} to a loot context at test-location:
+		set loot luck value to -1
+	assert the loot luck of {_context} is -1 with "negative loot luck set failed"
+
+	set {_context} to a loot context at test-location:
+		set loot luck value to 2
+	assert the loot luck of {_context} is 2 with "existing loot luck set failed"
+
+	set {_context} to a loot context at test-location:
+		set loot luck value to 3.3
+	assert the loot luck of {_context} is 3.3 with "decimal loot luck set failed"
+
+	set {_context} to a loot context at test-location:
+		set loot luck value to 3.999
+	assert the loot luck of {_context} is 3.999 with "close decimal loot luck set failed"
+
+	set {_context} to a loot context at test-location:
+		set loot luck value to -3.3
+	assert the loot luck of {_context} is -3.3 with "negative decimal loot luck set failed"
+
+	set {_context} to a loot context at test-location:
+		set loot luck value to -3.999
+	assert the loot luck of {_context} is -3.999 with "negative close decimal loot luck set failed"
diff --git a/src/test/skript/tests/syntaxes/expressions/ExprLootItems.sk b/src/test/skript/tests/syntaxes/expressions/ExprLootItems.sk
new file mode 100644
index 00000000000..886f467c266
--- /dev/null
+++ b/src/test/skript/tests/syntaxes/expressions/ExprLootItems.sk
@@ -0,0 +1,12 @@
+test "loot items":
+
+	set {_context} to a loot context at test-location
+	set {_items::*} to loot of loot table "minecraft:chests/simple_dungeon" with {_context}
+
+	assert {_items::*} is set with "loot items not set"
+
+	set {_items::*} to loot of loot table "minecraft:entities/pig" with {_context}
+	assert {_items::*} is not set with "loot items set"
+
+	set {_items::*} to loot of loot table "minecraft:chests/simple_dungeon"
+	assert {_items::*} is set with "loot items with chest loot table without context not set"
diff --git a/src/test/skript/tests/syntaxes/expressions/ExprLootTable.sk b/src/test/skript/tests/syntaxes/expressions/ExprLootTable.sk
new file mode 100644
index 00000000000..d1d3c9a01fd
--- /dev/null
+++ b/src/test/skript/tests/syntaxes/expressions/ExprLootTable.sk
@@ -0,0 +1,23 @@
+test "loot table":
+
+	spawn a pig at test-location
+	set {_pig} to last spawned pig
+
+	assert loot table of {_pig} is loot table "minecraft:entities/pig" with "entity loot table is not 'minecraft:entities/pig'"
+
+	delete entity within {_pig}
+
+	set {_pastBlock} to block data of test-block
+
+	set test-block to chest
+
+	set loot table of test-block to loot table "minecraft:chests/simple_dungeon"
+	assert loot table of test-block is loot table "minecraft:chests/simple_dungeon" with "block loot table is not 'minecraft:chests/simple_dungeon'"
+
+	set loot table of test-block to loot table "minecraft:entities/pig"
+	assert loot table of test-block is loot table "minecraft:entities/pig" with "block loot table is not 'minecraft:entities/pig'"
+
+	set loot table of test-block to "invalidloottable" parsed as loot table
+	assert loot table of test-block is not set with "block loot table is set"
+
+	set test-block to {_pastBlock}
diff --git a/src/test/skript/tests/syntaxes/expressions/ExprLootTableSeed.sk b/src/test/skript/tests/syntaxes/expressions/ExprLootTableSeed.sk
new file mode 100644
index 00000000000..639c7adf792
--- /dev/null
+++ b/src/test/skript/tests/syntaxes/expressions/ExprLootTableSeed.sk
@@ -0,0 +1,48 @@
+test "loot table seed":
+
+	spawn a pig at test-location
+	set {_pig} to last spawned pig
+
+	assert the loot seed of {_pig} is 0 with "default entity loot seed failed"
+	set loot seed of {_pig} to 5
+	assert the loot seed of {_pig} is 5 with "simple entity loot seed set failed"
+	set loot seed of {_pig} to -1
+	assert the loot seed of {_pig} is -1 with "negative entity loot seed set failed"
+	set loot seed of {_pig} to 2
+	assert the loot seed of {_pig} is 2 with "existing entity loot seed set failed"
+	set loot seed of {_pig} to 3.3
+	assert the loot seed of {_pig} is 3 with "decimal entity loot seed set failed"
+	set loot seed of {_pig} to 3.999
+	assert the loot seed of {_pig} is 3 with "close entity decimal loot seed set failed"
+	set loot seed of {_pig} to NaN value
+	assert the loot seed of {_pig} is 0 with "NaN value entity loot seed set failed"
+	set loot seed of {_pig} to infinity value
+	assert the loot seed of {_pig} is 9223372036854775807 with "infinity value entity loot seed set failed"
+
+	delete entity within {_pig}
+
+	set {_pastBlock} to block data of test-block
+
+	set test-block to chest
+
+	assert the loot seed of test-block is 0 with "default block loot seed before setting loot table failed"
+
+	set loot table of test-block to loot table "minecraft:chests/simple_dungeon"
+
+	assert the loot seed of test-block is 0 with "default block loot after setting loot table seed failed"
+	set loot seed of test-block to 5
+	assert the loot seed of test-block is 5 with "simple block loot seed set failed"
+	set loot seed of test-block to -1
+	assert the loot seed of test-block is -1 with "negative block loot seed set failed"
+	set loot seed of test-block to 2
+	assert the loot seed of test-block is 2 with "existing block loot seed set failed"
+	set loot seed of test-block to 3.3
+	assert the loot seed of test-block is 3 with "decimal block loot seed set failed"
+	set loot seed of test-block to 3.999
+	assert the loot seed of test-block is 3 with "close block decimal loot seed set failed"
+	set loot seed of test-block to NaN value
+	assert the loot seed of test-block is 0 with "NaN value block loot seed set failed"
+	set loot seed of test-block to infinity value
+	assert the loot seed of test-block is 9223372036854775807 with "infinity value block loot seed set failed"
+
+	set test-block to {_pastBlock}
diff --git a/src/test/skript/tests/syntaxes/expressions/ExprLoveTime.sk b/src/test/skript/tests/syntaxes/expressions/ExprLoveTime.sk
new file mode 100644
index 00000000000..3e02d51377b
--- /dev/null
+++ b/src/test/skript/tests/syntaxes/expressions/ExprLoveTime.sk
@@ -0,0 +1,19 @@
+test "love time":
+	spawn pig at spawn of world "world"
+	set {_pig} to last spawned pig
+
+	assert love time of {_pig} is 0 seconds with "love time wasn't 0 seconds by default"
+
+	set love time of {_pig} to 10 seconds
+	assert love time of {_pig} is 10 seconds with "love time wasn't set to 10 seconds"
+
+	add 10 seconds to love time of {_pig}
+	assert love time of {_pig} is 20 seconds with "love time wasn't increased by 10 seconds"
+
+	remove 1 minute from love time of {_pig}
+	assert love time of {_pig} is 0 seconds with "love time wasn't decreased by 1 minute"
+
+	reset love time of {_pig}
+	assert love time of {_pig} is 0 seconds with "love time wasn't reset"
+
+	delete all pigs
diff --git a/src/test/skript/tests/syntaxes/expressions/ExprLowestHighestSolidBlock.sk b/src/test/skript/tests/syntaxes/expressions/ExprLowestHighestSolidBlock.sk
index b0f90139f50..2c1ab3fa0d9 100644
--- a/src/test/skript/tests/syntaxes/expressions/ExprLowestHighestSolidBlock.sk
+++ b/src/test/skript/tests/syntaxes/expressions/ExprLowestHighestSolidBlock.sk
@@ -1,34 +1,4 @@
-test "lowest/highest solid block (old height)" when running below minecraft "1.18":
-
-	# highest solid block
-	set {_oldBlock::1} to block data of block at location(0.5, 255.5, 0.5, "world")
-	set {_oldBlock::2} to block data of block at location(0.5, 254.5, 0.5, "world")
-	set {_oldBlock::3} to block data of block at location(0.5, 253.5, 0.5, "world")
-	set block at location(0.5, 255.5, 0.5, "world") to air
-	set block at location(0.5, 254.5, 0.5, "world") to air
-	set block at location(0.5, 253.5, 0.5, "world") to dirt
-	set {_highest} to highest solid block at location(0.5, 64, 0.5, "world")
-	assert type of {_highest} is dirt with "highest block is not dirt (got '%type of {_highest}%')"
-	assert location of {_highest} is location(0.5, 253.5, 0.5, "world") with "highest block is not at 0.5,253.5,0.5 (got '%location of {_highest}%')"
-	set block at location(0.5, 255.5, 0.5, "world") to {_oldBlock::1}
-	set block at location(0.5, 254.5, 0.5, "world") to {_oldBlock::2}
-	set block at location(0.5, 253.5, 0.5, "world") to {_oldBlock::3}
-
-	# lowest solid block
-	set {_oldBlock::1} to block data of block at location(0.5, 0.5, 0.5, "world")
-	set {_oldBlock::2} to block data of block at location(0.5, 1.5, 0.5, "world")
-	set {_oldBlock::3} to block data of block at location(0.5, 2.5, 0.5, "world")
-	set block at location(0.5, 0.5, 0.5, "world") to air
-	set block at location(0.5, 1.5, 0.5, "world") to air
-	set block at location(0.5, 2.5, 0.5, "world") to dirt
-	set {_lowest} to lowest solid block at location(0.5, 64, 0.5, "world")
-	assert type of {_lowest} is dirt with "lowest block is not dirt (got '%type of {_lowest}%')"
-	assert location of {_lowest} is location(0.5, 2.5, 0.5, "world") with "lowest block is not at 0.5,2.5,0.5 (got '%location of {_lowest}%')"
-	set block at location(0.5, 0.5, 0.5, "world") to {_oldBlock::1}
-	set block at location(0.5, 1.5, 0.5, "world") to {_oldBlock::2}
-	set block at location(0.5, 2.5, 0.5, "world") to {_oldBlock::3}
-
-test "lowest/highest solid block (new height)" when running minecraft "1.18":
+test "lowest/highest solid block":
 
 	# highest solid block
 	set {_oldBlock::1} to block data of block at location(0.5, 319.5, 0.5, "world")
diff --git a/src/test/skript/tests/syntaxes/expressions/ExprMaxPlayers.sk b/src/test/skript/tests/syntaxes/expressions/ExprMaxPlayers.sk
index d019eeccdd9..3f5c3c3d801 100644
--- a/src/test/skript/tests/syntaxes/expressions/ExprMaxPlayers.sk
+++ b/src/test/skript/tests/syntaxes/expressions/ExprMaxPlayers.sk
@@ -1,4 +1,4 @@
-test "max players" when running minecraft "1.16.5":
+test "max players":
 	set real max players count to 5
 	assert real max players count is 5 with "setting max players failed"
 	add 3 to real max players
diff --git a/src/test/skript/tests/syntaxes/expressions/ExprMaxStack.sk b/src/test/skript/tests/syntaxes/expressions/ExprMaxStack.sk
index 73694e0d5c2..5f793ebd951 100644
--- a/src/test/skript/tests/syntaxes/expressions/ExprMaxStack.sk
+++ b/src/test/skript/tests/syntaxes/expressions/ExprMaxStack.sk
@@ -1,4 +1,68 @@
-test "max stack":
+aliases:
+	test any log = oak log, spruce log, dark oak log
+	test any wool = white wool, red wool, black wool
+
+test "max stack - itemtype":
 	assert max stack size of diamond sword is 1 with "diamond sword max stack size failed"
 	assert max stack size of bucket is 16 with "bucket max stack size failed"
 	assert max stack size of dirt is 64 with "dirt max stack size failed"
+
+	# edge case
+	assert max stack size of {_null} is not set with "max stack size of non itemtype expected to fail ##1"
+	assert max stack size of {_null} is 0 to fail with "max stack size of non itemtype expected to fail ##2"
+	assert max stack size of diamond and diamond sword is 64 and 1 with "max stack size of itemtypes 'and' case failed"
+	assert max stack size of diamond or diamond sword is 64 or 1 with "max stack size of itemtypes 'or' case failed"
+	loop (test any log) and (test any wool):
+		assert max stack size of loop-value is 64 with "max stack size of category itemtypes (%loop-value%) failed"
+
+test "max stack override - itemtype" when running minecraft "1.20.5":
+	set {_item} to diamond
+	set max stack size of {_item} to 32
+	assert max stack size of {_item} is 32 with "diamond should have max stack size of 32"
+	add 2 to max stack size of {_item}
+	assert max stack size of {_item} is 34 with "diamond should have max stack size of 34"
+	remove 4 from max stack size of {_item}
+	assert max stack size of {_item} is 30 with "diamond should have max stack size of 30"
+	reset max stack size of {_item}
+	assert max stack size of {_item} is 64 with "diamond should have max stack size of 64"
+
+	set {_item} to bucket
+	set max stack size of {_item} to 24
+	assert max stack size of {_item} is 24 with "bucket should have max stack size of 24"
+	add 2 to max stack size of {_item}
+	assert max stack size of {_item} is 26 with "bucket should have max stack size of 26"
+	remove 4 from max stack size of {_item}
+	assert max stack size of {_item} is 22 with "bucket should have max stack size of 22"
+	reset max stack size of {_item}
+	assert max stack size of {_item} is 16 with "bucket should have max stack size of 16"
+
+	set {_item} to diamond sword
+	set max stack size of {_item} to 16
+	assert max stack size of {_item} is 16 with "diamond sword should have max stack size of 16"
+	add 2 to max stack size of {_item}
+	assert max stack size of {_item} is 18 with "diamond sword should have max stack size of 18"
+	remove 4 from max stack size of {_item}
+	assert max stack size of {_item} is 14 with "diamond sword should have max stack size of 14"
+	reset max stack size of {_item}
+	assert max stack size of {_item} is 1 with "diamond sword should have max stack size of 1"
+
+	# edge case
+	loop (test any log) and (test any wool):
+		set {_edge} to loop-value
+		set max stack size of {_edge} to 1
+		assert max stack size of {_edge} is 1 with "max stack size override of category itemtypes (%{_edge}%) failed"
+
+test "max stack override - inventory":
+	set {_default} to 99 # 1.20.5 and newer
+	if running below minecraft "1.20.5":
+		set {_default} to 64
+	set {_inv} to a new chest inventory with 1 rows
+	assert max stack size of {_inv} is {_default} with "inventory should have max stack size of %{_default}%"
+	set max stack size of {_inv} to 32
+	assert max stack size of {_inv} is 32 with "inventory should have max stack size of 32"
+	add 2 to max stack size of {_inv}
+	assert max stack size of {_inv} is 34 with "inventory should have max stack size of 34"
+	remove 4 from max stack size of {_inv}
+	assert max stack size of {_inv} is 30 with "inventory should have max stack size of 30"
+	reset max stack size of {_inv}
+	assert max stack size of {_inv} is {_default} with "inventory should have factory max stack size of %{_default}%"
diff --git a/src/test/skript/tests/syntaxes/expressions/ExprMetadata.sk b/src/test/skript/tests/syntaxes/expressions/ExprMetadata.sk
new file mode 100644
index 00000000000..20b052899c2
--- /dev/null
+++ b/src/test/skript/tests/syntaxes/expressions/ExprMetadata.sk
@@ -0,0 +1,24 @@
+test "metadata value":
+	spawn armor stand at spawn of "world":
+		set metadata "number" of entity to 10
+		assert metadata "number" of entity is 10 with "didn't set metadata value"
+
+		add 5 to metadata "number" of entity
+		assert metadata "number" of entity is 15 with "didn't add to metadata value"
+
+		remove 3 from metadata "number" of entity
+		assert metadata "number" of entity is 12 with "didn't remove from metadata value"
+
+		add "not a number" to metadata "number" of entity
+		assert metadata "number" of entity is 12 with "added incompatible type to metadata"
+
+		remove "not a number" from metadata "number" of entity
+		assert metadata "number" of entity is 12 with "removed incompatible type from metadata"
+
+		add vector(1, 0, 1) to metadata "vector" of entity
+		assert metadata "vector" of entity is vector(1, 0, 1) with "didn't add to unset metadata value"
+
+		delete metadata "number" and "vector" of entity
+		assert metadata "number" and "vector" of entity are not set with "didn't delete metadata value"
+
+		delete entity
diff --git a/src/test/skript/tests/syntaxes/expressions/ExprName.sk b/src/test/skript/tests/syntaxes/expressions/ExprName.sk
new file mode 100644
index 00000000000..f6969161e07
--- /dev/null
+++ b/src/test/skript/tests/syntaxes/expressions/ExprName.sk
@@ -0,0 +1,87 @@
+test "name of world":
+	set {_thing} to the world "world"
+	assert name of {_thing} is "world" with "name was wrong"
+	set the name of {_thing} to "blob"
+	assert name of {_thing} is "world" with "world name changed"
+
+	# silly test for plural any-named
+	set {_things::*} to the world "world", the world "world" and the world "world"
+
+	set {_blah::*} to the names of {_things::*}
+	assert {_blah::*} is "world", "world" and "world" with "names were wrong"
+	delete {_blah::*}
+	set {_blah::*} to the name of {_things::*}
+	assert {_blah::*} is "world", "world" and "world" with "names were wrong"
+
+test "name of entity":
+	set {_before} to 5
+	spawn a pig at spawn of "world":
+		assert event-entity is a pig with "entity not a pig"
+		set {_test} to event-entity
+		set event-entity's name to "foo"
+		assert {_test} is set with "entity not set"
+		assert {_test} is a pig with "entity variable not a pig"
+		assert event-entity's name is "foo" with "name didn't change"
+	assert {_test} exists with "entity didn't carry out"
+	assert {_test}'s name is "foo" with "name didn't carry out"
+	set {_test}'s name to "bar"
+	assert {_test}'s name is "bar" with "name didn't change"
+	delete the last spawned pig
+
+test "name of item":
+	set {_thing} to 3 of stone
+	assert name of {_thing} does not exist with "name was set"
+	set the name of {_thing} to "blob"
+	assert name of {_thing} is "blob" with "item name didn't change"
+
+using script reflection
+
+test "config name (new)":
+	set {_node} to the skript config
+	set {_node} to node "language" of {_node}
+	assert name of {_node} is "language" with "config node name was wrong"
+
+	# node in node
+	set {_node} to the skript config
+	set {_node} to node "disable hooks.vault" of {_node}
+	assert name of {_node} is "vault" with "config node name was wrong"
+	assert "%{_node}%" is "disable hooks.vault" with "config node path was wrong"
+
+test "node name (new)":
+	set {_node} to the current script
+	set {_node} to the first element of nodes of {_node}
+	assert name of {_node} is "test ""name of world""" with "first node name was wrong"
+
+	set {_node} to the current script
+	set {_node} to the 4th element of nodes of {_node} # Obviously, this changes if this file changes
+	assert name of {_node} is "using script reflection" with "4th node name was wrong"
+
+	# root node
+	set {_node} to the skript config
+	set {_node} to node "language" of {_node}
+	assert name of {_node} is "language" with "config node name was wrong"
+
+	# node in node
+	set {_node} to the skript config
+	set {_node} to node "disable hooks.vault" of {_node}
+	assert name of {_node} is "vault" with "config node name was wrong"
+	assert "%{_node}%" is "disable hooks.vault" with "config node path was wrong"
+
+test "script name (new)":
+	set {_name} to the script's name
+	assert {_name} is "ExprName" with "script name is wrong"
+	# New behaviour includes just the name, since path is available by string-ifying the script
+
+test "function name (new)":
+	set {_function} to the function named "testExprName"
+	set {_name} to {_function}'s name
+	assert {_name} is "testExprName" with "function name is wrong"
+
+	# we want to make sure any brackets don't somehow get included
+	set {_function} to the function named "testExprName()"
+	set {_name} to {_function}'s name
+	assert {_name} is "testExprName" with "function name is wrong"
+
+local function testExprName():
+	# do nothing
+	stop
diff --git a/src/test/skript/tests/syntaxes/expressions/ExprNearestEntity.sk b/src/test/skript/tests/syntaxes/expressions/ExprNearestEntity.sk
index 529a8f5a699..843dcf7a8ae 100644
--- a/src/test/skript/tests/syntaxes/expressions/ExprNearestEntity.sk
+++ b/src/test/skript/tests/syntaxes/expressions/ExprNearestEntity.sk
@@ -4,7 +4,7 @@ test "nearest entity does not allow duplicate entities":
 # server doesn't spawn the entities until the next tick, and we can't wait in the test system so... commented for now
 #test "nearest entity":
 #	delete all entities
-#	spawn a cow at spawn of world "world"
+#	spawn a cow at test-location
 #	set {_cow} to last spawned cow
 #	spawn a creeper 10 blocks to the left of {_cow}
 #	set {_close creeper} to last spawned creeper
diff --git a/src/test/skript/tests/syntaxes/expressions/ExprNewBannerPattern.sk b/src/test/skript/tests/syntaxes/expressions/ExprNewBannerPattern.sk
new file mode 100644
index 00000000000..30b065ef6ef
--- /dev/null
+++ b/src/test/skript/tests/syntaxes/expressions/ExprNewBannerPattern.sk
@@ -0,0 +1,38 @@
+test "new banner pattern":
+	set {_pattern} to a creeper banner pattern colored red
+	# Will fail due to the "banner pattern" item alias in skript-aliases
+	# assert {_pattern} is a banner pattern with "New banner pattern is not a banner pattern type"
+	set {_item} to a white banner
+	add {_pattern} to the banner patterns of {_item}
+	assert the banner patterns of {_item} contains {_pattern} with "Banner pattern not applied to item"
+	remove {_pattern} from the banner patterns of {_item}
+	assert the banner patterns of {_item} does not contain {_pattern} with "Banner pattern was not removed from item"
+	set the 1st banner pattern of {_item} to {_pattern}
+	assert the 1st banner pattern of {_item} is {_pattern} with "Banner pattern not applied to 1st banner pattern of item"
+	clear the 1st banner pattern of {_item}
+	assert the 1st banner pattern of {_item} is not set with "1st banner pattern of item was not cleared"
+
+	set {_old} to block at test-location
+	set block at test-location to a red banner
+	assert the block at test-location is a red banner with "Banner block was not set"
+	add {_pattern} to the banner patterns of (block at test-location)
+	assert the banner patterns of (block at test-location) contains {_pattern} with "Banner pattern not applied to block"
+	remove {_pattern} from the banner patterns of (block at test-location)
+	assert the banner patterns of (block at test-location) does not contain {_pattern} with "Banner pattern was not removed from block"
+	set the 1st banner pattern of (block at test-location) to {_pattern}
+	assert the 1st banner pattern of (block at test-location) is {_pattern} with "Banner pattern not applied to 1st banner pattern of block"
+	clear the 1st banner pattern of (block at test-location)
+	assert the 1st banner pattern of (block at test-location) is not set with "1st banner pattern of block was not cleared"
+	set block at test-location to {_old}
+
+test "invalid banner usage":
+	set {_pattern} to a border banner pattern colored gray
+	set {_item} to a diamond chestplate
+	set the banner patterns of {_item} to {_pattern}
+	assert the banner patterns of {_item} is not set with "Non-Banner item should not have banner patterns"
+
+	set the block at test-location to air
+	set the banner patterns of block at test-location to {_pattern}
+	assert the banner patterns of block at test-location is not set with "Non-Banner block should not have banner patterns"
+
+	assert a creeper banner pattern colored rgb(255, 0, 0) is not set with "RGB colors should not return a banner pattern"
diff --git a/src/test/skript/tests/syntaxes/expressions/ExprNode.sk b/src/test/skript/tests/syntaxes/expressions/ExprNode.sk
new file mode 100644
index 00000000000..09416d0eb90
--- /dev/null
+++ b/src/test/skript/tests/syntaxes/expressions/ExprNode.sk
@@ -0,0 +1,24 @@
+using script reflection
+
+test "node of":
+	set {_node} to the current script
+	set {_node} to the first element of nodes of {_node}
+	assert name of {_node} is "using script reflection" with "first node name was wrong"
+	assert "%{_node}%" is "using script reflection" with "first node name was wrong"
+	assert size of (nodes of {_node}) is 0 with "simple node wasn't empty: %nodes of {_node}%"
+
+	set {_node} to the current script
+	set {_node} to node "test ""node of""" of {_node} # this :)
+	assert size of (nodes of {_node}) is greater than 0 with "section node was empty"
+
+	# root node
+	set {_node} to the skript config
+	set {_node} to node "language" in {_node}
+	assert name of {_node} is "language" with "config node name was wrong"
+	assert text value of {_node} is "english" with "config is in wrong language"
+
+	# node in node
+	set {_node} to the skript config
+	set {_node} to node "disable hooks.vault" in {_node}
+	assert text value of {_node} is "false" with "wrong node text value"
+	assert boolean value of {_node} is false with "wrong node boolean value"
diff --git a/src/test/skript/tests/syntaxes/expressions/ExprNodeValue.sk b/src/test/skript/tests/syntaxes/expressions/ExprNodeValue.sk
new file mode 100644
index 00000000000..17bd960b0e9
--- /dev/null
+++ b/src/test/skript/tests/syntaxes/expressions/ExprNodeValue.sk
@@ -0,0 +1,30 @@
+using script reflection
+
+test "node of":
+	set {_node} to the current script
+	set {_node} to the first element of nodes of {_node}
+	assert text value of {_node} does not exist with "simple node had value?"
+
+	set {_node} to the current script
+	set {_node} to node "test ""node of""" of {_node} # this :)
+	assert size of (nodes of {_node}) is greater than 0 with "section node was empty"
+
+	# root node
+	set {_node} to the skript config
+	set {_node} to node "language" in {_node}
+	assert name of {_node} is "language" with "config node name was wrong"
+	assert text value of {_node} is "english" with "config is in wrong language"
+
+	# node in node
+	set {_node} to the skript config
+	set {_node} to node "disable hooks.vault" in {_node}
+	assert text value of {_node} is "false" with "wrong node text value"
+	assert boolean value of {_node} is false with "wrong node boolean value"
+
+	# weird type node
+	set {_node} to node "update check interval" in the skript config
+	assert text value of {_node} is "12 hours" with "wrong node text value"
+	set {_time} to {_node}'s timespan value
+	assert {_time} is 12 hours with "wrong node timespan value"
+	assert {_time} is greater than 11 hours with "wrong node timespan value"
+	assert {_time} is less than 13 hours with "wrong node timespan value"
diff --git a/src/test/skript/tests/syntaxes/expressions/ExprPortalCooldown.sk b/src/test/skript/tests/syntaxes/expressions/ExprPortalCooldown.sk
index 36b95564dc7..be72d1a15d8 100644
--- a/src/test/skript/tests/syntaxes/expressions/ExprPortalCooldown.sk
+++ b/src/test/skript/tests/syntaxes/expressions/ExprPortalCooldown.sk
@@ -1,5 +1,5 @@
 test "portal cooldown":
-	spawn zombie at spawn of world "world":
+	spawn zombie at test-location:
 		assert event-entity's portal cooldown is 0 seconds with "entity spawned with a portal cooldown"
 		set event-entity's portal cooldown to 25 ticks
 		assert event-entity's portal cooldown is 25 ticks with "portal cooldown set failed"
diff --git a/src/test/skript/tests/syntaxes/expressions/ExprPotionEffects.sk b/src/test/skript/tests/syntaxes/expressions/ExprPotionEffects.sk
index a582ef4e7ae..e322c7e32ee 100644
--- a/src/test/skript/tests/syntaxes/expressions/ExprPotionEffects.sk
+++ b/src/test/skript/tests/syntaxes/expressions/ExprPotionEffects.sk
@@ -1,5 +1,5 @@
 test "potion effects":
-	set {_l} to location of spawn of world "world"
+	set {_l} to test-location
 	spawn a sheep at {_l}
 	set {_e} to last spawned sheep
 
diff --git a/src/test/skript/tests/syntaxes/expressions/ExprQuaternionAxisAngle.sk b/src/test/skript/tests/syntaxes/expressions/ExprQuaternionAxisAngle.sk
new file mode 100644
index 00000000000..4696a8ddedb
--- /dev/null
+++ b/src/test/skript/tests/syntaxes/expressions/ExprQuaternionAxisAngle.sk
@@ -0,0 +1,19 @@
+test "quaternion axis angle":
+	set {_v} to vector(1, 2, 3)
+	set {_q} to axisAngle(45, {_v})
+	assert rotation angle of {_q} is 45 with "angle of quaternion failed"
+	assert rotation axis of {_q} is {_v} with "axis of quaternion failed"
+
+	set rotation angle of {_q} to 135
+	assert rotation angle of {_q} is 135 with "changing angle of quaternion failed"
+	assert rotation axis of {_q} is {_v} with "changing angle of quaternion modified axis"
+
+	set rotation axis of {_q} to vector(0, 10, 0)
+	assert rotation angle of {_q} is 135 with "changing axis of quaternion failed modified angle"
+	assert rotation axis of {_q} is vector(0, 10, 0) with "changing axis of quaternion failed"
+
+
+	set {_q} to quaternion(1, 0, 0, 0)
+
+	assert rotation angle of {_q} is 0 with "angle of identity quaternion failed"
+	assert rotation axis of {_q} is vector(0,0,1) with "axis of identity quaternion failed"
diff --git a/src/test/skript/tests/syntaxes/expressions/ExprQueue.sk b/src/test/skript/tests/syntaxes/expressions/ExprQueue.sk
new file mode 100644
index 00000000000..435fa38b56d
--- /dev/null
+++ b/src/test/skript/tests/syntaxes/expressions/ExprQueue.sk
@@ -0,0 +1,83 @@
+using queues
+
+test "queue creation":
+	set {_queue} to a queue
+	assert {_queue} exists with "queue was not created"
+
+	delete {_queue}
+	set {_queue} to a queue of "hello" and "there"
+	assert {_queue} exists with "queue was not created"
+
+test "queue polling behaviour":
+	set {_queue} to a queue of "hello" and "there"
+
+	set {_word} to the first element in {_queue}
+	assert {_word} is "hello" with "element not polled"
+
+	set {_word} to the first element in {_queue}
+	assert {_word} is "there" with "element not polled"
+
+	set {_queue} to a queue of "hello" and "there"
+
+	set {_word} to the last element in {_queue}
+	assert {_word} is "there" with "element not polled"
+	set {_word} to the first element in {_queue}
+	assert {_word} is "hello" with "element not polled"
+
+	assert {_queue} is empty with "queue was not empty"
+
+test "queue start/end":
+	set {_queue} to a queue of "hello" and "there"
+
+	set {_word} to the start of {_queue}
+	assert {_word} is "hello" with "element not found"
+
+	delete {_word}
+	set {_word} to the start of {_queue} # shouldn't remove
+	assert {_word} is "hello" with "element not found"
+
+	add "foo" to the start of {_queue}
+
+	set {_words::*} to the last 3 elements in {_queue}
+	assert {_words::*} are "foo", "hello" and "there" with "elements not polled"
+
+	assert {_queue} is empty with "queue was not empty"
+
+test "queue emptiness":
+	set {_queue} to a queue
+	assert {_queue} is empty with "queue was not empty"
+
+	set {_queue} to a queue of "hello" and "there"
+	assert {_queue} is not empty with "queue was empty"
+
+	set {_queue} to a queue
+	add "hello" to {_queue}
+	assert {_queue} is not empty with "queue was empty"
+	set {_var} to the first element in {_queue}
+	assert {_queue} is empty with "queue was not empty"
+
+test "dequeue queue":
+
+	set {_queue} to a queue of "hello" and "there"
+	assert {_queue} is not empty with "queue was empty"
+
+	set {_words::*} to dequeued {_queue}
+	assert {_words::*} are "hello" and "there" with "elements not dequeued"
+	delete {_words::*}
+
+	set {_words::*} to the first 2 elements in {_queue}
+	assert {_words::*} are "hello" and "there" with "elements not polled"
+
+	assert {_queue} is empty with "queue was not empty"
+
+using for loops
+test "loop queue":
+	set {_queue} to a queue of "hello" and "there"
+	set {_count} to 0
+
+	for each {_word} in {_queue}:
+		add 1 to {_count}
+		if {_count} is less than 10:
+			add {_word} to {_queue}
+
+	assert {_count} is 11
diff --git a/src/test/skript/tests/syntaxes/expressions/ExprRandomNumber.sk b/src/test/skript/tests/syntaxes/expressions/ExprRandomNumber.sk
new file mode 100644
index 00000000000..45ad642b288
--- /dev/null
+++ b/src/test/skript/tests/syntaxes/expressions/ExprRandomNumber.sk
@@ -0,0 +1,72 @@
+test "random numbers":
+	loop 1000 times:
+		set {_num} to random number between 1 and 2.5
+		assert {_num} is set with "(1) failed to generate random number: %{_num}%"
+		assert {_num} is between 1 and 2.5 with "(1) random number outside bounds: %{_num}%"
+
+		set {_int} to random integer between 1 and 2.5
+		assert {_int} is set with "(2) failed to generate random int: %{_int}%"
+		assert {_int} is between 1 and 2.5 with "(2) random int outside bounds: %{_int}%"
+		assert {_int} is 1 or 2 with "(2) random int generated an invalid result: %{_int}%"
+
+		# negatives
+		set {_num} to random number between 1 and -2.5
+		assert {_num} is set with "(3) failed to generate random number: %{_num}%"
+		assert {_num} is between 1 and -2.5 with "(3) random number outside bounds: %{_num}%"
+
+		set {_int} to random integer between 1 and -2.5
+		assert {_int} is set with "(4) failed to generate random int: %{_int}%"
+		assert {_int} is between 1 and -2.5 with "(4) random int outside bounds: %{_int}%"
+		assert {_int} is 1 or 0 or -1 or -2 with "(4) random int generated an invalid result: %{_int}%"
+
+		# multiple values
+		set {_nums::*} to 3 random numbers between 1 and -2.5
+		assert {_nums::*} is set with "(5) failed to generate random number: %{_nums::*}%"
+		assert size of {_nums::*} is 3 with "(6) random numbers generated the wrong amount of results: %size of {_nums::*}% != 3"
+		assert {_nums::*} is between 1 and -2.5 with "(5) random number outside bounds: %{_nums::*}%"
+
+		set {_ints::*} to 3 random integers between 1 and -2.5
+		assert {_ints::*} is set with "(6) failed to generate random int: %{_ints::*}%"
+		assert size of {_ints::*} is 3 with "(6) random ints generated the wrong amount of results: %size of {_ints::*}% != 3"
+		assert {_ints::*} are between 1 and -2.5 with "(6) random int outside bounds: %{_ints::*}%"
+		assert {_ints::*} are 1 or 0 or -1 or -2 with "(6) random int generated an invalid result: %{_ints::*}%"
+
+		# null checks
+		set {_num} to random number between {_null} and 1
+		assert {_num} is not set with "(7) random number with null bound returned non-null result: %{_num}%"
+		set {_num} to random number between 0 and {_null}
+		assert {_num} is not set with "(8) random number with null bound returned non-null result: %{_num}%"
+		set {_num::*} to {_null} random numbers between 0 and 10
+		assert {_num::*} is not set with "(9) random number with null amount returned non-null result: %{_num::*}%"
+
+		set {_int} to random integer between {_null} and 1
+		assert {_int} is not set with "(10) random integer with null bound returned non-null result: %{_int}%"
+		set {_int} to random integer between 0 and {_null}
+		assert {_int} is not set with "(11) random integer with null bound returned non-null result: %{_int}%"
+		set {_int::*} to {_null} random integers between 0 and 10
+		assert {_int::*} is not set with "(12) random integer with null bound returned non-null result: %{_int::*}%"
+
+		# edge cases
+		set {_num} to random number between 0 and 0
+		assert {_num} is 0 with "(13) random number between 0 and 0 returned non-zero result: %{_num}%"
+		set {_int} to random integer between 0 and 0
+		assert {_int} is 0 with "(14) random integer between 0 and 0 returned non-zero result: %{_int}%"
+
+		set {_int} to random integer between 0.5 and 0.6
+		assert {_int} is not set with "(15) random integer between 0.5 and 0.6 returned non-null result: %{_int}%"
+
+		set {_int::*} to -10 random integers between 1 and 10
+		assert {_int::*} is not set with "(16) -10 random integers returned non-null result: %{_int::*}%"
+
+		# NaN/infinity
+		set {_int} to random integer between 10 and NaN value
+		assert {_int} is not set with "(17) random integer between 10 and NaN value returned non-null result: %{_int}%"
+
+		set {_int} to random integer between 10 and infinity value
+		assert {_int} is not set with "(18) random integer between 10 and infinity value returned non-null result: %{_int}%"
+
+		set {_int} to random integer between 10 and -infinity value
+		assert {_int} is not set with "(19) random integer between 10 and -infinity value returned non-null result: %{_int}%"
+
+		set {_int::*} to NaN value random integers between 1 and 10
+		assert {_int::*} is not set with "(20) NaN value random integers returned non-null result: %{_int}%"
diff --git a/src/test/skript/tests/syntaxes/expressions/ExprRemainingAir.sk b/src/test/skript/tests/syntaxes/expressions/ExprRemainingAir.sk
index 3f9f5041db7..d927067ed14 100644
--- a/src/test/skript/tests/syntaxes/expressions/ExprRemainingAir.sk
+++ b/src/test/skript/tests/syntaxes/expressions/ExprRemainingAir.sk
@@ -1,6 +1,6 @@
 test "remaining air":
 
-	spawn a pig at location of spawn of world "world":
+	spawn a pig at test-location:
 		set {_e} to event-entity
 
 	reset remaining air of {_e}
diff --git a/src/test/skript/tests/syntaxes/expressions/ExprResult.sk b/src/test/skript/tests/syntaxes/expressions/ExprResult.sk
new file mode 100644
index 00000000000..8eb8ad6ca8a
--- /dev/null
+++ b/src/test/skript/tests/syntaxes/expressions/ExprResult.sk
@@ -0,0 +1,57 @@
+options:
+	path: "../../../../../../src/test/skript/tests/syntaxes/expressions/"
+	misc: "../../../../../../src/test/skript/tests/misc/"
+
+	# Princess test script is in another castle, Mario!
+	# paths are relativised to the /scripts/ directory
+	# but we are loading these scripts from the test folder :(
+
+using script reflection
+
+function testExprResult0() :: boolean:
+	return true
+
+local function testExprResult1() :: boolean:
+	return true
+
+test "result of functions":
+	set {_function} to function "testExprResult0()"
+	set {_result} to result of {_function}
+	assert {_result} exists with "function didn't run"
+	assert {_result} is true with "function didn't return correctly"
+	delete {_result}
+
+	set {_function} to function "testExprResult1()"
+	set {_result} to result of {_function}
+	assert {_result} exists with "function didn't run"
+	assert {_result} is true with "function didn't return correctly"
+	delete {_result}
+
+test "result of external functions":
+	set {_script} to the script named {@misc} + "dummy.sk"
+	set {_function} to function "testDummy()" from {_script}
+	assert {_function} exists with "function wasn't found"
+	set {_result} to result of {_function}
+	assert {_result} exists with "function didn't run"
+	assert {_result} is true with "function didn't return correctly"
+	delete {_result}
+
+	set {_script} to the script named {@path} + "ExprFunction.sk"
+
+	set {_function} to function "testExprFunction1()" from {_script}
+	assert {_function} exists with "function wasn't found"
+	set {_result} to result of {_function}
+	assert {_result} exists with "function didn't run"
+	assert {_result} is true with "function didn't return correctly"
+	delete {_result}
+
+	set {_function} to function "testExprFunction2()" from {_script}
+	assert {_function} exists with "function wasn't found"
+	set {_result} to result of {_function} with arguments "hello" and 0
+	assert {_result} exists with "function didn't run"
+	assert {_result} is false with "function didn't return correctly"
+	set {_result} to result of {_function} with arguments "hello" and 3
+	assert {_result} is false with "function didn't return correctly"
+	set {_result} to result of {_function} with arguments "hello" and 5
+	assert {_result} is true with "function didn't return correctly"
+	delete {_result}
diff --git a/src/test/skript/tests/syntaxes/expressions/ExprRotate.sk b/src/test/skript/tests/syntaxes/expressions/ExprRotate.sk
new file mode 100644
index 00000000000..14271ae9a8c
--- /dev/null
+++ b/src/test/skript/tests/syntaxes/expressions/ExprRotate.sk
@@ -0,0 +1,51 @@
+test "rotate around global axis":
+	set {_v::1} to quaternion(1, 0, 0, 0)
+
+	set {_v::*} to {_v::*} rotated around y axis by 90 degrees
+	assert {_v::1} is quaternion(0.7071067690849304, 0, 0.7071067690849304, 0) with "rotate quaternion around y axis failed"
+
+	set {_v::*} to {_v::*} rotated around x axis by -90 degrees
+	assert {_v::1} is quaternion(0.4999999701976776, -0.4999999701976776, 0.4999999701976776, -0.4999999701976776) with "rotate quaternion around x axis failed"
+
+	set {_v::*} to {_v::*} rotated around z axis by -90 degrees
+	assert {_v::1} is quaternion(0, 0, 0.7071067094802856, -0.7071067094802856) with "rotate quaternion around z axis failed"
+
+test "rotate around local axis":
+	set {_v::1} to quaternion(1, 0, 0, 0)
+
+	set {_v::*} to {_v::*} rotated around local y axis by 90 degrees
+	assert {_v::1} is quaternion(0.7071067690849304, 0, 0.7071067690849304, 0) with "rotate quaternion around local y axis failed"
+
+	set {_v::*} to {_v::*} rotated around local x axis by 90 degrees
+	assert {_v::1} is quaternion(0.4999999701976776, 0.4999999701976776, 0.4999999701976776, -0.4999999701976776) with "rotate quaternion around local x axis failed"
+
+	set {_v::*} to {_v::*} rotated around local z axis by 90 degrees
+	assert {_v::1} is quaternion(0.7071067094802856, 0.7071067094802856, 0, 0) with "rotate quaternion around local z axis failed"
+
+test "vector rotate around vector":
+	set {_x} to vector(1, 0, 0)
+	set {_y} to vector(0, 1, 0)
+	set {_z} to vector(0, 0, 1)
+
+	set {_v} to {_x}
+	set {_v} to {_v} rotated around {_y} by -90 degrees
+	assert {_v} is {_z} with "rotate around y vector failed"
+
+	set {_v} to {_v} rotated around {_x} by -90 degrees
+	assert {_v} is {_y} with "rotate around x vector failed"
+
+	set {_v} to {_v} rotated around {_z} by -90 degrees
+	assert {_v} is {_x} with "rotate around z vector failed"
+
+	set {_v} to {_v} rotated around vector(1, 1, 1) by 180 degrees
+	assert {_v} is vector(-1/3, 2/3, 2/3) with "rotate around non-orthogonal vector failed"
+
+	set {_v} to vector(2, 0, 0)
+	set {_v} to {_v} rotated around vector(0, 10, 0) by 90 degrees
+	assert {_v} is vector(0, 0, -2) with "rotate around non-unit vector failed"
+
+
+test "quaternion rotate by ZYX rotation":
+	set {_q} to quaternion(1,0,0,0)
+	set {_q} to {_q} rotated by x 90, y 90, z 90
+	assert {_q} is quaternion(0.7071067094802856, 0, 0.7071067094802856, 0) with "failed to rotate quaternion by ZYX"
diff --git a/src/test/skript/tests/syntaxes/expressions/ExprScript.sk b/src/test/skript/tests/syntaxes/expressions/ExprScript.sk
new file mode 100644
index 00000000000..d21537de6f3
--- /dev/null
+++ b/src/test/skript/tests/syntaxes/expressions/ExprScript.sk
@@ -0,0 +1,51 @@
+options:
+	path: (join ("..", "..", "..", "..", "..", "..", "src", "test", "skript", "tests", "syntaxes", "expressions" and "") by file_separator())
+	misc: (join ("..", "..", "..", "..", "..", "..", "src", "test", "skript", "tests", "misc" and "") by file_separator())
+	test: (join ("..", "..", "..", "..", "..", "..", "src", "test", "skript", "tests" and "") by file_separator())
+
+	# Princess test script is in another castle, Mario!
+	# paths are relativised to the "/scripts/" directory
+	# but we are loading these scripts from the test folder :(
+
+using script reflection
+
+test "current script":
+	assert the current script exists with "current script doesn't exist"
+	set {_expected} to {@path} + "ExprScript.sk"
+	assert "%script%" is {_expected} with "script stringify is wrong"
+
+test "script by name":
+	set {_script} to the script named {@path} + "ExprName.sk"
+	assert {_script} exists with "script not retrieved"
+	set {_script::*} to the scripts named ({@path} + "ExprName.sk" and {@path} + "ExprParse.sk")
+	assert size of {_script::*} is 2 with "wrong number of scripts found"
+
+test "all scripts":
+	set {_count} to 0
+	loop all loaded scripts:
+		assert "%loop-value%" starts with {@test} with "script from another place"
+		add 1 to {_count}
+	assert {_count} is greater than 1 with "not enough tests scripts found"
+	# This depends pretty heavily on the current test layout but it's just a parse trial more than anything
+
+test "scripts in directory":
+	set {_count} to 0
+	loop the scripts in folder {@misc}:
+		assert "%loop-value%" starts with {@misc} with "script from wrong directory: %loop-value%"
+		add 1 to {_count}
+	assert {_count} is greater than 5 with "not enough tests scripts found"
+	# This depends pretty heavily on the current test layout but it's just a parse trial more than anything
+
+test "disabled script object":
+	set {_path} to {@misc} + "-disabled.sk"
+	set {_script} to script named {_path}
+	assert {_script} exists with "can't get handle for disabled script"
+	set {EffScriptFile} to false
+	enable {_script}
+	assert {EffScriptFile} is true with "couldn't enable script from handle"
+
+	set {_path} to {@misc} + "disabled.sk"
+	set {_script} to script named {_path}
+	assert {_script} exists with "can't get handle for enabled script"
+	disable {_script}
+	delete {EffScriptFile}
diff --git a/src/test/skript/tests/syntaxes/expressions/ExprSets.sk b/src/test/skript/tests/syntaxes/expressions/ExprSets.sk
index 28446c8d17c..c976d20a36d 100644
--- a/src/test/skript/tests/syntaxes/expressions/ExprSets.sk
+++ b/src/test/skript/tests/syntaxes/expressions/ExprSets.sk
@@ -1,3 +1,7 @@
+aliases:
+	test ore = gold ore, diamond ore, coal ore, emerald ore
+	test log = dark oak log, oak log, jungle log, spruce log
+
 test "colours set":
 	set {_set::*} to black, dark grey, grey, white, blue, brown, cyan, light cyan, green, light green, yellow, orange, red, pink, purple and magenta
 	loop all colours:
@@ -7,6 +11,6 @@ test "colours set":
 	assert {_count} is size of {_set::*} with "All the colours in the collection set expression didn't match the required output"
 
 test "item sets":
-	assert items of type ore contains gold ore, diamond ore, coal ore and emerald ore with "Ores did not contain classic ore types"
-	assert items of type log contains dark oak log, oak log, jungle log and spruce log with "Logs did not contain the defined log checks"
+	assert items of type test ore contains gold ore, diamond ore, coal ore and emerald ore with "Ores did not contain classic ore types"
+	assert items of type test log contains dark oak log, oak log, jungle log and spruce log with "Logs did not contain the defined log checks"
 
diff --git a/src/test/skript/tests/syntaxes/expressions/ExprSkullOwner.sk b/src/test/skript/tests/syntaxes/expressions/ExprSkullOwner.sk
new file mode 100644
index 00000000000..4369944c01e
--- /dev/null
+++ b/src/test/skript/tests/syntaxes/expressions/ExprSkullOwner.sk
@@ -0,0 +1,16 @@
+test "skull owner - block":
+	set {_loc} to test-location
+	set {_old} to block at {_loc}
+	set block at {_loc} to player head
+	assert skull owner of (block at {_loc}) is not set with "Block Skull Owner should not be set"
+	set {_player} to "Sovde" parsed as offline player
+	set skull owner of (block at {_loc}) to {_player}
+	assert skull owner of (block at {_loc}) is {_player} with "Block Skull Owner did not change"
+	set block at {_loc} to {_old}
+
+test "skull owner - item":
+	set {_skull} to a player head
+	assert skull owner of {_skull} is not set with "Item Skull Owner should not be set"
+	set {_player} to "Sovde" parsed as offline player
+	set skull owner of {_skull} to {_player}
+	assert skull owner of {_skull} is {_player} with "Item Skull Owner did not change"
diff --git a/src/test/skript/tests/syntaxes/expressions/ExprSpawnerType.sk b/src/test/skript/tests/syntaxes/expressions/ExprSpawnerType.sk
index 1bfcbc72fb1..1bf9f44732b 100644
--- a/src/test/skript/tests/syntaxes/expressions/ExprSpawnerType.sk
+++ b/src/test/skript/tests/syntaxes/expressions/ExprSpawnerType.sk
@@ -1,6 +1,6 @@
 test "spawner type":
-	set block at event-location to spawner
-	set {_block} to block at event-location
+	set test-block to spawner
+	set {_block} to test-block
 
 	set spawner type of {_block} to zombie
 	assert spawner type of {_block} is zombie with "Spawner type was set to a Zombie"
@@ -11,8 +11,8 @@ test "spawner type":
 	set block at {_block} to air
 
 test "trial spawner type" when running minecraft "1.21":
-	set block at event-location to trial spawner
-	set {_block} to block at event-location
+	set test-block to trial spawner
+	set {_block} to test-block
 
 	set spawner type of {_block} to zombie
 	assert spawner type of {_block} is zombie with "Spawner type was set to a Zombie"
diff --git a/src/test/skript/tests/syntaxes/expressions/ExprStringCase.sk b/src/test/skript/tests/syntaxes/expressions/ExprStringCase.sk
index 593cb9578b0..b87bfe2fc6e 100644
--- a/src/test/skript/tests/syntaxes/expressions/ExprStringCase.sk
+++ b/src/test/skript/tests/syntaxes/expressions/ExprStringCase.sk
@@ -1,22 +1,22 @@
 test "string cases":
-	assert caseEquals("Oops!" in lowercase, "oops!") is true with "lowercase failed"
-	assert caseEquals("Oops!" in uppercase, "OOPS!") is true with "uppercase failed"
-	assert caseEquals((capitalised "Oops!"), "OOPS!") is true with "capitalised failed"
-	assert caseEquals("hellO i'm steve!" in proper case, "HellO I'm Steve!") is true with "lenient proper case failed"
-	assert caseEquals("hellO i'm steve!" in strict proper case, "Hello I'm Steve!") is true with "strict proper case failed"
-	assert caseEquals("spAwn neW boSs ()" in camel case, "spAwnNeWBoSs()") is true with "lenient camel case failed"
-	assert caseEquals("spAwn neW boSs ()" in strict camel case, "spawnNewBoss()") is true with "strict camel case failed"
-	assert caseEquals("geneRate ranDom numBer ()" in pascal case, "GeneRateRanDomNumBer()") is true with "lenient pascal case failed"
-	assert caseEquals("geneRate ranDom numBer ()" in strict pascal case, "GenerateRandomNumber()") is true with "strict pascal case failed"
-	assert caseEquals("Hello Player!" in snake case, "Hello_Player!") is true with "default snake case failed"
-	assert caseEquals("Hello Player!" in lower snake case, "hello_player!") is true with "lower snake case failed"
-	assert caseEquals("Hello Player!" in upper snake case, "HELLO_PLAYER!") is true with "upper snake case failed"
-	assert caseEquals("What is your name?" in kebab case, "What-is-your-name?") is true with "default kebab case failed"
-	assert caseEquals("What is your name?" in lower kebab case, "what-is-your-name?") is true with "lower kebab case failed"
-	assert caseEquals("What is your name?" in upper kebab case, "WHAT-IS-YOUR-NAME?") is true with "upper kebab case failed"
-	assert caseEquals("Hello Pl🤬yer!" in snake case, "Hello_Pl🤬yer!") is true with "default snake case failed"
-	assert caseEquals("He👾lo Player!" in lower snake case, "he👾lo_player!") is true with "lower snake case failed"
-	assert caseEquals("Hello 👀layer!" in upper snake case, "HELLO_👀LAYER!") is true with "upper snake case failed"
-	assert caseEquals("What is y🖐ur name?" in kebab case, "What-is-y🖐ur-name?") is true with "default kebab case failed"
-	assert caseEquals("W🧠at is your name?" in lower kebab case, "w🧠at-is-your-name?") is true with "lower kebab case failed"
-	assert caseEquals("What 🤵s your name" in upper kebab case, "WHAT-🤵S-YOUR-NAME") is true with "upper kebab case failed"
+	assert case_equals("Oops!" in lowercase, "oops!") is true with "lowercase failed"
+	assert case_equals("Oops!" in uppercase, "OOPS!") is true with "uppercase failed"
+	assert case_equals((capitalised "Oops!"), "OOPS!") is true with "capitalised failed"
+	assert case_equals("hellO i'm steve!" in proper case, "HellO I'm Steve!") is true with "lenient proper case failed"
+	assert case_equals("hellO i'm steve!" in strict proper case, "Hello I'm Steve!") is true with "strict proper case failed"
+	assert case_equals("spAwn neW boSs ()" in camel case, "spAwnNeWBoSs()") is true with "lenient camel case failed"
+	assert case_equals("spAwn neW boSs ()" in strict camel case, "spawnNewBoss()") is true with "strict camel case failed"
+	assert case_equals("geneRate ranDom numBer ()" in pascal case, "GeneRateRanDomNumBer()") is true with "lenient pascal case failed"
+	assert case_equals("geneRate ranDom numBer ()" in strict pascal case, "GenerateRandomNumber()") is true with "strict pascal case failed"
+	assert case_equals("Hello Player!" in snake case, "Hello_Player!") is true with "default snake case failed"
+	assert case_equals("Hello Player!" in lower snake case, "hello_player!") is true with "lower snake case failed"
+	assert case_equals("Hello Player!" in upper snake case, "HELLO_PLAYER!") is true with "upper snake case failed"
+	assert case_equals("What is your name?" in kebab case, "What-is-your-name?") is true with "default kebab case failed"
+	assert case_equals("What is your name?" in lower kebab case, "what-is-your-name?") is true with "lower kebab case failed"
+	assert case_equals("What is your name?" in upper kebab case, "WHAT-IS-YOUR-NAME?") is true with "upper kebab case failed"
+	assert case_equals("Hello Pl🤬yer!" in snake case, "Hello_Pl🤬yer!") is true with "default snake case failed"
+	assert case_equals("He👾lo Player!" in lower snake case, "he👾lo_player!") is true with "lower snake case failed"
+	assert case_equals("Hello 👀layer!" in upper snake case, "HELLO_👀LAYER!") is true with "upper snake case failed"
+	assert case_equals("What is y🖐ur name?" in kebab case, "What-is-y🖐ur-name?") is true with "default kebab case failed"
+	assert case_equals("W🧠at is your name?" in lower kebab case, "w🧠at-is-your-name?") is true with "lower kebab case failed"
+	assert case_equals("What 🤵s your name" in upper kebab case, "WHAT-🤵S-YOUR-NAME") is true with "upper kebab case failed"
diff --git a/src/test/skript/tests/syntaxes/expressions/ExprTagContents.sk b/src/test/skript/tests/syntaxes/expressions/ExprTagContents.sk
new file mode 100644
index 00000000000..d7df530e47b
--- /dev/null
+++ b/src/test/skript/tests/syntaxes/expressions/ExprTagContents.sk
@@ -0,0 +1,12 @@
+test "tags contents":
+	assert tag contents of tag "dirt" contains dirt with "dirt isn't dirt"
+
+	assert tag contents of block tag "slabs" contains oak slab with "oak slab is not a slab"
+	assert tag contents of item tag "slabs" contains oak slab with "oak slab is not a slab"
+
+	assert tag contents of entity tag "minecraft:skeletons" contains a skeleton with "skeleton is not a skeleton"
+
+	parse:
+		loop tag contents of minecraft item tag "logs":
+			add loop-item to {_list::*}
+	assert last parse logs is not set with "failed to parse tag looping (%last parse logs%)"
diff --git a/src/test/skript/tests/syntaxes/expressions/ExprTagsOf.sk b/src/test/skript/tests/syntaxes/expressions/ExprTagsOf.sk
new file mode 100644
index 00000000000..370e6e14743
--- /dev/null
+++ b/src/test/skript/tests/syntaxes/expressions/ExprTagsOf.sk
@@ -0,0 +1,7 @@
+test "tags of":
+	assert tags of dirt contains tag "dirt" with "dirt isn't dirt"
+
+	assert block tags of oak slab contain block tag "slabs" with "oak slab is not a slab"
+	assert item tags of oak slab contain item tag "slabs" with "oak slab is not a slab"
+
+	assert tags of a skeleton contain entity tag "minecraft:skeletons" with "skeleton is not a skeleton"
diff --git a/src/test/skript/tests/syntaxes/expressions/ExprTagsOfType.sk b/src/test/skript/tests/syntaxes/expressions/ExprTagsOfType.sk
new file mode 100644
index 00000000000..8938b392c36
--- /dev/null
+++ b/src/test/skript/tests/syntaxes/expressions/ExprTagsOfType.sk
@@ -0,0 +1,7 @@
+test "all tags":
+	assert all tags contains tag "dirt" with "dirt isn't a tag"
+
+	assert block tags contain block tag "slabs" with "slabs is not a block tag"
+	assert paper item tags contain item tag "paper:doors" with "paper:doors is not an paper item tag"
+
+	assert minecraft entity tags contain entity tag "minecraft:skeletons" with "skeletons is not a tag"
diff --git a/src/test/skript/tests/syntaxes/expressions/ExprTextDisplayAlignment.sk b/src/test/skript/tests/syntaxes/expressions/ExprTextDisplayAlignment.sk
new file mode 100644
index 00000000000..18c45683677
--- /dev/null
+++ b/src/test/skript/tests/syntaxes/expressions/ExprTextDisplayAlignment.sk
@@ -0,0 +1,24 @@
+test "text alignment":
+	
+	spawn item display at spawn of world "world":
+		set {_id} to entity
+
+	assert text alignment of {_id} is not set with "item display has text alignment"
+	set text alignment of {_id} to centered
+	assert text alignment of {_id} is not set with "item display has text alignment"
+	reset text alignment of {_id}
+	assert text alignment of {_id} is not set with "item display has text alignment"
+		
+	delete entity within {_id}
+	spawn text display at spawn of world "world":
+		set {_td} to entity
+
+	assert text alignment of {_td} is centered with "failed default text alignment"
+	set text alignment of {_td} to left aligned
+	assert text alignment of {_td} is left aligned with "failed to set text alignment"
+	set text alignment of {_td} to right aligned
+	assert text alignment of {_td} is right aligned with "failed to set text alignment"
+	reset text alignment of {_td}
+	assert text alignment of {_td} is centered with "failed to set text alignment"
+
+	delete entity within {_td}
diff --git a/src/test/skript/tests/syntaxes/expressions/ExprTextDisplayLineWidth.sk b/src/test/skript/tests/syntaxes/expressions/ExprTextDisplayLineWidth.sk
new file mode 100644
index 00000000000..9ccbcb296ec
--- /dev/null
+++ b/src/test/skript/tests/syntaxes/expressions/ExprTextDisplayLineWidth.sk
@@ -0,0 +1,33 @@
+test "line width":
+	
+	spawn item display at spawn of world "world":
+		set {_id} to entity
+
+	assert line width of {_id} is not set with "item display has line width"
+	set line width of {_id} to 55
+	assert line width of {_id} is not set with "item display has line width"
+	reset line width of {_id}
+	assert line width of {_id} is not set with "item display has line width"
+		
+	delete entity within {_id}
+	spawn text display at spawn of world "world":
+		set {_td} to entity
+
+	assert line width of {_td} is 200 with "failed default line width"
+	set line width of {_td} to 185.4
+	assert line width of {_td} is 185 with "failed to set line width"
+	set line width of {_td} to -50
+	assert line width of {_td} is 0 with "failed to set line width"
+	set line width of {_td} to 900
+	assert line width of {_td} is 900 with "failed to set line width"
+	add 50 to line width of {_td}
+	assert line width of {_td} is 950 with "failed to add to line width"
+	remove 1000 from line width of {_td}
+	assert line width of {_td} is 0 with "failed to remove from line width"
+	reset line width of {_td}
+	assert line width of {_td} is 200 with "failed to reset line width"
+
+	set line width of {_td} to infinity value
+	assert line width of {_td} is 2147483647 with "failed to set line width"
+
+	delete entity within {_td}
diff --git a/src/test/skript/tests/syntaxes/expressions/ExprTextDisplayOpacity.sk b/src/test/skript/tests/syntaxes/expressions/ExprTextDisplayOpacity.sk
new file mode 100644
index 00000000000..7d232791533
--- /dev/null
+++ b/src/test/skript/tests/syntaxes/expressions/ExprTextDisplayOpacity.sk
@@ -0,0 +1,33 @@
+test "text opacity":
+	
+	spawn item display at spawn of world "world":
+		set {_id} to entity
+
+	assert opacity of {_id} is not set with "item display has opacity"
+	set opacity of {_id} to 55
+	assert opacity of {_id} is not set with "item display has opacity"
+	reset opacity of {_id}
+	assert opacity of {_id} is not set with "item display has opacity"
+		
+	delete entity within {_id}
+	spawn text display at spawn of world "world":
+		set {_td} to entity
+
+	assert opacity of {_td} is -1 with "failed default opacity"
+	set opacity of {_td} to 185.4
+	assert opacity of {_td} is 127 with "failed to set opacity"
+	set opacity of {_td} to -50
+	assert opacity of {_td} is -50 with "failed to set opacity"
+	set opacity of {_td} to -900
+	assert opacity of {_td} is -127 with "failed to set opacity"
+	add 50 to opacity of {_td}
+	assert opacity of {_td} is -77 with "failed to add to opacity"
+	remove 1000 from opacity of {_td}
+	assert opacity of {_td} is -127 with "failed to remove from opacity"
+	reset opacity of {_td}
+	assert opacity of {_td} is -1 with "failed to reset opacity"
+
+	set opacity of {_td} to infinity value
+	assert opacity of {_td} is 127 with "failed to set opacity"
+
+	delete entity within {_td}
diff --git a/src/test/skript/tests/syntaxes/expressions/ExprTextOf.sk b/src/test/skript/tests/syntaxes/expressions/ExprTextOf.sk
new file mode 100644
index 00000000000..706df1fa73f
--- /dev/null
+++ b/src/test/skript/tests/syntaxes/expressions/ExprTextOf.sk
@@ -0,0 +1,25 @@
+test "text of text displays":
+	spawn item display at spawn of world "world":
+		set {_id} to entity
+
+	assert text of {_id} is not set with "item display has text"
+	set text of {_id} to "55"
+	assert text of {_id} is not set with "item display has text"
+	reset text of {_id}
+	assert text of {_id} is not set with "item display has text"
+
+	delete entity within {_id}
+	spawn text display at spawn of world "world":
+		set {_td} to entity
+
+	assert text of {_td} is "" with "failed default text"
+	set text of {_td} to "hello!"
+	assert text of {_td} is "hello!" with "failed to set text"
+	set text of {_td} to ""
+	assert text of {_td} is "" with "failed to set text"
+	set text of {_td} to "èa_.21&*5ö!"
+	assert text of {_td} is "èa_.21&*5ö!" with "failed to set text"
+	reset text of {_td}
+	assert text of {_td} is "" with "failed to reset text"
+
+	delete entity within {_td}
diff --git a/src/test/skript/tests/syntaxes/expressions/ExprTimeSince.sk b/src/test/skript/tests/syntaxes/expressions/ExprTimeSince.sk
new file mode 100644
index 00000000000..19e7583a9f3
--- /dev/null
+++ b/src/test/skript/tests/syntaxes/expressions/ExprTimeSince.sk
@@ -0,0 +1,61 @@
+# Since code takes time to run, we need to give some leeway to the values.
+# Precision to within a tick should be more than enough.
+local function isRoughlyEqual(timespan1: timespan, timespan2: timespan) :: boolean:
+	set {_diff} to difference between {_timespan1} and {_timespan2}
+	if {_diff} is less than 1 tick:
+		return true
+	return false
+
+test "time since":
+
+	# normal dates
+	set {_time} to time since now
+	assert isRoughlyEqual({_time}, 0 seconds) is true with "Time since now failed (expected 0 seconds, got %{_time}%)"
+
+	set {_time} to time since 1 day ago
+	assert isRoughlyEqual({_time}, 1 day) is true with "Time since 1 day ago failed (expected 1 day, got %{_time}%)"
+
+	set {_time} to time since 1 hour ago
+	assert isRoughlyEqual({_time}, 1 hour) is true with "Time since 1 hour ago failed (expected 1 hour, got %{_time}%)"
+
+	# future date
+	set {_time} to time since 1 minute from now
+	assert isRoughlyEqual({_time}, 0 seconds) is true with "Time since 1 minute from now failed (expected 0 seconds, got %{_time}%)"
+
+	# null date
+	set {_time} to time since {_none}
+	assert {_time} is not set with "Time since none failed (expected <none>, got %{_time}%)"
+
+	# multiple dates
+	set {_times::*} to time since (1 day ago, 1 hour ago, 1 minute ago, 1 minute from now)
+	assert isRoughlyEqual({_times::1}, 1 day) is true with "Time since multiple dates failed (expected 1 day, got %{_times::1}%)"
+	assert isRoughlyEqual({_times::2}, 1 hour) is true with "Time since multiple dates failed (expected 1 hour, got %{_times::2}%)"
+	assert isRoughlyEqual({_times::3}, 1 minute) is true with "Time since multiple dates failed (expected 1 minute, got %{_times::3}%)"
+	assert isRoughlyEqual({_times::4}, 0 seconds) is true with "Time since multiple dates failed (expected 0 seconds, got %{_times::4}%)"
+
+test "time until":
+
+	# normal dates
+	set {_time} to time until now
+	assert isRoughlyEqual({_time}, 0 seconds) is true with "Time until now failed (expected 0 seconds, got %{_time}%)"
+
+	set {_time} to time until 1 day from now
+	assert isRoughlyEqual({_time}, 1 day) is true with "Time until 1 day from now failed (expected 1 day, got %{_time}%)"
+
+	set {_time} to time until 1 hour from now
+	assert isRoughlyEqual({_time}, 1 hour) is true with "Time until 1 hour from now failed (expected 1 hour, got %{_time}%)"
+
+	# past date
+	set {_time} to time until 1 minute ago
+	assert isRoughlyEqual({_time}, 0 seconds) is true with "Time until 1 minute ago failed (expected 0 seconds, got %{_time}%)"
+
+	# null date
+	set {_time} to time until {_none}
+	assert {_time} is not set with "Time until none failed (expected <none>, got %{_time}%)"
+
+	# multiple dates
+	set {_times::*} to time until (1 day from now, 1 hour from now, 1 minute from now, 1 minute ago)
+	assert isRoughlyEqual({_times::1}, 1 day) is true with "Time until multiple dates failed (expected 1 day, got %{_times::1}%)"
+	assert isRoughlyEqual({_times::2}, 1 hour) is true with "Time until multiple dates failed (expected 1 hour, got %{_times::2}%)"
+	assert isRoughlyEqual({_times::3}, 1 minute) is true with "Time until multiple dates failed (expected 1 minute, got %{_times::3}%)"
+	assert isRoughlyEqual({_times::4}, 0 seconds) is true with "Time until multiple dates failed (expected 0 seconds, got %{_times::4}%)"
diff --git a/src/test/skript/tests/syntaxes/expressions/ExprTimes.sk b/src/test/skript/tests/syntaxes/expressions/ExprTimes.sk
index 5001a78ade0..edb09f9080a 100644
--- a/src/test/skript/tests/syntaxes/expressions/ExprTimes.sk
+++ b/src/test/skript/tests/syntaxes/expressions/ExprTimes.sk
@@ -6,3 +6,7 @@ test "times":
 		add 1 to {_count}
 	assert {_count} is 3 with "count was %{_count}% instead of 3"
 	assert {_three} is 3 with "original number wasn't 3"
+	set {_count} to 0
+	loop thrice:
+		add 1 to {_count}
+	assert {_count} is 3 with "thrice count was %{_count}% instead of 3"
diff --git a/src/test/skript/tests/syntaxes/expressions/ExprTotalExperience.sk b/src/test/skript/tests/syntaxes/expressions/ExprTotalExperience.sk
index e4e618e923a..fddfc5fd3db 100644
--- a/src/test/skript/tests/syntaxes/expressions/ExprTotalExperience.sk
+++ b/src/test/skript/tests/syntaxes/expressions/ExprTotalExperience.sk
@@ -1,5 +1,5 @@
 test "total experience":
-	spawn 10 xp at spawn of world "world":
+	spawn 10 xp at test-location:
 		assert experience of entity is 10 with "spawned orb should have 10 experience in section"
 		set experience of entity to 100
 		assert experience of entity is 100 with "set experience of entity did not work"
diff --git a/src/test/skript/tests/syntaxes/expressions/ExprTransform.sk b/src/test/skript/tests/syntaxes/expressions/ExprTransform.sk
new file mode 100644
index 00000000000..66a98e93931
--- /dev/null
+++ b/src/test/skript/tests/syntaxes/expressions/ExprTransform.sk
@@ -0,0 +1,14 @@
+test "transform expression":
+	set {_a::*} to integers between -10 and 10
+	assert {_a::*} transformed using (input + 2) is integers between -8 and 12 with "failed to transform with +2"
+
+	assert integers between -10 and 10 transformed using (input + 2) is integers between -8 and 12 with "failed to transform with +2"
+
+	set {_a::*} to integers between -10 and 10
+	loop {_a::*} transformed using ("%input index%"):
+		assert loop-string is "%loop-counter%" with "failed to transform to loop-index"
+
+	set {_a::*} to "a", "b", and "c"
+	assert {_a::*} transformed using [1 and 2] is 1, 2, 1, 2, 1 and 2 with "failed to transform with constant plural value"
+
+	assert 2, 7, 4, 2, and 1 transformed using (length of input) is not set with "length of integers caused issues"
diff --git a/src/test/skript/tests/syntaxes/expressions/ExprTypeOf.sk b/src/test/skript/tests/syntaxes/expressions/ExprTypeOf.sk
new file mode 100644
index 00000000000..a7084659e51
--- /dev/null
+++ b/src/test/skript/tests/syntaxes/expressions/ExprTypeOf.sk
@@ -0,0 +1,18 @@
+test "type of expression":
+	spawn a sheep at event-location:
+		set {_e} to entity
+	assert type of {_e} = sheep with "Type of entity should be sheep"
+	assert type of zombie = zombie with "Type of entitydata should be zombie"
+	delete entity within {_e}
+
+	set {_i} to 1 of diamond sword named "BOB"
+	assert type of {_i} = diamond sword with "Type of item should be diamond sword"
+
+	set {_p} to potion effect of night vision for 10 seconds
+	assert type of {_p} = night vision with "Type of potion effect should be nice vision"
+
+	set {_data} to oak_stairs[]
+	assert type of {_data} = oak stairs with "Type of blockdata should be oak stairs"
+
+	set {_ench} to sharpness 10
+	assert type of {_ench} = sharpness with "Type of enchantment type should be sharpness"
diff --git a/src/test/skript/tests/syntaxes/expressions/ExprVectorXYZ.sk b/src/test/skript/tests/syntaxes/expressions/ExprVectorXYZ.sk
deleted file mode 100644
index 2691fa58975..00000000000
--- a/src/test/skript/tests/syntaxes/expressions/ExprVectorXYZ.sk
+++ /dev/null
@@ -1,16 +0,0 @@
-test "vector xyz":
-	assert the x component of vector(0, 0, 0) is 0 with "x = 0 vector component failed"
-	assert the x component of vector(1, 0, 0) is 1 with "x = 1 vector component failed"
-	assert the y component of vector(1, 1, 0) is 1 with "y = 1 vector component failed"
-	assert the z component of vector(1, 1, 1) is 1 with "z = 1 vector component failed"
-	loop 60 times:
-		set {_x} to a random number between -100 and 100
-		set {_y} to a random number between -100 and 100
-		set {_z} to a random number between -100 and 100
-		set {_vector} to vector({_x}, {_y}, {_z})
-		assert the x component of {_vector} is {_x} with "randomly-created vector x equality failed (expected %{_x}%, got %x component of {_vector}%)"
-		assert the y component of {_vector} is {_y} with "randomly-created vector y equality failed (expected %{_y}%, got %y component of {_vector}%)"
-		assert the z component of {_vector} is {_z} with "randomly-created vector z equality failed (expected %{_z}%, got %z component of {_vector}%)"
-	set {_random} to a random vector
-	set {_vector} to a new vector from x component of {_random}, y component of {_random}, z component of {_random}
-	assert {_vector} is {_random} with "random vector to created component equality failed (expected %{_random}%, got %{_vector}%)"
diff --git a/src/test/skript/tests/syntaxes/expressions/ExprVillagerLevel.sk b/src/test/skript/tests/syntaxes/expressions/ExprVillagerLevel.sk
new file mode 100644
index 00000000000..fd1060c0c5d
--- /dev/null
+++ b/src/test/skript/tests/syntaxes/expressions/ExprVillagerLevel.sk
@@ -0,0 +1,33 @@
+test "villager level expression":
+	spawn a villager at event-location:
+		set {_e} to entity
+
+	# Level
+	assert villager level of {_e} = 1 with "Villager should start out with a level of 1"
+	set villager level of {_e} to 2
+	assert villager level of {_e} = 2 with "Villager level should now be 2"
+	add 2 to villager level of {_e}
+	assert villager level of {_e} = 4 with "Villager level should now be 4"
+	add 5 to villager level of {_e}
+	assert villager level of {_e} = 5 with "Villager level is capped at 5, and should now be 5"
+	remove 2 from villager level of {_e}
+	assert villager level of {_e} = 3 with "Villager level should be 3 now"
+	reset villager level of {_e}
+	assert villager level of {_e} = 1 with "Villager level should reset back to 1"
+
+	# Experience
+	set villager experience of {_e} to 0
+	assert villager experience of {_e} = 0 with "Villager experience should be 0"
+	set villager experience of {_e} to 100
+	assert villager experience of {_e} = 100 with "Villager experience should be 100 after setting"
+	remove 1000 from villager experience of {_e}
+	assert villager experience of {_e} = 0 with "Villager experience should be 0 after removing"
+	add 100 to villager experience of {_e}
+	assert villager experience of {_e} = 100 with "Villager experience should be 100 after adding"
+	remove 20 from villager experience of {_e}
+	assert villager experience of {_e} = 80 with "Villager experience should be 80 after removing"
+	reset villager experience of {_e}
+	assert villager experience of {_e} = 0 with "Villager experience should have been reset to 0"
+
+	# Thank you for your service
+	delete entity within {_e}
diff --git a/src/test/skript/tests/syntaxes/expressions/ExprVillagerProfession.sk b/src/test/skript/tests/syntaxes/expressions/ExprVillagerProfession.sk
new file mode 100644
index 00000000000..71e2250d6fe
--- /dev/null
+++ b/src/test/skript/tests/syntaxes/expressions/ExprVillagerProfession.sk
@@ -0,0 +1,14 @@
+test "villager profession expression":
+	spawn a librarian at event-location:
+		# Make sure he keeps his job
+		set villager level of entity to 2
+		set {_e} to entity
+
+	assert villager profession of {_e} = librarian profession with "The villager should have spawned as a librarian"
+	set villager profession of {_e} to nitwit profession
+	assert villager profession of {_e} = nitwit profession with "The villager should now be a nitwit"
+	delete villager profession of {_e}
+	assert villager profession of {_e} = no profession with "The villager should now have no profession"
+
+	# Thank you for your service
+	delete entity within {_e}
diff --git a/src/test/skript/tests/syntaxes/expressions/ExprVillagerType.sk b/src/test/skript/tests/syntaxes/expressions/ExprVillagerType.sk
new file mode 100644
index 00000000000..ebae093a5db
--- /dev/null
+++ b/src/test/skript/tests/syntaxes/expressions/ExprVillagerType.sk
@@ -0,0 +1,11 @@
+test "villager type expression":
+	spawn a villager at event-location:
+		set {_e} to event-entity
+
+	set villager type of {_e} to plains
+	assert villager type of {_e} = plains with "The villager should now have the type plains"
+	set villager type of {_e} to desert
+	assert villager type of {_e} = desert with "The villager should now have the type desert"
+
+	# Thank you for your service
+	delete entity within {_e}
diff --git a/src/test/skript/tests/syntaxes/expressions/ExprWhitelist.sk b/src/test/skript/tests/syntaxes/expressions/ExprWhitelist.sk
index 32aa528320e..9eab2e0e042 100644
--- a/src/test/skript/tests/syntaxes/expressions/ExprWhitelist.sk
+++ b/src/test/skript/tests/syntaxes/expressions/ExprWhitelist.sk
@@ -11,7 +11,7 @@ test "whitelist":
 	reset whitelist
 	assert whitelist is not set with "Failed to empty whitelist"
 
-test "enforce whitelist" when running minecraft "1.17":
+test "enforce whitelist":
 	enforce whitelist
 	assert server whitelist is enforced with "Failed to enforce server whitelist"
 	unenforce whitelist
diff --git a/src/test/skript/tests/syntaxes/expressions/ExprXYZComponent.sk b/src/test/skript/tests/syntaxes/expressions/ExprXYZComponent.sk
new file mode 100644
index 00000000000..519226814dd
--- /dev/null
+++ b/src/test/skript/tests/syntaxes/expressions/ExprXYZComponent.sk
@@ -0,0 +1,62 @@
+test "vector xyz":
+	assert the w component of vector(0, 0, 0) is not set with "w vector component return value for vector unexpectedly"
+	assert the x component of vector(1, 0, 0) is 1 with "x vector component failed"
+	assert the y component of vector(0, 1, 0) is 1 with "y vector component failed"
+	assert the z component of vector(0, 0, 1) is 1 with "z vector component failed"
+
+	set {_v} to vector(0,0,0)
+	set x of {_v} to infinity value
+	assert the w component of {_v} is not set with "set x of vector created w component somehow"
+	assert the x component of {_v} is infinity value with "set x of vector failed"
+	assert the y component of {_v} is 0 with "set x of vector modified other components"
+	assert the z component of {_v} is 0 with "set x of vector modified other components"
+
+	loop 60 times:
+		set {_x} to a random number between -100 and 100
+		set {_y} to a random number between -100 and 100
+		set {_z} to a random number between -100 and 100
+		set {_vector} to vector({_x}, {_y}, {_z})
+		assert the x component of {_vector} is {_x} with "randomly-created vector x equality failed"
+		assert the y component of {_vector} is {_y} with "randomly-created vector y equality failed"
+		assert the z component of {_vector} is {_z} with "randomly-created vector z equality failed"
+	set {_random} to a random vector
+	set {_vector} to a new vector from x component of {_random}, y component of {_random}, z component of {_random}
+	assert {_vector} is {_random} with "random vector to created component equality failed (expected %{_random}%, got %{_vector}%)"
+
+	set {_v::*} to vector(1,2,3), vector(2,3,4), and vector(3,4,5)
+	set x component of {_v::*} to -1.5
+	assert the x component of {_v::*} is (-1.5, -1.5, and -1.5) with "x component of multiple vectors failed"
+	assert the y component of {_v::*} is (2, 3, and 4) with "changing x component of multiple vectors changed y components too"
+
+test "quaternion wxyz":
+	assert the w component of quaternion(1, 0, 0, 0) is 1 with "w vector component failed"
+	assert the x component of quaternion(1, 0, 0, 0) is 0 with "x vector component failed"
+	assert the y component of quaternion(1, 0, 0, 0) is 0 with "y vector component failed"
+	assert the z component of quaternion(1, 0, 0, 0) is 0 with "z vector component failed"
+
+	assert the x component of quaternion(0, 1, 0, 0) is 1 with "x vector component failed"
+	assert the y component of quaternion(0, 0, 1, 0) is 1 with "y vector component failed"
+	assert the z component of quaternion(0, 0, 0, 1) is 1 with "z vector component failed"
+
+	set {_q} to quaternion(0,0,0,0)
+	set x of {_q} to infinity value
+	assert the w component of {_q} is 0 with "set x of quaternion modified other components"
+	assert the x component of {_q} is infinity value with "set x of quaternion failed"
+	assert the y component of {_q} is 0 with "set x of quaternion modified other components"
+	assert the z component of {_q} is 0 with "set x of quaternion modified other components"
+
+	loop 60 times:
+		set {_w} to a random number between -100 and 100
+		set {_x} to a random number between -100 and 100
+		set {_y} to a random number between -100 and 100
+		set {_z} to a random number between -100 and 100
+		set {_quaternion} to quaternion({_w}, {_x}, {_y}, {_z})
+		assert the w component of {_quaternion} is {_w} with "randomly-created quaternion w equality failed"
+		assert the x component of {_quaternion} is {_x} with "randomly-created quaternion x equality failed"
+		assert the y component of {_quaternion} is {_y} with "randomly-created quaternion y equality failed"
+		assert the z component of {_quaternion} is {_z} with "randomly-created quaternion z equality failed"
+
+	set {_v::*} to quaternion(0,1,2,3), quaternion(1,2,3,4), and quaternion(2,3,4,5)
+	set x component of {_v::*} to -1.5
+	assert the x component of {_v::*} is (-1.5, -1.5, and -1.5) with "x component of multiple quaternions failed"
+	assert the y component of {_v::*} is (2, 3, and 4) with "changing x component of multiple quaternions changed y components too"
diff --git a/src/test/skript/tests/syntaxes/expressions/ExprYawPitch.sk b/src/test/skript/tests/syntaxes/expressions/ExprYawPitch.sk
index 225787c522d..546c32030a8 100644
--- a/src/test/skript/tests/syntaxes/expressions/ExprYawPitch.sk
+++ b/src/test/skript/tests/syntaxes/expressions/ExprYawPitch.sk
@@ -1,5 +1,5 @@
 test "yaw and pitch":
-	set {_test} to spawn location of world "world"
+	set {_test} to test-location
 	assert yaw of {_test} is 0 with "The yaw of the spawn location was not 0"
 	set yaw of {_test} to 90
 	assert yaw of {_test} is 90 with "The yaw of the spawn location was not set to 90"
diff --git a/src/test/skript/tests/syntaxes/functions/caseEquals.sk b/src/test/skript/tests/syntaxes/functions/caseEquals.sk
deleted file mode 100644
index ace8276da6e..00000000000
--- a/src/test/skript/tests/syntaxes/functions/caseEquals.sk
+++ /dev/null
@@ -1,6 +0,0 @@
-test "case equals function":
-	assert caseEquals("") is true with "case equals function failed"
-	assert caseEquals("dummy") is true with "case equals function failed"
-	assert caseEquals("hi", "Hi") is false with "case equals function failed"
-	assert caseEquals("text", "text", "tExt") is false with "case equals function failed"
-	assert caseEquals("🐢<-turtle", "🐢<-turtle", "🐢<-turtle", "🐢<-turtle") is true with "case equals function failed"
diff --git a/src/test/skript/tests/syntaxes/functions/case_equals.sk b/src/test/skript/tests/syntaxes/functions/case_equals.sk
new file mode 100644
index 00000000000..55dff3c983d
--- /dev/null
+++ b/src/test/skript/tests/syntaxes/functions/case_equals.sk
@@ -0,0 +1,6 @@
+test "case equals function":
+	assert case_equals("") is true with "case equals function failed"
+	assert case_equals("dummy") is true with "case equals function failed"
+	assert case_equals("hi", "Hi") is false with "case equals function failed"
+	assert case_equals("text", "text", "tExt") is false with "case equals function failed"
+	assert case_equals("🐢<-turtle", "🐢<-turtle", "🐢<-turtle", "🐢<-turtle") is true with "case equals function failed"
diff --git a/src/test/skript/tests/syntaxes/functions/offlinePlayer.sk b/src/test/skript/tests/syntaxes/functions/offlineplayer.sk
similarity index 79%
rename from src/test/skript/tests/syntaxes/functions/offlinePlayer.sk
rename to src/test/skript/tests/syntaxes/functions/offlineplayer.sk
index b96d67a7487..389ecea7308 100644
--- a/src/test/skript/tests/syntaxes/functions/offlinePlayer.sk
+++ b/src/test/skript/tests/syntaxes/functions/offlineplayer.sk
@@ -2,6 +2,6 @@ test "offline player function":
 	set {_lookup} to offlineplayer("Notch")
 	assert {_lookup} is set with "Failed to look up offline player"
 
-test "offline player function no lookup" when running minecraft "1.16":
+test "offline player function no lookup":
 	set {_non-lookup} to offlineplayer("Dinnerbone", false)
 	assert {_non-lookup} is not set with "Looked up offline player when told not to"
diff --git a/src/test/skript/tests/syntaxes/functions/quaternions.sk b/src/test/skript/tests/syntaxes/functions/quaternions.sk
new file mode 100644
index 00000000000..24e2d724d8f
--- /dev/null
+++ b/src/test/skript/tests/syntaxes/functions/quaternions.sk
@@ -0,0 +1,23 @@
+test "quaternions":
+	set {_a} to quaternion(1, 2, 3, 4)
+	assert w of {_a} is 1 with error "failed to get w component of quaternion"
+	assert x of {_a} is 2 with error "failed to get x component of quaternion"
+	assert y of {_a} is 3 with error "failed to get y component of quaternion"
+	assert z of {_a} is 4 with error "failed to get z component of quaternion"
+
+
+	set {_a} to quaternion(-1.2, 0.0, -infinity value, NaN value)
+	assert w of {_a} is -1.2 with error "failed to get w component of quaternion"
+	assert x of {_a} is 0 with error "failed to get x component of quaternion"
+	assert y of {_a} is -infinity value with error "failed to get y component of quaternion"
+	assert isNaN(z of {_a}) is true with error "failed to get z component of quaternion"
+
+test "axis angle":
+	set {_a} to axisAngle(100, vector(2, 3, 4))
+	assert w of {_a} is 0.642787516117096 with error "failed to get w component of axis angle"
+	assert x of {_a} is 1.5320889949798584 with error "failed to get x component of axis angle"
+	assert y of {_a} is 2.298133373260498 with error "failed to get y component of axis angle"
+	assert z of {_a} is 3.064177989959717 with error "failed to get z component of axis angle"
+
+	set {_a} to axisAngle(-1.2, vector(0.0, -infinity value, NaN value))
+	assert {_a} is not set with error "invalid axis angle was set"
diff --git a/src/test/skript/tests/syntaxes/sections/EffSecShoot.sk b/src/test/skript/tests/syntaxes/sections/EffSecShoot.sk
new file mode 100644
index 00000000000..5ffc75ea374
--- /dev/null
+++ b/src/test/skript/tests/syntaxes/sections/EffSecShoot.sk
@@ -0,0 +1,34 @@
+test "EffSecShoot":
+	set {_loc} to spawn of world "world"
+	spawn pig at {_loc}:
+		set ai of entity to false
+		set {_shooter} to entity
+
+	shoot a pig from {_shooter}
+	assert last shot entity is a pig with "Last shot entity is not a pig"
+	clear last shot entity
+
+	spawn cow at {_loc}:
+		set ai of entity to false
+		set {_shooter2} to entity
+
+	shoot an arrow from {_shooter2}:
+		set {_other} to event-projectile
+	shoot a pig from {_shooter}:
+		assert (shooter of {_other}) = {_shooter2} with "ExprShooter did not get shooter of other projectile"
+		set {_projectile} to entity
+	clear entity within {_other}
+	clear entity within {_projectile}
+
+	set {_pigs::*} to pig, pig, pig, pig and pig
+	shoot {_pigs::*} from {_shooter}:
+		add entity to {_projectiles::*}
+		assert shooter = {_shooter} with "ExprShooter does not return shooter used in effect"
+	assert size of {_projectiles::*} = 5 with "1 or more projectiles did not spawn"
+	loop {_projectiles::*}:
+		assert loop-value is a pig with "Projectile on loop %loop-iteration% is not a pig"
+	clear entities within {_projectiles::*}
+	clear {_projectiles::*}
+
+	clear entity within {_shooter}
+	clear entity within {_shooter2}
diff --git a/src/test/skript/tests/syntaxes/sections/EffSecSpawn.sk b/src/test/skript/tests/syntaxes/sections/EffSecSpawn.sk
index f151f09821b..36cd029d11f 100644
--- a/src/test/skript/tests/syntaxes/sections/EffSecSpawn.sk
+++ b/src/test/skript/tests/syntaxes/sections/EffSecSpawn.sk
@@ -1,6 +1,6 @@
 test "spawn section":
 	set {_before} to 5
-	spawn a pig at spawn of "world":
+	spawn a pig at test-location:
 
 		# Make sure variables carry over properly
 		assert {_before} is 5 with "value of {_before} should be 5 (got '%{_before}%')"
@@ -11,12 +11,101 @@ test "spawn section":
 		set {_test} to event-entity
 		assert {_test} is set with "entity not set"
 		assert {_test} is a pig with "entity variable not a pig"
-		set {_location} to event-location
+		set {_location} to test-location
 		assert {_location} is set with "location not set"
-		assert y-coord of spawn of "world" is y-coord of {_location} with "location y coordinate not right"
+		assert y-coord of test-location is y-coord of {_location} with "location y coordinate not right"
 
 	delete the last spawned pig
 
 	# Make sure variables carry over properly
 	assert {_before} is 10 with "value of {_before} should be 10 (got '%{_before}%')"
 	assert {_new var} is 5 with "value of {_new var} should be 5 (got '%{_new var}%')"
+
+test "spawn cats by type":
+	delete all cats
+	set {_l} to location of spawn of world "world"
+	spawn 5 all black cats at {_l}
+	assert size of all cats = 5 with "Size of all cats is not 5"
+	assert size of all all black cats = 5 with "Size of all all black cats is not 5"
+	spawn 2 siamese cats at {_l}
+	assert size of all cats = 7 with "Size of all cats is not 7"
+	assert size of all siamese cats = 2 with "Size of all siamese cats is not 2"
+	delete all siamese cats
+	assert size of all cats = 5 with "Size of all cats is not 5 after delete 2 siamese cats"
+	delete all cats
+	assert size of all cats = 0 with "Size of all cats is greater than 0 after all were deleted"
+
+test "spawn wolves by variant" when running minecraft "1.21.0":
+	delete all wolves
+	set {_l} to location of spawn of world "world"
+	spawn 5 ashen wolves at {_l}
+	assert size of all wolves = 5 with "Size of all wolves is not 5"
+	assert size of all ashen wolves = 5 with "Size of all ashen wolves is not 5"
+	spawn 2 rusty wolves at {_l}
+	assert size of all wolves = 7 with "Size of all wolves is not 7"
+	assert size of all rusty wolves = 2 with "Size of all rusty wolves is not 2"
+	delete all rusty wolves
+	assert size of all wolves = 5 with "Size of all wolves is not 5 after delete 2 rusty wolves"
+	delete all wolves
+	assert size of all wolves = 0 with "Size of all wolves is greater than 0 after all were deleted"
+
+test "spawn salmon by variant" when running minecraft "1.21.2":
+	delete all salmons
+	set {_l} to test-location
+	spawn 5 small salmon at {_l}
+	assert size of all small salmons = 5 with "Size of all small salmons is not 5"
+	assert size of all entities of type salmon = 5 with "Size of all salmons is not 5"
+	spawn 3 medium salmon at {_l}
+	assert size of all medium salmons = 3 with "Size of all medium salmons is not 3"
+	assert size of all entities of type salmon = 8 with "Size of all salmons is not 8"
+	spawn 2 large salmon at {_l}
+	assert size of all large salmons = 2 with "Size of all large salmon is not 2"
+	assert size of all entities of type salmon = 10 with "Size of all salmon is not 10"
+	delete all large salmons
+	assert size of all large salmons = 0 with "Large salmons did not get cleared"
+	delete all medium salmons
+	assert size of all medium salmons = 0 with "Medium salmons did not get cleared"
+	delete all small salmons
+	assert size of all small salmons = 0 with "Small salmons did not get cleared"
+	spawn 15 of any salmon at {_l}
+	assert size of all entities of type salmon = 15 with "Size of all salmons is not 15"
+	clear all salmons
+	assert size of all entities of type salmon = 0 with "All salmons did not get cleared"
+
+test "spawn entities":
+	set {_entities::*} to "allay", "axolotl", "bat", "bee", "blaze", "cat", "cave spider", "chicken" and "cod"
+	add "cow", "creeper", "dolphin", "donkey", "drowned", "elder guardian", "enderman" and "endermite" to {_entities::*}
+	add "evoker", "fox", "frog", "ghast", "glow squid", "goat", "guardian", "hoglin", "horse" and "husk" to {_entities::*}
+	add "iron golem", "llama", "magma cube", "mooshroom", "mule", "ocelot", "panda", "parrot" and "phantom" to {_entities::*}
+	add "pig", "piglin", "piglin brute", "pillager", "polar bear", "pufferfish", "rabbit" and "ravager" to {_entities::*}
+	add "salmon", "sheep", "shulker", "silverfish", "skeleton", "skeleton horse" and "slime" to {_entities::*}
+	add "snow golem", "spider", "squid", "stray", "strider", "tadpole", "trader llama" and "tropical fish" to {_entities::*}
+	add "turtle", "vex", "villager", "vindicator", "wandering trader", "warden", "witch" and "wither skeleton" to {_entities::*}
+	add "wolf", "zoglin", "zombie", "zombie horse", "zombie villager", and "zombified piglin" to {_entities::*}
+	add "ender dragon" and "wither" to {_entities::*}
+	add "oak boat", "oak chest boat", "armor stand", "primed tnt", "firework", "arrow", "trident" and "egg" to {_entities::*}
+	add "snowball", "end crystal", "eye of ender", "regular minecart", "falling sand" and "falling gravel" to {_entities::*}
+	add "falling powder snow" to {_entities::*}
+
+	if running minecraft "1.20.0":
+		add "camel" and "sniffer" to {_entities::*}
+	if running minecraft "1.20.6":
+		add "armadillo" to {_entities::*}
+	if running minecraft "1.21":
+		add "bogged" and "breeze" to {_entities::*}
+
+	# Note: Had to remove 'fireball' and 'wind charge'
+
+	clear all entities
+	loop {_entities::*}:
+		set {_parse} to loop-value parsed as entity type
+		if {_parse} is set:
+			spawn {_parse} at spawn of "world":
+				set {_ent} to entity
+			set {_assert} to whether {_ent} is entity type within {_parse}
+			assert {_assert} is true with "", expected (entity type within {_parse}), got {_ent}
+			clear entity within {_ent}
+			clear {_ent}
+		else:
+			assert false is true with "Failed to parse '%loop-value%' as an entity type", expected loop-value, got {_parse}
+	clear all entities
diff --git a/src/test/skript/tests/syntaxes/sections/SecFilter.sk b/src/test/skript/tests/syntaxes/sections/SecFilter.sk
new file mode 100644
index 00000000000..697d6789a6f
--- /dev/null
+++ b/src/test/skript/tests/syntaxes/sections/SecFilter.sk
@@ -0,0 +1,35 @@
+test "filter":
+	set {_a::*} to integers between -10 and 10
+
+	assert size of {_a::*} is 21 with "invalid starting size"
+
+	filter {_a::*} to match:
+		mod(input, 2) = 0
+
+	assert size of {_a::*} is 11 with "failed to filter on mod()"
+	assert {_a::*} is -10, -8, -6, -4 ,-2, 0, 2, 4, 6, 8, and 10 with "failed to filter on mod()"
+
+
+	set {_a::*} to integers between -10 and 10
+
+	assert size of {_a::*} is 21 with "invalid starting size"
+
+	filter {_a::*} to match:
+		input is a number
+		mod(input, 2) = 0
+		input > 0
+
+	assert size of {_a::*} is 5 with "failed to filter on mod(), >0, is number"
+	assert {_a::*} is 2, 4, 6, 8, and 10 with "failed to filter on mod(), >0, is number"
+
+
+	set {_a::*} to integers between -10 and 10
+
+	assert size of {_a::*} is 21 with "invalid starting size"
+
+	filter {_a::*} to match any:
+		mod(input, 2) = 0
+		input > 0
+
+	assert size of {_a::*} is 16 with "failed to filter on any of mod(), >0"
+	assert {_a::*} is -10, -8, -6, -4, -2, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, and 10 with "failed to filter on any of mod(), >0"
diff --git a/src/test/skript/tests/syntaxes/sections/SecFor.sk b/src/test/skript/tests/syntaxes/sections/SecFor.sk
new file mode 100644
index 00000000000..adaea6b36b4
--- /dev/null
+++ b/src/test/skript/tests/syntaxes/sections/SecFor.sk
@@ -0,0 +1,61 @@
+using for each loops
+
+test "for section":
+
+	set {_list::*} to 1, 5, and 10
+	set {_expect} to 0
+	for {_value} in {_list::*}:
+		assert {_value} is greater than 0 with "Expected value > 0, found %{_value}%"
+		set {_expect} to {_value}
+
+	assert {_value} is 10 with "Expected value = 10, found %{_value}%"
+	assert {_expect} is 10 with "Expected expect = 10, found %{_expect}%"
+
+	delete {_key}
+	delete {_value}
+
+	for {_key}, {_value} in {_list::*}:
+		assert {_key} is greater than 0 with "Expected key > 0, found %{_key}%"
+		assert {_key} is less than 4 with "Expected key < 4, found %{_key}%"
+		assert {_value} is greater than 0 with "Expected value > 0, found %{_value}%"
+
+	assert {_key} is 3 with "Expected key = 3, found %{_key}%"
+	assert {_value} is 10 with "Expected value = 10, found %{_value}%"
+
+	delete {_key}
+	delete {_value}
+
+
+	for key {_key} and value {_value} in {_list::*}:
+		assert {_key} is greater than 0 with "Expected key > 0, found %{_key}%"
+		assert {_key} is less than 4 with "Expected key < 4, found %{_key}%"
+		assert {_value} is greater than 0 with "Expected value > 0, found %{_value}%"
+
+	assert {_key} is 3 with "Expected key = 3, found %{_key}%"
+	assert {_value} is 10 with "Expected value = 10, found %{_value}%"
+
+	delete {_key}
+	delete {_value}
+
+	for {_key} and {_value} in {_list::*}:
+		assert {_key} is greater than 0 with "Expected key > 0, found %{_key}%"
+		assert {_key} is less than 4 with "Expected key < 4, found %{_key}%"
+		assert {_value} is greater than 0 with "Expected value > 0, found %{_value}%"
+
+	assert {_key} is 3 with "Expected key = 3, found %{_key}%"
+	assert {_value} is 10 with "Expected value = 10, found %{_value}%"
+
+	delete {_key}
+	delete {_value}
+
+	# 'loop' syntax alternative
+	loop {_key} and {_value} in {_list::*}:
+		assert {_key} is greater than 0 with "Expected key > 0, found %{_key}%"
+		assert {_key} is less than 4 with "Expected key < 4, found %{_key}%"
+		assert {_value} is greater than 0 with "Expected value > 0, found %{_value}%"
+
+	assert {_key} is 3 with "Expected key = 3, found %{_key}%"
+	assert {_value} is 10 with "Expected value = 10, found %{_value}%"
+
+	delete {_key}
+	delete {_value}
diff --git a/src/test/skript/tests/syntaxes/sections/SecParse.sk b/src/test/skript/tests/syntaxes/sections/SecParse.sk
index 4478e781ff3..99ed6ec8041 100644
--- a/src/test/skript/tests/syntaxes/sections/SecParse.sk
+++ b/src/test/skript/tests/syntaxes/sections/SecParse.sk
@@ -1,8 +1,8 @@
 test "parsing section":
-  parse:
-    parse:
-      # intentionally empty to cause an error
-  assert last parse logs contain "A parse section must contain code" with "Parse section didn't return expected error"
-  parse:
-    set {_x} to {_y} # valid code
-  assert last parse logs is not set with "Parse section contained errors when code was valid"
+	parse:
+		parse:
+			# intentionally empty to cause an error
+	assert last parse logs contain "A parse section must contain code" with "Parse section didn't return expected error"
+	parse:
+		set {_x} to {_y} # valid code
+	assert last parse logs is not set with "Parse section contained errors when code was valid"
diff --git a/src/test/skript/tests/syntaxes/structures/EvtCommand.sk b/src/test/skript/tests/syntaxes/structures/EvtCommand.sk
new file mode 100644
index 00000000000..b3bc71faf5f
--- /dev/null
+++ b/src/test/skript/tests/syntaxes/structures/EvtCommand.sk
@@ -0,0 +1,24 @@
+
+
+on command "testing1":
+	add 1 to {evt-command::one command}
+
+
+on command "testing1 argument":
+	add 1 to {evt-command::one command with argument}
+
+on command "testing1" or "testing2":
+	add 1 to {evt-command::both}
+
+test "command event":
+	execute console command "/testing1"
+	execute console command "/testing1 argument"
+	execute console command "/testing1 argument 2"
+	execute console command "/testing2"
+	execute console command "/testing2 argument"
+
+	assert {evt-command::one command} is 3 with "testing1 command event triggered the wrong amount of times"
+	assert {evt-command::one command with argument} is 2 with "testing1 argument command event triggered the wrong amount of times"
+	assert {evt-command::both} is 5 with "testing1 or testing2 command event triggered the wrong amount of times"
+
+	delete {evt-command::*}
diff --git a/src/test/skript/tests/syntaxes/structures/StructCommand.sk b/src/test/skript/tests/syntaxes/structures/StructCommand.sk
index 3faa74c756b..77915a6a788 100644
--- a/src/test/skript/tests/syntaxes/structures/StructCommand.sk
+++ b/src/test/skript/tests/syntaxes/structures/StructCommand.sk
@@ -5,14 +5,14 @@ test "commands":
 options:
 	command: skriptcommand
 
-command {@command} <text> [<text>] [<itemtype = %dirt block named "steve"%>]:
+command {@command} <text> [<text>] [<itemtype = %dirt named "steve"%>]:
 	trigger:
 		set {_arg1} to arg-1
 		assert {_arg1} is "taco" with "arg-1 test failed (got '%{_arg1}%')"
 		set {_arg2} to arg-2
 		assert {_arg2} is not set with "arg-2 test failed (got '%{_arg2}%')"
 		set {_arg3} to arg-3
-		assert {_arg3} is a dirt block named "steve" with "arg-3 test failed (got '%{_arg3}%')"
+		assert {_arg3} is dirt named "steve" with "arg-3 test failed (got '%{_arg3}%')"
 
 command //somecommand [<text>]:
 	trigger:
diff --git a/src/test/skript/tests/syntaxes/structures/StructExample.sk b/src/test/skript/tests/syntaxes/structures/StructExample.sk
new file mode 100644
index 00000000000..9756a751f7f
--- /dev/null
+++ b/src/test/skript/tests/syntaxes/structures/StructExample.sk
@@ -0,0 +1,21 @@
+using examples
+
+example:
+	# None of this should be run
+	broadcast "foo bar"
+	wait 1 second
+	broadcast "hello world"
+
+example:
+	spawn a pig at spawn of world "world"
+
+parse:
+	results: {examples::*}
+	code:
+		example:
+			aldhfgfkudshgk
+
+test "examples":
+	# Examples should get parsed
+	assert {examples::*} contains "Can't understand this condition/effect: aldhfgfkudshgk" with "%{examples::*}%"
+	delete {examples::*}
diff --git a/src/test/skript/tests/syntaxes/structures/StructParse.sk b/src/test/skript/tests/syntaxes/structures/StructParse.sk
index 5b249535d36..33d5973a1c0 100644
--- a/src/test/skript/tests/syntaxes/structures/StructParse.sk
+++ b/src/test/skript/tests/syntaxes/structures/StructParse.sk
@@ -1,11 +1,11 @@
 parse:
-  results: {StructParse::parse::*}
-  code:
-    parse:
-      results: "oops"
-      code:
-        on script load:
-          broadcast "hi"
+	results: {StructParse::parse::*}
+	code:
+		parse:
+			results: "oops"
+			code:
+				on script load:
+					broadcast "hi"
 
 test "StructParse":
-  assert {StructParse::parse::*} contains """oops"" cannot be set to strings" with "StructParse error not found"
\ No newline at end of file
+	assert {StructParse::parse::*} contains """oops"" cannot be set to strings" with "StructParse error not found"