From e6ef1bae88ffd617f32e91cc1496aa9b6803a626 Mon Sep 17 00:00:00 2001 From: BlockyTheDev <86119630+BlockyTheDev@users.noreply.github.com> Date: Wed, 5 Apr 2023 02:06:59 +0200 Subject: [PATCH] [ci skip] Update download urls (#9100) --- .../behavior-bug-or-plugin-incompatibility.yml | 2 +- .github/ISSUE_TEMPLATE/performance-problem.yml | 2 +- .github/ISSUE_TEMPLATE/server-crash-or-stacktrace.yml | 2 +- ...ow-Paper-in-client-crashes-server-lists-and-Mojang.patch | 6 +++--- patches/server/0028-Implement-Paper-VersionChecker.patch | 4 ++-- patches/server/0152-Fix-this-stupid-bullshit.patch | 4 ++-- settings.gradle.kts | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/behavior-bug-or-plugin-incompatibility.yml b/.github/ISSUE_TEMPLATE/behavior-bug-or-plugin-incompatibility.yml index 51203455a3..2fcc1aca71 100644 --- a/.github/ISSUE_TEMPLATE/behavior-bug-or-plugin-incompatibility.yml +++ b/.github/ISSUE_TEMPLATE/behavior-bug-or-plugin-incompatibility.yml @@ -68,7 +68,7 @@ body: value: | Before submitting this issue, please ensure the following: - 1. You are running the latest version of Paper from [our downloads page](https://papermc.io/downloads). + 1. You are running the latest version of Paper from [our downloads page](https://papermc.io/downloads/paper). 2. You searched for and ensured there isn't already an open issue regarding this. 3. Your version of Minecraft is supported by Paper. diff --git a/.github/ISSUE_TEMPLATE/performance-problem.yml b/.github/ISSUE_TEMPLATE/performance-problem.yml index 808bd09d21..d835e3fc7a 100644 --- a/.github/ISSUE_TEMPLATE/performance-problem.yml +++ b/.github/ISSUE_TEMPLATE/performance-problem.yml @@ -79,6 +79,6 @@ body: value: | Before submitting this issue, please ensure the following: - 1. You are running the latest version of Paper from [our downloads page](https://papermc.io/downloads). + 1. You are running the latest version of Paper from [our downloads page](https://papermc.io/downloads/paper). 2. You searched for and ensured there isn't already an open issue regarding this. 3. Your version of Minecraft is supported by Paper. diff --git a/.github/ISSUE_TEMPLATE/server-crash-or-stacktrace.yml b/.github/ISSUE_TEMPLATE/server-crash-or-stacktrace.yml index 4925cfddf0..84b52a3c16 100644 --- a/.github/ISSUE_TEMPLATE/server-crash-or-stacktrace.yml +++ b/.github/ISSUE_TEMPLATE/server-crash-or-stacktrace.yml @@ -68,7 +68,7 @@ body: value: | Before submitting this issue, please ensure the following: - 1. You are running the latest version of Paper from [our downloads page](https://papermc.io/downloads). + 1. You are running the latest version of Paper from [our downloads page](https://papermc.io/downloads/paper). 2. Your version of Minecraft is supported by Paper. If your server crash log contains `DO NOT REPORT THIS TO PAPER`, please ask in our diff --git a/patches/server/0027-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch b/patches/server/0027-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch index b4a553a346..8678dcd61c 100644 --- a/patches/server/0027-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch +++ b/patches/server/0027-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch @@ -19,7 +19,7 @@ index 6251d93c2ea61c471b4e1069048327782acc78e7..d3cd196e1a6f707ed5e0008123cc65df public SystemReport fillSystemReport(SystemReport details) { diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index b9eae8760a642ab5a38980787dde045a3c08046d..fbc62e2b07a430dea8a827790bda5fbf6f19d05b 100644 +index e80510f14b9007afebf76110b936f1b5c29078d6..5e79baa09e3ae468a58b0f2e5f9e08c67fcd7ff8 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -254,7 +254,7 @@ import org.yaml.snakeyaml.error.MarkedYAMLException; @@ -32,7 +32,7 @@ index b9eae8760a642ab5a38980787dde045a3c08046d..fbc62e2b07a430dea8a827790bda5fbf private final String bukkitVersion = Versioning.getBukkitVersion(); private final Logger logger = Logger.getLogger("Minecraft"); diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java -index 7252677bd6dabe094bfc9d47882059b9cb86e791..422a7764ec8713ef6dc2f7cfbe152679ad91a891 100644 +index 7252677bd6dabe094bfc9d47882059b9cb86e791..e318b381e9d66fa83a6481f55d17fe5dcbb277ba 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java @@ -233,12 +233,25 @@ public class Main { @@ -40,7 +40,7 @@ index 7252677bd6dabe094bfc9d47882059b9cb86e791..422a7764ec8713ef6dc2f7cfbe152679 if (buildDate.before(deadline.getTime())) { System.err.println("*** Error, this build is outdated ***"); - System.err.println("*** Please download a new build as per instructions from https://www.spigotmc.org/go/outdated-spigot ***"); -+ System.err.println("*** Please download a new build as per instructions from https://papermc.io/downloads ***"); // Paper ++ System.err.println("*** Please download a new build as per instructions from https://papermc.io/downloads/paper ***"); // Paper System.err.println("*** Server will start in 20 seconds ***"); Thread.sleep(TimeUnit.SECONDS.toMillis(20)); } diff --git a/patches/server/0028-Implement-Paper-VersionChecker.patch b/patches/server/0028-Implement-Paper-VersionChecker.patch index 2ef0d38d88..19b6d81823 100644 --- a/patches/server/0028-Implement-Paper-VersionChecker.patch +++ b/patches/server/0028-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..351159bbdb0c8045f4983f54dee34430dbcc423e +index 0000000000000000000000000000000000000000..22a55be34fde453fedd987173d95b8b347a03588 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java @@ -0,0 +1,129 @@ @@ -30,7 +30,7 @@ index 0000000000000000000000000000000000000000..351159bbdb0c8045f4983f54dee34430 +public class PaperVersionFetcher implements VersionFetcher { + private static final java.util.regex.Pattern VER_PATTERN = java.util.regex.Pattern.compile("^([0-9\\.]*)\\-.*R"); // R is an anchor, will always give '-R' at end + private static final String GITHUB_BRANCH_NAME = "master"; -+ private static final String DOWNLOAD_PAGE = "https://papermc.io/downloads"; ++ private static final String DOWNLOAD_PAGE = "https://papermc.io/downloads/paper"; + private static @Nullable String mcVer; + + @Override diff --git a/patches/server/0152-Fix-this-stupid-bullshit.patch b/patches/server/0152-Fix-this-stupid-bullshit.patch index 78270f6ad6..7cd4a25b8a 100644 --- a/patches/server/0152-Fix-this-stupid-bullshit.patch +++ b/patches/server/0152-Fix-this-stupid-bullshit.patch @@ -31,7 +31,7 @@ index e43096e69a00f9ea96badd7c966443cfcf3e7b95..ac2b7b5161eaaca3620268ae865d6f2a Bootstrap.isBootstrapped = true; if (BuiltInRegistries.REGISTRY.keySet().isEmpty()) { diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java -index ebf561bce1b442f2b3a138d4ba0ed252e4ba3207..a8b21195ca304b3ff68c8bf7e336b4df64603c10 100644 +index beec3ebe4abc977885f93ef28aac3e834142d373..22aeca9eb61ccc0d2dc8ef3b0eb8ee242dd909bb 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java @@ -250,10 +250,12 @@ public class Main { @@ -41,7 +41,7 @@ index ebf561bce1b442f2b3a138d4ba0ed252e4ba3207..a8b21195ca304b3ff68c8bf7e336b4df - System.err.println("*** Error, this build is outdated ***"); + // Paper start - This is some stupid bullshit + System.err.println("*** Warning, you've not updated in a while! ***"); - System.err.println("*** Please download a new build as per instructions from https://papermc.io/downloads ***"); // Paper + System.err.println("*** Please download a new build as per instructions from https://papermc.io/downloads/paper ***"); // Paper - System.err.println("*** Server will start in 20 seconds ***"); - Thread.sleep(TimeUnit.SECONDS.toMillis(20)); + //System.err.println("*** Server will start in 20 seconds ***"); diff --git a/settings.gradle.kts b/settings.gradle.kts index 14fc637946..f3fc0b137a 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -22,7 +22,7 @@ if (!file(".git").exists()) { zip from GitHub. Built Paper jars are available for download at - https://papermc.io/downloads + https://papermc.io/downloads/paper See https://github.com/PaperMC/Paper/blob/master/CONTRIBUTING.md for further information on building and modifying Paper.