Merge branch 'dev/feature' into feature/custom-model-data

Author: APickledWalrus

LICENSING.md

@@ -0,0 +1,48 @@
+Skript is licensed under the [GNU General Public License (Version 3)](LICENSE).
+
+However, to foster a better open-source community, and in the interest of further opening this project in the future,
+we ask that contributors release their code under the MIT License.
+Since it is less restrictive than GPLv3, it provides us and other developers
+with greater flexibility when making use of contributed code.
+
+To learn more about this license, you can visit [choosealicense.com](https://choosealicense.com/licenses/mit/).
+You can also view the full text of the license below:
+<details>
+<summary>MIT License</summary>
+
+```text
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+```
+</details>
+
+If you wish to release your contributions to this repository under the MIT License,
+please add your name below in your pull request.
+
+When adding your name, please follow the example format below:
+
+`<name> (<commit email address>)`
+> [!NOTE]
+> For name, you may choose to use your real name or GitHub account name. \
+> If you use more than one commit email address, please include all of them.
+
+```text
+APickledWalrus (apickledwalrus@icloud.com, apickledwalrus@gmail.com)
+Sovde (10354869+sovdeeth@users.noreply.github.com)
+UnderscoreTud (98935832+UnderscoreTud@users.noreply.github.com)
+```

README.md

@@ -191,5 +191,6 @@ contact us about any problems you might have with them.
 ## Developers
 You can find all contributors [here](https://github.com/SkriptLang/Skript/graphs/contributors).
 
-All code is owned by its writer, licensed for others under GPLv3 (see LICENSE)
-unless otherwise specified.
+All code is owned by its writer, licensed for others under GPLv3 (see [LICENSE](LICENSE)).
+Some contributors may choose to release their code under the MIT License.
+Further information can be found within [LICENSING.md](LICENSING.md).

build.gradle

@@ -29,7 +29,7 @@ dependencies {
 	shadow group: 'org.bstats', name: 'bstats-bukkit', version: '3.1.0'
 	shadow group: 'net.kyori', name: 'adventure-text-serializer-bungeecord', version: '4.4.0'
 
-	implementation group: 'io.papermc.paper', name: 'paper-api', version: '1.21.5-R0.1-SNAPSHOT'
+	implementation group: 'io.papermc.paper', name: 'paper-api', version: '1.21.7-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
@@ -246,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.5.json'
+def latestEnv = 'java21/paper-1.21.7.json'
 def latestJava = java21
 def oldestJava = java17
 

code-conventions.md

@@ -64,6 +64,8 @@ With the exception of contacting our own resources (e.g. to check for updates) c
 ## Licensing
 
 Code contributed must be licensed under GPLv3, by **you**.
+Some contributors may choose to release their code under the MIT License.
+Further information can be found within [LICENSING.md](LICENSING.md).
 We expect that any code you contribute is either owned by you or you have explicit permission to provide and license it to us.
 
 Licenses do not need to be printed in individual files (or packages) unless the licence applying to the code in

gradle.properties

@@ -7,5 +7,5 @@ groupid=ch.njol
 name=skript
 version=2.11.2
 jarName=Skript.jar
-testEnv=java21/paper-1.21.5
+testEnv=java21/paper-1.21.7
 testEnvJavaVersion=21

settings.gradle

@@ -1,6 +1,6 @@
 
 plugins {
-    id 'org.gradle.toolchains.foojay-resolver-convention' version '0.8.0'
+    id 'org.gradle.toolchains.foojay-resolver-convention' version '1.0.0'
 }
 
 rootProject.name = 'Skript'

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

@@ -5,6 +5,7 @@
 import ch.njol.skript.config.SectionNode;
 import ch.njol.skript.config.SimpleNode;
 import ch.njol.skript.events.bukkit.PreScriptLoadEvent;
+import ch.njol.skript.lang.ExecutionIntent;
 import ch.njol.skript.lang.Section;
 import ch.njol.skript.lang.SkriptParser;
 import ch.njol.skript.lang.Statement;
@@ -20,7 +21,7 @@
 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.skript.variables.HintManager;
 import ch.njol.util.NonNullPair;
 import ch.njol.util.OpenCloseable;
 import ch.njol.util.StringUtils;
@@ -951,6 +952,14 @@ public static ArrayList<TriggerItem> loadItems(SectionNode node) {
 
 		ArrayList<TriggerItem> items = new ArrayList<>();
 
+		// Begin local variable type hints
+		parser.getHintManager().enterScope(true);
+		// Track if the scope has been frozen
+		// This is the case when a statement that stops further execution is encountered
+		// Further statements would not run, meaning the hints from them are inaccurate
+		// When true, before exiting the scope, its hints are cleared to avoid passing them up
+		boolean freezeScope = false;
+
 		boolean executionStops = false;
 		for (Node subNode : node) {
 			parser.setNode(subNode);
@@ -983,11 +992,18 @@ public static ArrayList<TriggerItem> loadItems(SectionNode node) {
 
 				items.add(item);
 			} else if (subNode instanceof SectionNode subSection) {
-				TypeHints.enterScope(); // Begin conditional type hints
 
 				RetainingLogHandler handler = SkriptLogger.startRetainingLog();
 				find_section:
 				try {
+					// enter capturing scope
+					// it is possible that the line may successfully parse and initialize (via init), but some other issue
+					// prevents it from being able to load. for example:
+					// - a statement with a section that has no expression to claim the section
+					// - a statement with a section that has multiple expressions attempting to claim the section
+					// thus, hints may be added, but we do not want to save them as the line is invalid
+					parser.getHintManager().enterScope(false);
+
 					item = Section.parse(expr, "Can't understand this section: " + expr, subSection, items);
 					if (item != null)
 						break find_section;
@@ -1014,6 +1030,13 @@ public static ArrayList<TriggerItem> loadItems(SectionNode node) {
 					}
 					continue;
 				} finally {
+					// exit hint scope (see above)
+					HintManager hintManager = parser.getHintManager();
+					if (item == null) { // unsuccessful, wipe out hints
+						hintManager.clearScope(0, false);
+					}
+					hintManager.exitScope();
+
 					RetainingLogHandler afterParse = handler.backup();
 					handler.clear();
 					handler.printLog();
@@ -1023,9 +1046,6 @@ public static ArrayList<TriggerItem> loadItems(SectionNode node) {
 				}
 
 				items.add(item);
-
-				// Destroy these conditional type hints
-				TypeHints.exitScope();
 			} else {
 				continue;
 			}
@@ -1037,7 +1057,24 @@ public static ArrayList<TriggerItem> loadItems(SectionNode node) {
 				Skript.warning("Unreachable code. The previous statement stops further execution.");
 			}
 			executionStops = item.executionIntent() != null;
+
+			if (executionStops && !freezeScope) {
+				freezeScope = true;
+				// Execution might stop for some sections but not all
+				// We want to pass hints up to the scope that execution resumes in
+				if (item.executionIntent() instanceof ExecutionIntent.StopSections intent) {
+					parser.getHintManager().mergeScope(0, intent.levels(), true);
+				}
+			}
+		}
+
+		// If the scope was frozen, then we need to clear it to prevent passing up inaccurate hints
+		// They will have already been copied as necessary
+		if (freezeScope) {
+			parser.getHintManager().clearScope(0, false);
 		}
+		// Destroy local variable type hints for this section
+		parser.getHintManager().exitScope();
 
 		for (int i = 0; i < items.size() - 1; i++)
 			items.get(i).setNext(items.get(i + 1));

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

@@ -1264,7 +1264,6 @@ public void onDisable() {
 		if (disabled)
 			return;
 		disabled = true;
-		this.experimentRegistry = null;
 
 		if (!partDisabled) {
 			beforeDisable();
@@ -1279,6 +1278,8 @@ public void onDisable() {
 				Skript.exception(e, "An error occurred while shutting down.", "This might or might not cause any issues.");
 			}
 		}
+
+		this.experimentRegistry = null;
 	}
 
 	// ================ CONSTANTS, OPTIONS & OTHER ================

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

@@ -1,7 +1,7 @@
 package ch.njol.skript;
 
+import ch.njol.skript.classes.EnumParser;
 import ch.njol.skript.config.Config;
-import ch.njol.skript.config.EnumParser;
 import ch.njol.skript.config.Option;
 import ch.njol.skript.config.OptionSection;
 import ch.njol.skript.hooks.Hook;
@@ -375,6 +375,10 @@ private static void userDisableHooks(Class<? extends Hook<?>> hookClass, boolean
 	public static final Option<Integer> variableChangesUntilSave = new Option<>("variable changes until save", 1000)
 		.setter(FlatFileStorage::setRequiredChangesForResave);
 
+	// intentionally not present in the config presented to the user. Users must manually add this option to disable it.
+	public static final Option<Boolean> simplifySyntaxesOnParse = new Option<>("simplify syntax on parse", true)
+		.optional(true);
+
 	/**
 	 * This should only be used in special cases
 	 */

src/main/java/ch/njol/skript/aliases/AliasesProvider.java

@@ -1,6 +1,5 @@
 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;
@@ -11,7 +10,6 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -24,9 +22,6 @@
  */
 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.
@@ -66,13 +61,7 @@ public AliasesProvider(int expectedCount, @Nullable AliasesProvider parent) {
 		this.aliases = new HashMap<>(expectedCount);
 		this.variations = new HashMap<>(expectedCount / 20);
 		this.aliasesMap = new AliasesMap();
-
-		if (FASTER_SET_SUPPORTED) {
-			this.materials = new ObjectOpenHashSet<>();
-		} else {
-			this.materials = new HashSet<>();
-		}
-
+		this.materials = new ObjectOpenHashSet<>();
 		this.gson = new Gson();
 	}