Paper 1.21.7 Update (#7983)

Author: Absolutionism

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.6-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.6.json'
+def latestEnv = 'java21/paper-1.21.7.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.6
+testEnv=java21/paper-1.21.7
 testEnvJavaVersion=21

src/main/java/ch/njol/skript/test/platform/Environment.java

@@ -1,21 +1,22 @@
 package ch.njol.skript.test.platform;
 
+import ch.njol.skript.test.utils.TestResults;
 import com.google.gson.Gson;
-import com.google.gson.JsonArray;
-import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
-
-import ch.njol.skript.test.utils.TestResults;
-
 import org.jetbrains.annotations.Nullable;
 
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.lang.ProcessBuilder.Redirect;
+import java.net.URI;
 import java.net.URISyntaxException;
 import java.net.URL;
+import java.net.http.HttpClient;
+import java.net.http.HttpRequest;
+import java.net.http.HttpResponse;
+import java.net.http.HttpResponse.BodyHandlers;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -93,33 +94,26 @@ public String getSource() {
 			return source;
 		}
 
-		private void generateSource() throws IOException {
+		private void generateSource() throws IOException, InterruptedException {
 			if (source != null)
 				return;
 
-			String stringUrl = "https://api.papermc.io/v2/projects/paper/versions/" + version;
-			URL url = new URL(stringUrl);
-			JsonObject jsonObject;
-			try (InputStream is = url.openStream()) {
-				InputStreamReader reader = new InputStreamReader(is, StandardCharsets.UTF_8);
-				jsonObject = gson.fromJson(reader, JsonObject.class);
+			HttpClient client = HttpClient.newHttpClient();
+			HttpRequest buildRequest = HttpRequest.newBuilder()
+				.uri(URI.create("https://fill.papermc.io/v3/projects/paper/versions/" + version + "/builds/latest"))
+				.header("User-Agent", "SkriptLang/Skript/{@version} (admin@skriptlang.org)")
+				.GET()
+				.build();
+			HttpResponse<InputStream> buildResponse = client.send(buildRequest, BodyHandlers.ofInputStream());
+			JsonObject buildObject;
+			try (InputStreamReader reader = new InputStreamReader(buildResponse.body(), StandardCharsets.UTF_8)) {
+				buildObject = gson.fromJson(reader, JsonObject.class);
 			}
-
-			JsonArray jsonArray = jsonObject.get("builds").getAsJsonArray();
-
-			int latestBuild = -1;
-			for (JsonElement jsonElement : jsonArray) {
-				int build = jsonElement.getAsInt();
-				if (build > latestBuild) {
-					latestBuild = build;
-				}
-			}
-
-			if (latestBuild == -1)
-				throw new IllegalStateException("No builds for this version");
-
-			source = "https://api.papermc.io/v2/projects/paper/versions/" + version + "/builds/" + latestBuild
-				+ "/downloads/paper-" + version + "-" + latestBuild + ".jar";
+			String downloadURL = buildObject.getAsJsonObject("downloads")
+				.getAsJsonObject("server:default")
+				.get("url").getAsString();
+			assert downloadURL != null && !downloadURL.isEmpty();
+			source = downloadURL;
 		}
 	}
 

src/test/skript/environments/java21/paper-1.21.6.json renamed to src/test/skript/environments/java21/paper-1.21.7.json

@@ -1,11 +1,11 @@
 {
-	"name": "paper-1.21.6",
+	"name": "paper-1.21.7",
 	"resources": [
 		{"source": "server.properties.generic", "target": "server.properties"}
 	],
 	"paperDownloads": [
 		{
-			"version": "1.21.6",
+			"version": "1.21.7",
 			"target": "paperclip.jar"
 		}
 	],