From ed4e9163efc88a02675fd957af6bf68d02262a83 Mon Sep 17 00:00:00 2001 From: Noah van der Aa Date: Fri, 20 May 2022 17:12:30 +0200 Subject: [PATCH] [ci-skip] Update repository and API urls (#7835) --- README.md | 4 ++-- build.gradle.kts | 4 ++-- patches/server/0021-Implement-Paper-VersionChecker.patch | 4 ++-- settings.gradle.kts | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 3913a8dae..c656cf87d 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,7 @@ How To (Plugin Developers) ```xml papermc - https://papermc.io/repo/repository/maven-public/ + https://repo.papermc.io/repository/maven-public/ ``` * Artifact Information: @@ -49,7 +49,7 @@ How To (Plugin Developers) ```kotlin repositories { maven { - url = uri("https://papermc.io/repo/repository/maven-public/") + url = uri("https://repo.papermc.io/repository/maven-public/") } } diff --git a/build.gradle.kts b/build.gradle.kts index 2939815b8..59a0a1abd 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -19,7 +19,7 @@ allprojects { } } -val paperMavenPublicUrl = "https://papermc.io/repo/repository/maven-public/" +val paperMavenPublicUrl = "https://repo.papermc.io/repository/maven-public/" subprojects { tasks.withType { @@ -123,7 +123,7 @@ publishing { allprojects { publishing { repositories { - maven("https://papermc.io/repo/repository/maven-snapshots/") { + maven("https://repo.papermc.io/repository/maven-snapshots/") { name = "paperSnapshots" credentials(PasswordCredentials::class) } diff --git a/patches/server/0021-Implement-Paper-VersionChecker.patch b/patches/server/0021-Implement-Paper-VersionChecker.patch index b73f79c61..727c5e9c9 100644 --- a/patches/server/0021-Implement-Paper-VersionChecker.patch +++ b/patches/server/0021-Implement-Paper-VersionChecker.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Implement Paper VersionChecker diff --git a/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java b/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java new file mode 100644 -index 0000000000000000000000000000000000000000..91d7afc710a2d52b4f429e0381cf64176ecb6415 +index 0000000000000000000000000000000000000000..351159bbdb0c8045f4983f54dee34430dbcc423e --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java @@ -0,0 +1,129 @@ @@ -92,7 +92,7 @@ index 0000000000000000000000000000000000000000..91d7afc710a2d52b4f429e0381cf6417 + if (siteApiVersion == null) { return -1; } + try { + try (BufferedReader reader = Resources.asCharSource( -+ new URL("https://papermc.io/api/v2/projects/paper/versions/" + siteApiVersion), ++ new URL("https://api.papermc.io/v2/projects/paper/versions/" + siteApiVersion), + Charsets.UTF_8 + ).openBufferedStream()) { + JsonObject json = new Gson().fromJson(reader, JsonObject.class); diff --git a/settings.gradle.kts b/settings.gradle.kts index 5b2243583..18cf95a32 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -3,7 +3,7 @@ import java.util.Locale pluginManagement { repositories { gradlePluginPortal() - maven("https://papermc.io/repo/repository/maven-public/") + maven("https://repo.papermc.io/repository/maven-public/") } }