Merge branch 'dev/feature' into feature/default-value-api

Author: sovdeeth

.github/workflows/update-gradle-wrapper.yml

@@ -0,0 +1,47 @@
+name: Update the gradle wrapper to the latest version
+
+on:
+  schedule:
+    - cron: '0 0 * * 0'
+
+jobs:
+  update-gradle-wrapper:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: recursive
+      - 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: Get latest Gradle version
+        id: get_latest_gradle
+        run: |
+          response=$(curl -s https://services.gradle.org/versions/current)
+          latest_version=$(echo $response | jq -r '.version')
+          echo "LATEST_GRADLE_VERSION=$latest_version" >> $GITHUB_ENV
+          latest_download_url=$(echo $response | jq -r '.downloadUrl')
+          echo "LATEST_GRADLE_DOWNLOAD_URL=$latest_download_url" >> $GITHUB_ENV
+      - name: Update gradle-wrapper.properties
+        run: |
+          sed -i "s|^distributionUrl=.*$|distributionUrl=${LATEST_GRADLE_DOWNLOAD_URL}|" gradle/wrapper/gradle-wrapper.properties
+          ./gradlew wrapper --gradle-version ${LATEST_GRADLE_VERSION}
+      - name: Validate gradle wrapper
+        uses: gradle/wrapper-validation-action@v2
+      - name: Build Skript and run test scripts
+        run: ./gradlew clean quickTest
+      - name: Commit and push changes
+        if: success()
+        run: |
+          git config --global user.name 'github-actions[bot]'
+          git config --global user.email 'github-actions[bot]@users.noreply.github.com'
+          git add gradle/wrapper/
+          git commit -m "Update Gradle wrapper to ${LATEST_GRADLE_VERSION}"
+          git push

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.6-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.6.json'
 def latestJava = java21
 def oldestJava = java17
 

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.6
 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/Skript.java

@@ -396,7 +396,8 @@ public void onEnable() {
 		File config = new File(getDataFolder(), "config.sk");
 		File features = new File(getDataFolder(), "features.sk");
 		File lang = new File(getDataFolder(), "lang");
-		if (!scriptsFolder.isDirectory() || !config.exists() || !features.exists() || !lang.exists()) {
+		File aliasesFolder = new File(getDataFolder(), "aliases");
+		if (!scriptsFolder.isDirectory() || !config.exists() || !features.exists() || !lang.exists() || !aliasesFolder.exists()) {
 			ZipFile f = null;
 			try {
 				boolean populateExamples = false;
@@ -413,6 +414,11 @@ public void onEnable() {
 					populateLanguageFiles = true;
 				}
 
+				if (!aliasesFolder.isDirectory()) {
+					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())

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();
 	}