Merge branch 'dev/feature' into addition-brush-stuff

Author: sovdeeth

.github/CODEOWNERS

@@ -0,0 +1,65 @@
+# Changes in general
+* @skriptlang/core-developers
+
+# Protect github files
+/.github/ @skriptlang/core-maintainers
+
+# Changes to code (specified for future granularity)
+/src/main/java/ @skriptlang/core-developers
+
+# Changes to tests (specified for future granularity)
+/src/test/ @skriptlang/core-developers
+
+# Changes to critical code
+/src/main/java/org/skriptlang/skript/lang/ @skriptlang/core-maintainers @skriptlang/core-developers
+/src/main/java/ch/njol/skript/lang/ @skriptlang/core-maintainers @skriptlang/core-developers
+/src/main/java/ch/njol/skript/variables/ @skriptlang/core-maintainers @skriptlang/core-developers
+/src/main/java/ch/njol/yggdrasil/ @skriptlang/core-maintainers @skriptlang/core-developers
+/src/main/java/ch/njol/skript/Skript.java @skriptlang/core-maintainers @skriptlang/core-developers
+/src/main/java/ch/njol/skript/test/ @skriptlang/core-maintainers @skriptlang/core-developers
+/src/main/java/ch/njol/skript/patterns/ @skriptlang/core-maintainers @skriptlang/core-developers
+/src/main/java/ch/njol/skript/expressions/base/ @skriptlang/core-maintainers @skriptlang/core-developers
+/src/main/java/ch/njol/skript/conditions/base/ @skriptlang/core-maintainers @skriptlang/core-developers
+/src/main/java/ch/njol/skript/config/ @skriptlang/core-maintainers @skriptlang/core-developers
+/src/main/java/ch/njol/skript/classes/ @skriptlang/core-maintainers @skriptlang/core-developers
+/src/main/java/ch/njol/skript/classes/data/ @skriptlang/core-developers # classes is critical but classes/data is not
+
+# Personal specialties
+
+# Runtime errors
+/src/main/java/org/skriptlang/skript/log/runtime/ @sovdeeth @skriptlang/core-developers
+/src/main/java/org/skriptlang/skript/bukkit/log/runtime/ @sovdeeth @skriptlang/core-developers
+
+# Tags
+/src/main/java/org/skriptlang/skript/bukkit/tags/ @sovdeeth @skriptlang/core-developers
+
+# Conditionals
+/src/main/java/org/skriptlang/skript/lang/condition/ @sovdeeth @skriptlang/core-developers
+
+# Displays/Rotation
+/src/main/java/org/skriptlang/skript/bukkit/misc/rotation/ @sovdeeth @skriptlang/core-developers
+/src/main/java/org/skriptlang/skript/bukkit/displays/ @sovdeeth @skriptlang/core-developers
+
+# Commands
+/src/main/java/ch/njol/skript/command/ @sovdeeth @skriptlang/core-developers
+
+# Aliases
+/src/main/java/ch/njol/skript/aliases @sovdeeth @skriptlang/core-developers
+
+# Registration API
+/src/main/java/org/skriptlang/skript/registration/ @APickledWalrus @skriptlang/core-developers
+/src/main/java/org/skriptlang/skript/bukkit/registration/ @APickledWalrus @skriptlang/core-developers
+/src/main/java/org/skriptlang/skript/addon/ @APickledWalrus @skriptlang/core-developers
+
+# EntryData
+/src/main/java/org/skriptlang/skript/lang/entry/ @APickledWalrus @skriptlang/core-developers
+
+# Arithmetic
+/src/main/java/org/skriptlang/skript/lang/arithmetic/ @UnderscoreTud @skriptlang/core-developers
+/src/main/java/ch/njol/skript/expressions/arithmetic/ @UnderscoreTud @skriptlang/core-developers
+
+# Input API
+/src/main/java/org/skriptlang/skript/bukkit/input/ @UnderscoreTud @skriptlang/core-developers
+
+# Documentation
+/src/main/java/ch/njol/skript/doc/ @Pikachu920 @AyhamAl-Ali @Efnilite @skriptlang/core-developers

.github/pull_request_template.md

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

.gitignore

@@ -17,6 +17,9 @@ local.properties
 .project
 .classpath
 
+### VS CODE ###
+.vscode/
+
 # External tool builders
 .externalToolBuilders/
 

build.gradle

@@ -20,17 +20,16 @@ allprojects {
 		maven { url 'https://hub.spigotmc.org/nexus/content/repositories/snapshots/' }
 		maven { url 'https://oss.sonatype.org/content/repositories/snapshots/' }
 		maven { url 'https://repo.papermc.io/repository/maven-public/' }
-		maven { url = 'https://s01.oss.sonatype.org/content/repositories/snapshots/' } // needed for paper adventure snapshot
 		maven { url 'https://ci.emc.gs/nexus/content/groups/aikar/' }
 	}
 }
 
 dependencies {
 	shadow group: 'io.papermc', name: 'paperlib', version: '1.0.8'
 	shadow group: 'org.bstats', name: 'bstats-bukkit', version: '3.1.0'
-	shadow group: 'net.kyori', name: 'adventure-text-serializer-bungeecord', version: '4.3.4'
+	shadow group: 'net.kyori', name: 'adventure-text-serializer-bungeecord', version: '4.4.0'
 
-	implementation group: 'io.papermc.paper', name: 'paper-api', version: '1.21.4-R0.1-SNAPSHOT'
+	implementation group: 'io.papermc.paper', name: 'paper-api', version: '1.21.5-R0.1-SNAPSHOT'
 	implementation group: 'com.google.code.findbugs', name: 'findbugs', version: '3.0.1'
 
 	// bundled with Minecraft 1.19.4+ for display entity transforms
@@ -247,7 +246,7 @@ void createTestTask(String name, String desc, String environments, int javaVersi
 def java21 = 21
 def java17 = 17
 
-def latestEnv = 'java21/paper-1.21.4.json'
+def latestEnv = 'java21/paper-1.21.5.json'
 def latestJava = java21
 def oldestJava = java17
 

code-conventions.md

@@ -314,3 +314,14 @@ The exceptions are `Material.AIR`, which is a good way to represent "nothing"
 and `Material.STONE` which can be used to get a dummy `ItemMeta`.
 
 Prefer to avoid referencing the Biome enum directly, since it has changed between versons in the past.
+
+### Deprecating
+
+When deprecating a Java element (such as a class, method, or constructor):
+
+1. Replace all internal usages of the deprecated element within the Skript codebase.
+2. Add a Javadoc `@deprecated` tag that states the recommended alternative.
+3. Annotate the element with `@Deprecated(since = "INSERT VERSION", forRemoval = true)` to indicate it is scheduled for removal and what feature version it was deprecated.
+
+Deprecation PRs are typically merged for a feature release, so the PR should target `dev/feature` branch.
+Deprecated elements may be removed three feature releases after the version they were deprecated in.

gradle.properties

@@ -5,7 +5,7 @@ org.gradle.parallel=true
 
 groupid=ch.njol
 name=skript
-version=2.10.2
+version=2.11.2
 jarName=Skript.jar
-testEnv=java21/paper-1.21.4
+testEnv=java21/paper-1.21.5
 testEnvJavaVersion=21

skript-aliases

@@ -962,7 +962,7 @@ public static ArrayList<TriggerItem> loadItems(SectionNode node) {
 			if (!SkriptParser.validateLine(expr))
 				continue;
 
-			TriggerItem item;
+			TriggerItem item = null;
 			if (subNode instanceof SimpleNode) {
 				long start = System.currentTimeMillis();
 				item = Statement.parse(expr, items, "Can't understand this condition/effect: " + expr);
@@ -982,43 +982,46 @@ public static ArrayList<TriggerItem> loadItems(SectionNode node) {
 					Skript.debug(SkriptColor.replaceColorChar(parser.getIndentation() + item.toString(null, true)));
 
 				items.add(item);
-			} else if (subNode instanceof SectionNode) {
+			} else if (subNode instanceof SectionNode subSection) {
 				TypeHints.enterScope(); // Begin conditional type hints
 
 				RetainingLogHandler handler = SkriptLogger.startRetainingLog();
 				find_section:
 				try {
-					item = Section.parse(expr, "Can't understand this section: " + expr, (SectionNode) subNode, items);
+					item = Section.parse(expr, "Can't understand this section: " + expr, subSection, 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);
+					item = Statement.parse(expr, "Can't understand this condition/effect: " + expr, subSection, items);
 
 					if (item != null)
 						break find_section;
 					Collection<LogEntry> errors = handler.getErrors();
 
-					// restore the failure log
-					if (errors.isEmpty()) {
+					// restore the failure log if:
+					// 1. there are no errors from the statement parse
+					// 2. the error message is the default one from the statement parse
+					// 3. the backup log contains a message about the section being claimed
+					if (errors.isEmpty()
+						|| errors.iterator().next().getMessage().contains("Can't understand this condition/effect:")
+						|| backup.getErrors().iterator().next().getMessage().contains("tried to claim the current section, but it was already claimed by")
+					) {
 						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 {
+					RetainingLogHandler afterParse = handler.backup();
+					handler.clear();
 					handler.printLog();
+					if (item != null && (Skript.debug() || subNode.debug()))
+						Skript.debug(SkriptColor.replaceColorChar(parser.getIndentation() + item.toString(null, true)));
+					afterParse.printLog();
 				}
 
-				if (Skript.debug() || subNode.debug())
-					Skript.debug(SkriptColor.replaceColorChar(parser.getIndentation() + item.toString(null, true)));
-
 				items.add(item);
 
 				// Destroy these conditional type hints

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

@@ -210,7 +210,7 @@ public static void updateMinecraftVersion() {
 
 	@Nullable
 	private static Version version = null;
-	@Deprecated(forRemoval = true) // TODO this field will be replaced by a proper registry later
+	@Deprecated(since = "2.9.0", forRemoval = true) // TODO this field will be replaced by a proper registry later
 	private static @UnknownNullability ExperimentRegistry experimentRegistry;
 
 	public static Version getVersion() {
@@ -1077,18 +1077,6 @@ public static boolean isRunningMinecraft(final Version v) {
 		return minecraftVersion.compareTo(v) >= 0;
 	}
 
-	/**
-	 * Used to test whether certain Bukkit features are supported.
-	 *
-	 * @param className
-	 * @return Whether the given class exists.
-	 * @deprecated use {@link #classExists(String)}
-	 */
-	@Deprecated
-	public static boolean supports(final String className) {
-		return classExists(className);
-	}
-
 	/**
 	 * Tests whether a given class exists in the classpath.
 	 *
@@ -1379,7 +1367,7 @@ private static void stopAcceptingRegistrations() {
 
 	// ================ ADDONS ================
 
-	@Deprecated
+	@Deprecated(since = "2.10.0", forRemoval = true)
 	private static final Set<SkriptAddon> addons = new HashSet<>();
 
 	/**
@@ -1429,7 +1417,7 @@ public static SkriptAddon registerAddon(JavaPlugin plugin) {
 		return Collections.unmodifiableCollection(addons);
 	}
 
-	@Deprecated
+	@Deprecated(since = "2.10.0", forRemoval = true)
 	private static @Nullable SkriptAddon addon;
 
 	/**

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

@@ -514,10 +514,10 @@ private static List<File> getSubFiles(File file) {
 	}
 
 	/**
-	 * Moved to {@link ScriptLoader#getScriptFromName(String)}
+	 * @deprecated Use {@link ScriptLoader#getScriptFromName(String)} instead.
 	 */
 	@Nullable
-	@Deprecated(forRemoval = true)
+	@Deprecated(since = "2.10.0", forRemoval = true)
 	public static File getScriptFromName(String script) {
 		return ScriptLoader.getScriptFromName(script);
 	}