Merge branch 'dev/feature' into feature/modularization

Author: sovdeeth

.github/CODEOWNERS

@@ -70,3 +70,6 @@
 
 # EntityData
 /src/main/java/ch/njol/skript/entity @Absolutionism @skriptlang/core-developers
+
+# Particles/Effects
+/src/main/java/org/skriptlang/skript/bukkit/particles @sovdeeth @skriptlang/core-developers

.github/ISSUE_TEMPLATE/bug-report.yml

@@ -7,8 +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.13, the oldest supported version has been raised to Paper 1.20.4.
-        Any issues created for versions older than 1.20.4, or for Spigot, will not be looked into or fixed unless the issue persists on supported versions.
+        As of the release of Skript 2.14, the oldest supported version has been raised to Paper 1.21.0.
+        Any issues created for versions older than 1.21.0, or for Spigot, will not be looked into or fixed unless the issue persists on supported versions.
   - type: textarea
     attributes:
       label: Skript/Server Version

.github/contributing.md

@@ -80,7 +80,7 @@ We welcome contributions from everyone. To get started, please fork the reposito
 and clone it to your local machine. If you are unfamiliar with Git, please refer to the
 [Git documentation](https://git-scm.com/learn).
 ```
-git clone https://github.com/SkriptLang/Skript
+git clone https://github.com/SkriptLang/Skript --recurse-submodules
 ```
 
 Create a new branch for your changes. Use a descriptive name for the branch,

gradle.properties

@@ -5,7 +5,7 @@ org.gradle.parallel=true
 
 groupid=ch.njol
 name=skript
-version=2.13.2
+version=2.14.0-pre1
 jarName=Skript.jar
 testEnv=java21/paper-1.21.11
 testEnvJavaVersion=21

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

@@ -415,7 +415,7 @@ public void onEnable() {
 					if (!aliasesFolder.mkdirs())
 						throw new IOException("Could not create the directory " + aliasesFolder);
 				}
-				
+
 				f = new ZipFile(getFile());
 				for (ZipEntry e : new EnumerationIterable<ZipEntry>(f.entries())) {
 					if (e.isDirectory())
@@ -567,7 +567,9 @@ public void onEnable() {
 			LootTableModule.load();
 			skript.loadModules(
 				new CommonModule(),
-				new BukkitModule());
+				new BukkitModule(),
+				new InteractionModule(),
+				new ParticleModule());
 		} catch (final Exception e) {
 			exception(e, "Could not load required .class files: " + e.getLocalizedMessage());
 			setEnabled(false);
@@ -1395,7 +1397,7 @@ private static void stopAcceptingRegistrations() {
 	 * @deprecated Use {@link org.skriptlang.skript.Skript#registerAddon(Class, String)}.
 	 * Obtain a Skript instance with {@link #instance()}.
 	 */
-	@Deprecated(since = "INSERT VERSION", forRemoval = true)
+	@Deprecated(since = "2.14", forRemoval = true)
 	public static SkriptAddon registerAddon(JavaPlugin plugin) {
 		checkAcceptRegistrations();
 		SkriptAddon addon = new SkriptAddon(plugin);
@@ -1408,7 +1410,7 @@ public static SkriptAddon registerAddon(JavaPlugin plugin) {
 	 * Consider using {@link #getAddon(String)} with the name of the plugin ({@link JavaPlugin#getName()}).
 	 * Obtain a Skript instance with {@link #instance()}.
 	 */
-	@Deprecated(since = "INSERT VERSION", forRemoval = true)
+	@Deprecated(since = "2.14", forRemoval = true)
 	public static @Nullable SkriptAddon getAddon(JavaPlugin plugin) {
 		if (plugin == Skript.getInstance()) {
 			return Skript.getAddonInstance();
@@ -1425,7 +1427,7 @@ public static SkriptAddon registerAddon(JavaPlugin plugin) {
 	 * @deprecated Use {@link org.skriptlang.skript.Skript#addon(String)}.
 	 * Obtain a Skript instance with {@link #instance()}.
 	 */
-	@Deprecated(since = "INSERT VERSION", forRemoval = true)
+	@Deprecated(since = "2.14", forRemoval = true)
 	public static @Nullable SkriptAddon getAddon(String name) {
 		if (name.equals(Skript.getInstance().getName())) {
 			return Skript.getAddonInstance();
@@ -1442,7 +1444,7 @@ public static SkriptAddon registerAddon(JavaPlugin plugin) {
 	 * @deprecated Use {@link org.skriptlang.skript.Skript#addons()}.
 	 * Obtain a Skript instance with {@link #instance()}.
 	 */
-	@Deprecated(since = "INSERT VERSION", forRemoval = true)
+	@Deprecated(since = "2.14", forRemoval = true)
 	public static @Unmodifiable Collection<SkriptAddon> getAddons() {
 		Set<SkriptAddon> addons = new HashSet<>(Skript.addons);
 		addons.addAll(instance().addons().stream()
@@ -1460,7 +1462,7 @@ public static SkriptAddon registerAddon(JavaPlugin plugin) {
 	 * @return A {@link SkriptAddon} representing Skript.
 	 * @deprecated Use {@link #instance()} instead.
 	 */
-	@Deprecated(since = "INSERT VERSION", forRemoval = true)
+	@Deprecated(since = "2.14", forRemoval = true)
 	public static SkriptAddon getAddonInstance() {
 		if (addon == null) {
 			addon = SkriptAddon.fromModern(instance());
@@ -1475,7 +1477,7 @@ public static SkriptAddon getAddonInstance() {
 	 * @deprecated This method exists solely for compatibility reasons.
 	 */
 	@ApiStatus.Internal
-	@Deprecated(since = "INSERT VERSION", forRemoval = true)
+	@Deprecated(since = "2.14", forRemoval = true)
 	public static Origin getSyntaxOrigin(Class<?> source) {
 		JavaPlugin plugin;
 		try {
@@ -1499,7 +1501,7 @@ public static Origin getSyntaxOrigin(Class<?> source) {
 	 * Create a {@link SyntaxInfo} with {@link SyntaxInfo#builder(Class)}.
 	 * Obtain a {@link SyntaxRegistry} through {@link org.skriptlang.skript.addon.SkriptAddon#syntaxRegistry()}.
 	 */
-	@Deprecated(since = "INSERT VERSION", forRemoval = true)
+	@Deprecated(since = "2.14", forRemoval = true)
 	public static <E extends Condition> void registerCondition(Class<E> conditionClass, String... patterns) throws IllegalArgumentException {
 		registerCondition(conditionClass, ConditionType.COMBINED, patterns);
 	}
@@ -1515,7 +1517,7 @@ public static <E extends Condition> void registerCondition(Class<E> conditionCla
 	 * Specify a custom priority ({@link SyntaxInfo.Builder#priority(Priority)}) to replace {@code type}.
 	 * Obtain a {@link SyntaxRegistry} through {@link org.skriptlang.skript.addon.SkriptAddon#syntaxRegistry()}.
 	 */
-	@Deprecated(since = "INSERT VERSION", forRemoval = true)
+	@Deprecated(since = "2.14", forRemoval = true)
 	public static <E extends Condition> void registerCondition(Class<E> conditionClass, ConditionType type, String... patterns) throws IllegalArgumentException {
 		checkAcceptRegistrations();
 		skript.syntaxRegistry().register(SyntaxRegistry.CONDITION, SyntaxInfo.builder(conditionClass)
@@ -1535,7 +1537,7 @@ public static <E extends Condition> void registerCondition(Class<E> conditionCla
 	 * Create a {@link SyntaxInfo} with {@link SyntaxInfo#builder(Class)}.
 	 * Obtain a {@link SyntaxRegistry} through {@link org.skriptlang.skript.addon.SkriptAddon#syntaxRegistry()}.
 	 */
-	@Deprecated(since = "INSERT VERSION", forRemoval = true)
+	@Deprecated(since = "2.14", forRemoval = true)
 	public static <E extends Effect> void registerEffect(Class<E> effectClass, String... patterns) throws IllegalArgumentException {
 		checkAcceptRegistrations();
 		skript.syntaxRegistry().register(SyntaxRegistry.EFFECT, SyntaxInfo.builder(effectClass)
@@ -1555,7 +1557,7 @@ public static <E extends Effect> void registerEffect(Class<E> effectClass, Strin
 	 * Create a {@link SyntaxInfo} with {@link SyntaxInfo#builder(Class)}.
 	 * Obtain a {@link SyntaxRegistry} through {@link org.skriptlang.skript.addon.SkriptAddon#syntaxRegistry()}.
 	 */
-	@Deprecated(since = "INSERT VERSION", forRemoval = true)
+	@Deprecated(since = "2.14", forRemoval = true)
 	public static <E extends Section> void registerSection(Class<E> sectionClass, String... patterns) throws IllegalArgumentException {
 		checkAcceptRegistrations();
 		skript.syntaxRegistry().register(SyntaxRegistry.SECTION, SyntaxInfo.builder(sectionClass)
@@ -1569,7 +1571,7 @@ public static <E extends Section> void registerSection(Class<E> sectionClass, St
 	 * @deprecated Use {@link SyntaxRegistry#syntaxes(Key)} with {@link SyntaxRegistry#STATEMENT}.
 	 * Obtain a {@link SyntaxRegistry} through {@link org.skriptlang.skript.addon.SkriptAddon#syntaxRegistry()}.
 	 */
-	@Deprecated(since = "INSERT VERSION", forRemoval = true)
+	@Deprecated(since = "2.14", forRemoval = true)
 	public static @Unmodifiable Collection<SyntaxElementInfo<? extends Statement>> getStatements() {
 		return instance().syntaxRegistry()
 				.syntaxes(SyntaxRegistry.STATEMENT).stream()
@@ -1581,7 +1583,7 @@ public static <E extends Section> void registerSection(Class<E> sectionClass, St
 	 * @deprecated Use {@link SyntaxRegistry#syntaxes(Key)} with {@link SyntaxRegistry#CONDITION}.
 	 * Obtain a {@link SyntaxRegistry} through {@link org.skriptlang.skript.addon.SkriptAddon#syntaxRegistry()}.
 	 */
-	@Deprecated(since = "INSERT VERSION", forRemoval = true)
+	@Deprecated(since = "2.14", forRemoval = true)
 	public static @Unmodifiable Collection<SyntaxElementInfo<? extends Condition>> getConditions() {
 		return instance().syntaxRegistry()
 				.syntaxes(SyntaxRegistry.CONDITION).stream()
@@ -1593,7 +1595,7 @@ public static <E extends Section> void registerSection(Class<E> sectionClass, St
 	 * @deprecated Use {@link SyntaxRegistry#syntaxes(Key)} with {@link SyntaxRegistry#EFFECT}.
 	 * Obtain a {@link SyntaxRegistry} through {@link org.skriptlang.skript.addon.SkriptAddon#syntaxRegistry()}.
 	 */
-	@Deprecated(since = "INSERT VERSION", forRemoval = true)
+	@Deprecated(since = "2.14", forRemoval = true)
 	public static @Unmodifiable Collection<SyntaxElementInfo<? extends Effect>> getEffects() {
 		return instance().syntaxRegistry()
 				.syntaxes(SyntaxRegistry.EFFECT).stream()
@@ -1605,7 +1607,7 @@ public static <E extends Section> void registerSection(Class<E> sectionClass, St
 	 * @deprecated Use {@link SyntaxRegistry#syntaxes(Key)} with {@link SyntaxRegistry#SECTION}.
 	 * Obtain a {@link SyntaxRegistry} through {@link org.skriptlang.skript.addon.SkriptAddon#syntaxRegistry()}.
 	 */
-	@Deprecated(since = "INSERT VERSION", forRemoval = true)
+	@Deprecated(since = "2.14", forRemoval = true)
 	public static @Unmodifiable Collection<SyntaxElementInfo<? extends Section>> getSections() {
 		return instance().syntaxRegistry()
 				.syntaxes(SyntaxRegistry.SECTION).stream()
@@ -1628,7 +1630,7 @@ public static <E extends Section> void registerSection(Class<E> sectionClass, St
 	 * Specify a custom priority ({@link SyntaxInfo.Builder#priority(Priority)}) to replace {@code type}.
 	 * Obtain a {@link SyntaxRegistry} through {@link org.skriptlang.skript.addon.SkriptAddon#syntaxRegistry()}.
 	 */
-	@Deprecated(since = "INSERT VERSION", forRemoval = true)
+	@Deprecated(since = "2.14", forRemoval = true)
 	public static <E extends Expression<T>, T> void registerExpression(
 		Class<E> expressionClass, Class<T> returnType, ExpressionType type, String... patterns
 	) throws IllegalArgumentException {
@@ -1645,7 +1647,7 @@ public static <E extends Expression<T>, T> void registerExpression(
 	 * @deprecated Use {@link SyntaxRegistry#syntaxes(Key)} with {@link SyntaxRegistry#EXPRESSION}.
 	 * Obtain a {@link SyntaxRegistry} through {@link org.skriptlang.skript.addon.SkriptAddon#syntaxRegistry()}.
 	 */
-	@Deprecated(since = "INSERT VERSION", forRemoval = true)
+	@Deprecated(since = "2.14", forRemoval = true)
 	public static Iterator<ExpressionInfo<?, ?>> getExpressions() {
 		List<ExpressionInfo<?, ?>> list = new ArrayList<>();
 		for (SyntaxInfo.Expression<?, ?> info : instance().syntaxRegistry().syntaxes(SyntaxRegistry.EXPRESSION))
@@ -1658,7 +1660,7 @@ public static <E extends Expression<T>, T> void registerExpression(
 	 * Use {@link SyntaxRegistry#syntaxes(Key)} with {@link SyntaxRegistry#SECTION} and filter the results.
 	 * Obtain a {@link SyntaxRegistry} through {@link org.skriptlang.skript.addon.SkriptAddon#syntaxRegistry()}.
 	 */
-	@Deprecated(since = "INSERT VERSION", forRemoval = true)
+	@Deprecated(since = "2.14", forRemoval = true)
 	public static Iterator<ExpressionInfo<?, ?>> getExpressions(Class<?>... returnTypes) {
 		return new CheckedIterator<>(getExpressions(), info -> {
 			if (info == null || info.returnType == Object.class)
@@ -1688,7 +1690,7 @@ public static <E extends Expression<T>, T> void registerExpression(
 	 * Obtain a {@link SyntaxRegistry} through {@link org.skriptlang.skript.addon.SkriptAddon#syntaxRegistry()}.
 	 */
 	@SuppressWarnings("unchecked")
-	@Deprecated(since = "INSERT VERSION", forRemoval = true)
+	@Deprecated(since = "2.14", forRemoval = true)
 	public static <E extends SkriptEvent> SkriptEventInfo<E> registerEvent(String name, Class<E> c, Class<? extends Event> event, String... patterns) {
 		return registerEvent(name, c, new Class[] {event}, patterns);
 	}
@@ -1706,7 +1708,7 @@ public static <E extends SkriptEvent> SkriptEventInfo<E> registerEvent(String na
 	 * Obtain a {@link SyntaxRegistry} through {@link org.skriptlang.skript.addon.SkriptAddon#syntaxRegistry()}.
 	 */
 	@SuppressWarnings("ConstantConditions") // caused by bad array annotations
-	@Deprecated(since = "INSERT VERSION", forRemoval = true)
+	@Deprecated(since = "2.14", forRemoval = true)
 	public static <E extends SkriptEvent> SkriptEventInfo<E> registerEvent(
 		String name, Class<E> eventClass, Class<? extends Event>[] events, String... patterns
 	) {
@@ -1723,7 +1725,7 @@ public static <E extends SkriptEvent> SkriptEventInfo<E> registerEvent(
 	 * Create a {@link SyntaxInfo.Structure} with {@link SyntaxInfo.Structure#builder(Class)}.
 	 * Obtain a {@link SyntaxRegistry} through {@link org.skriptlang.skript.addon.SkriptAddon#syntaxRegistry()}.
 	 */
-	@Deprecated(since = "INSERT VERSION", forRemoval = true)
+	@Deprecated(since = "2.14", forRemoval = true)
 	public static <E extends Structure> void registerStructure(Class<E> structureClass, String... patterns) {
 		checkAcceptRegistrations();
 		skript.syntaxRegistry().register(SyntaxRegistry.STRUCTURE, SyntaxInfo.Structure.builder(structureClass)
@@ -1738,7 +1740,7 @@ public static <E extends Structure> void registerStructure(Class<E> structureCla
 	 * Create a {@link SyntaxInfo.Structure} with {@link SyntaxInfo.Structure#builder(Class)}.
 	 * Obtain a {@link SyntaxRegistry} through {@link org.skriptlang.skript.addon.SkriptAddon#syntaxRegistry()}.
 	 */
-	@Deprecated(since = "INSERT VERSION", forRemoval = true)
+	@Deprecated(since = "2.14", forRemoval = true)
 	public static <E extends Structure> void registerSimpleStructure(Class<E> structureClass, String... patterns) {
 		checkAcceptRegistrations();
 		skript.syntaxRegistry().register(SyntaxRegistry.STRUCTURE, SyntaxInfo.Structure.builder(structureClass)
@@ -1754,7 +1756,7 @@ public static <E extends Structure> void registerSimpleStructure(Class<E> struct
 	 * Create a {@link SyntaxInfo.Structure} with {@link SyntaxInfo.Structure#builder(Class)}.
 	 * Obtain a {@link SyntaxRegistry} through {@link org.skriptlang.skript.addon.SkriptAddon#syntaxRegistry()}.
 	 */
-	@Deprecated(since = "INSERT VERSION", forRemoval = true)
+	@Deprecated(since = "2.14", forRemoval = true)
 	public static <E extends Structure> void registerStructure(
 		Class<E> structureClass, EntryValidator entryValidator, String... patterns
 	) {
@@ -1766,7 +1768,7 @@ public static <E extends Structure> void registerStructure(
 	 * Create a {@link SyntaxInfo.Structure} with {@link SyntaxInfo.Structure#builder(Class)}.
 	 * Obtain a {@link SyntaxRegistry} through {@link org.skriptlang.skript.addon.SkriptAddon#syntaxRegistry()}.
 	 */
-	@Deprecated(since = "INSERT VERSION", forRemoval = true)
+	@Deprecated(since = "2.14", forRemoval = true)
 	public static <E extends Structure> void registerStructure(
 		Class<E> structureClass, EntryValidator entryValidator, DefaultSyntaxInfos.Structure.NodeType nodeType, String... patterns
 	) {
@@ -1784,7 +1786,7 @@ public static <E extends Structure> void registerStructure(
 	 * @deprecated Use {@link SyntaxRegistry#syntaxes(Key)} with {@link BukkitSyntaxInfos.Event#KEY}.
 	 * Obtain a {@link SyntaxRegistry} through {@link org.skriptlang.skript.addon.SkriptAddon#syntaxRegistry()}.
 	 */
-	@Deprecated(since = "INSERT VERSION", forRemoval = true)
+	@Deprecated(since = "2.14", forRemoval = true)
 	public static @Unmodifiable Collection<SkriptEventInfo<?>> getEvents() {
 		return instance().syntaxRegistry()
 				.syntaxes(BukkitSyntaxInfos.Event.KEY).stream()
@@ -1796,7 +1798,7 @@ public static <E extends Structure> void registerStructure(
 	 * @deprecated Use {@link SyntaxRegistry#syntaxes(Key)} with {@link SyntaxRegistry#STRUCTURE}.
 	 * Obtain a {@link SyntaxRegistry} through {@link org.skriptlang.skript.addon.SkriptAddon#syntaxRegistry()}.
 	 */
-	@Deprecated(since = "INSERT VERSION", forRemoval = true)
+	@Deprecated(since = "2.14", forRemoval = true)
 	public static @Unmodifiable List<StructureInfo<? extends Structure>> getStructures() {
 		return instance().syntaxRegistry()
 				.syntaxes(SyntaxRegistry.STRUCTURE).stream()

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

@@ -21,7 +21,7 @@
  * Register using {@link org.skriptlang.skript.Skript#registerAddon(Class, String)}.
  * Obtain a Skript instance with {@link Skript#instance()}.
  */
-@Deprecated(since = "INSERT VERSION", forRemoval = true)
+@Deprecated(since = "2.14", forRemoval = true)
 public final class SkriptAddon implements org.skriptlang.skript.addon.SkriptAddon {
 
 	public final JavaPlugin plugin;

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

@@ -294,8 +294,8 @@ public static String formatDate(final long timestamp) {
 			})
 			.optional(true);
 
-	public static final Option<Boolean> useTypeProperties = new Option<>("use type properties", false)
-			.optional(true);
+	public static final Option<Boolean> useTypeProperties = new Option<>("use type properties", true)
+			.optional(false);
 
 	public static final Option<Boolean> allowUnsafePlatforms = new Option<>("allow unsafe platforms", false)
 			.optional(true);

src/main/java/ch/njol/skript/bukkitutil/BukkitUtils.java

@@ -46,7 +46,7 @@ public static boolean registryExists(String registry) {
 	 * @deprecated Use {@link Registry#MOB_EFFECT} or {@link Registry#EFFECT} depending on your version.
 	 */
 	@SuppressWarnings("NullableProblems")
-	@Deprecated(since = "INSERT VERSION", forRemoval = true)
+	@Deprecated(since = "2.14", forRemoval = true)
 	public static @Nullable Registry<PotionEffectType> getPotionEffectTypeRegistry() {
 		if (registryExists("MOB_EFFECT")) { // Paper (1.21.4)
 			return Registry.MOB_EFFECT;

src/main/java/ch/njol/skript/classes/ClassInfo.java

@@ -17,7 +17,7 @@
 import org.skriptlang.skript.addon.SkriptAddon;
 import org.skriptlang.skript.lang.properties.Property;
 import org.skriptlang.skript.lang.properties.Property.PropertyInfo;
-import org.skriptlang.skript.lang.properties.PropertyHandler;
+import org.skriptlang.skript.lang.properties.handlers.base.PropertyHandler;
 
 import java.util.*;
 import java.util.function.Supplier;

src/main/java/ch/njol/skript/classes/EnumParser.java

@@ -20,7 +20,7 @@ public class EnumParser<E extends Enum<E>> extends PatternedParser<E> implements
 	private final Class<E> enumClass;
 	private final String languageNode;
 	private String[] names;
-	private final Map<String, E> parseMap = new HashMap<>();
+	protected final Map<String, E> parseMap = new HashMap<>();
 	private String[] patterns;
 
 	/**
@@ -65,11 +65,17 @@ void refresh() {
 				String first = strippedOption.getFirst();
 				Integer second = strippedOption.getSecond();
 
+				NonNullPair<String, String> singlePlural = Noun.getPlural(first);
+				String single = singlePlural.getFirst();
+				String plural = singlePlural.getSecond();
+
 				if (names[ordinal] == null) { // Add to name array if needed
-					names[ordinal] = first;
+					names[ordinal] = single;
 				}
 
-				parseMap.put(first, constant);
+				parseMap.put(single, constant);
+				if (!plural.isEmpty())
+					parseMap.put(plural, constant);
 				if (second != -1) { // There is a gender present
 					parseMap.put(Noun.getArticleWithSpace(second, Language.F_INDEFINITE_ARTICLE) + first, constant);
 				}