From 5967f1f3cc624401bcb67fcf3f2921f79d6a07c7 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) --- .../ISSUE_TEMPLATE/behavior-bug-or-plugin-incompatibility.yml | 2 +- .github/ISSUE_TEMPLATE/performance-problem.yml | 2 +- .github/ISSUE_TEMPLATE/server-crash-or-stacktrace.yml | 2 +- patches/server/Fix-this-stupid-bullshit.patch | 2 +- patches/server/Implement-Paper-VersionChecker.patch | 2 +- .../Show-Paper-in-client-crashes-server-lists-and-Mojang.patch | 2 +- settings.gradle.kts | 2 +- 7 files changed, 7 insertions(+), 7 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/Fix-this-stupid-bullshit.patch b/patches/server/Fix-this-stupid-bullshit.patch index b0622a8f53..ee787d7140 100644 --- a/patches/server/Fix-this-stupid-bullshit.patch +++ b/patches/server/Fix-this-stupid-bullshit.patch @@ -41,7 +41,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 - 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/patches/server/Implement-Paper-VersionChecker.patch b/patches/server/Implement-Paper-VersionChecker.patch index 7a130dbaba..c2650a5b2c 100644 --- a/patches/server/Implement-Paper-VersionChecker.patch +++ b/patches/server/Implement-Paper-VersionChecker.patch @@ -30,7 +30,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 +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/Show-Paper-in-client-crashes-server-lists-and-Mojang.patch b/patches/server/Show-Paper-in-client-crashes-server-lists-and-Mojang.patch index 4f4f1a2f1e..a46534b52e 100644 --- a/patches/server/Show-Paper-in-client-crashes-server-lists-and-Mojang.patch +++ b/patches/server/Show-Paper-in-client-crashes-server-lists-and-Mojang.patch @@ -40,7 +40,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 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/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.