Variable Storage Improvements

build.gradle

@@ -44,6 +44,10 @@ dependencies {
 		exclude group: 'org.bukkit', module: 'bukkit'
 	}
 
+	// Libraries that are installed at runtime. See plugin.yml 'libraries' section.
+	implementation group: 'com.h2database', name: 'h2', version: project.property('h2.version')
+	implementation group: 'com.zaxxer', name: 'HikariCP', version: project.property('hikaricp.version')
+
 	implementation fileTree(dir: 'lib', include: '*.jar')
 
 	testShadow group: 'junit', name: 'junit', version: '4.13.2'
@@ -311,6 +315,15 @@ if (project.hasProperty('junit') && (project.property('junit') as String).toLowe
 createTestTask('customTest', 'Runs tests based on provided parameters.', customEnvironments, envJava, customTimeout, customModifiers.toArray(new Modifiers[0]) as Modifiers[])
 // end custom test task
 
+// Generic replace tokens, e.g: '@version@'
+tasks.withType(Copy).configureEach {
+	filter(ReplaceTokens, tokens: [
+		'today'            : '' + LocalTime.now(),
+		'h2.version'       : project.property('h2.version'),
+		'hikaricp.version' : project.property('hikaricp.version')
+	])
+}
+
 // Build flavor configurations
 tasks.register('githubResources', ProcessResources) {
 	from 'src/main/resources', {
@@ -321,7 +334,6 @@ tasks.register('githubResources', ProcessResources) {
 			channel = 'prerelease'
 		filter ReplaceTokens, tokens: [
 			'version'         : version,
-			'today'           : '' + LocalTime.now(),
 			'release-flavor'  : 'skriptlang-github', // SkriptLang build, distributed on Github
 			'release-channel' : channel, // Release channel, see above
 			'release-updater' : 'ch.njol.skript.update.GithubChecker', // Github API client
@@ -354,7 +366,6 @@ tasks.register('spigotResources', ProcessResources) {
 			channel = 'prerelease'
 		filter ReplaceTokens, tokens: [
 			'version'         : version,
-			'today'           : '' + LocalTime.now(),
 			'release-flavor'  : 'skriptlang-spigot', // SkriptLang build, distributed on Spigot resources
 			'release-channel' : channel, // Release channel, see above
 			'release-updater' : 'ch.njol.skript.update.GithubChecker', // Github API client
@@ -385,7 +396,6 @@ tasks.register('nightlyResources', ProcessResources) {
 		version = project.property('version') + '-nightly-' + hash
 		filter ReplaceTokens, tokens: [
 			'version'         : version,
-			'today'           : '' + LocalTime.now(),
 			'release-flavor'  : 'skriptlang-nightly', // SkriptLang build, automatically done by CI
 			'release-channel' : 'prerelease', // No update checking, but these are VERY unstable
 			'release-updater' : 'ch.njol.skript.update.NoUpdateChecker', // No auto updates for now

gradle.properties

@@ -9,3 +9,6 @@ version=2.14.0
 jarName=Skript.jar
 testEnv=java21/paper-1.21.11
 testEnvJavaVersion=21
+
+hikaricp.version=5.1.0
+h2.version=2.3.232

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

@@ -11,6 +11,10 @@
 
 import ch.njol.skript.util.Utils;
 import ch.njol.skript.util.Version;
+import ch.njol.skript.variables.VariableStorage;
+import ch.njol.skript.variables.Variables;
+
+import org.jetbrains.annotations.ApiStatus;
 import org.skriptlang.skript.localization.Localizer;
 import org.skriptlang.skript.registration.SyntaxRegistry;
 import org.skriptlang.skript.util.Registry;

src/main/java/ch/njol/skript/effects/Delay.java

@@ -14,6 +14,7 @@
 import ch.njol.skript.timings.SkriptTimings;
 import ch.njol.skript.util.Timespan;
 import ch.njol.skript.variables.Variables;
+import ch.njol.skript.variables.VariablesMap;
 import ch.njol.util.Kleenean;
 import org.bukkit.Bukkit;
 import org.bukkit.event.Event;
@@ -72,7 +73,7 @@ protected TriggerItem walk(Event event) {
 				return null;
 
 			// Back up local variables
-			Object localVars = Variables.removeLocals(event);
+			VariablesMap localVars = Variables.removeLocals(event);
 
 			Bukkit.getScheduler().scheduleSyncDelayedTask(Skript.getInstance(), () -> {
 				addDelayedEvent(event);

src/main/java/ch/njol/skript/effects/EffTeleport.java

@@ -9,6 +9,7 @@
 import ch.njol.skript.timings.SkriptTimings;
 import ch.njol.skript.util.Direction;
 import ch.njol.skript.variables.Variables;
+import ch.njol.skript.variables.VariablesMap;
 import ch.njol.util.Kleenean;
 import io.papermc.lib.PaperLib;
 import io.papermc.lib.environments.PaperEnvironment;
@@ -131,7 +132,7 @@ public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelaye
 		}
 
 		final Location fixed = location;
-		Object localVars = Variables.removeLocals(event);
+		VariablesMap 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(location).thenAccept(chunk -> {

src/main/java/ch/njol/skript/effects/IndeterminateDelay.java

@@ -1,5 +1,6 @@
 package ch.njol.skript.effects;
 
+import ch.njol.skript.variables.VariablesMap;
 import org.bukkit.Bukkit;
 import org.bukkit.event.Event;
 import org.jetbrains.annotations.Nullable;
@@ -28,7 +29,7 @@ protected TriggerItem walk(Event event) {
 				return null;
 
 			// Back up local variables
-			Object localVars = Variables.removeLocals(event);
+			VariablesMap localVars = Variables.removeLocals(event);
 
 			Bukkit.getScheduler().scheduleSyncDelayedTask(Skript.getInstance(), () -> {
 				Delay.addDelayedEvent(event);

src/main/java/ch/njol/skript/lang/Variable.java

@@ -1,12 +1,23 @@
 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.function.Predicate;
+import java.util.function.Function;
+
 import ch.njol.skript.Skript;
 import ch.njol.skript.SkriptAPIException;
 import ch.njol.skript.SkriptConfig;
 import ch.njol.skript.classes.Changer;
 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.VariableStorage;
+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;
@@ -27,21 +38,12 @@
 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;
-import org.skriptlang.skript.lang.arithmetic.Operator;
 import org.skriptlang.skript.lang.comparator.Comparators;
 import org.skriptlang.skript.lang.comparator.Relation;
 import org.skriptlang.skript.lang.converter.Converters;
 import org.skriptlang.skript.lang.script.Script;
 import org.skriptlang.skript.lang.script.ScriptWarning;
 
-import java.lang.reflect.Array;
-import java.util.*;
-import java.util.Map.Entry;
-import java.util.function.Function;
-import java.util.function.Predicate;
-
 public class Variable<T> implements Expression<T>, KeyReceiverExpression<T>, KeyProviderExpression<T> {
 
 	private final static String SINGLE_SEPARATOR_CHAR = ":";
@@ -403,7 +405,7 @@ public Iterator<KeyedValue<T>> keyedIterator(Event event) {
 		return Iterators.filter(transformed, Objects::nonNull);
 	}
 
-	public Iterator<Pair<String, Object>> variablesIterator(Event event) {
+	public Iterator<KeyedValue<Object>> variablesIterator(Event event) {
 		if (!list)
 			throw new SkriptAPIException("Looping a non-list variable");
 		return Variables.getVariableIterator(name.toString(event), local, event);