Upstream
/
Paper
mirror of https://github.com/PaperMC/Paper.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

[ci skip] Update download urls (#9100)

This commit is contained in:
BlockyTheDev 2023-04-05 02:06:59 +02:00 committed by GitHub
parent 497b91939c
commit e6ef1bae88
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/ISSUE_TEMPLATE/behavior-bug-or-plugin-incompatibility.yml vendored
View File

@ -68,7 +68,7 @@ body:
value: | value: |
Before submitting this issue, please ensure the following: 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. 2. You searched for and ensured there isn't already an open issue regarding this.
3. Your version of Minecraft is supported by Paper. 3. Your version of Minecraft is supported by Paper.

2
.github/ISSUE_TEMPLATE/performance-problem.yml vendored
View File

@ -79,6 +79,6 @@ body:
value: | value: |
Before submitting this issue, please ensure the following: 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. 2. You searched for and ensured there isn't already an open issue regarding this.
3. Your version of Minecraft is supported by Paper. 3. Your version of Minecraft is supported by Paper.

2
.github/ISSUE_TEMPLATE/server-crash-or-stacktrace.yml vendored
View File

@ -68,7 +68,7 @@ body:
value: | value: |
Before submitting this issue, please ensure the following: 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. 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 If your server crash log contains `DO NOT REPORT THIS TO PAPER`, please ask in our

6
patches/server/0027-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch
View File

@ -19,7 +19,7 @@ index 6251d93c2ea61c471b4e1069048327782acc78e7..d3cd196e1a6f707ed5e0008123cc65df
public SystemReport fillSystemReport(SystemReport details) { 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 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 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/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; @@ -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 String bukkitVersion = Versioning.getBukkitVersion();
private final Logger logger = Logger.getLogger("Minecraft"); 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 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 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
+++ b/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
@@ -233,12 +233,25 @@ public class Main { @@ -233,12 +233,25 @@ public class Main {
@ -40,7 +40,7 @@ index 7252677bd6dabe094bfc9d47882059b9cb86e791..422a7764ec8713ef6dc2f7cfbe152679
if (buildDate.before(deadline.getTime())) { if (buildDate.before(deadline.getTime())) {
System.err.println("*** Error, this build is outdated ***"); 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://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 ***"); System.err.println("*** Server will start in 20 seconds ***");
Thread.sleep(TimeUnit.SECONDS.toMillis(20)); Thread.sleep(TimeUnit.SECONDS.toMillis(20));
} }

4
patches/server/0028-Implement-Paper-VersionChecker.patch
View File

@ -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 diff --git a/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java b/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java
new file mode 100644 new file mode 100644
index 0000000000000000000000000000000000000000..351159bbdb0c8045f4983f54dee34430dbcc423e index 0000000000000000000000000000000000000000..22a55be34fde453fedd987173d95b8b347a03588
--- /dev/null --- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java +++ b/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java
@@ -0,0 +1,129 @@ @@ -0,0 +1,129 @@
@ -30,7 +30,7 @@ index 0000000000000000000000000000000000000000..351159bbdb0c8045f4983f54dee34430
+public class PaperVersionFetcher implements VersionFetcher { +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 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 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; + private static @Nullable String mcVer;
+ +
+ @Override + @Override

4
patches/server/0152-Fix-this-stupid-bullshit.patch
View File

@ -31,7 +31,7 @@ index e43096e69a00f9ea96badd7c966443cfcf3e7b95..ac2b7b5161eaaca3620268ae865d6f2a
Bootstrap.isBootstrapped = true; Bootstrap.isBootstrapped = true;
if (BuiltInRegistries.REGISTRY.keySet().isEmpty()) { 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 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 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
+++ b/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
@@ -250,10 +250,12 @@ public class Main { @@ -250,10 +250,12 @@ public class Main {
@ -41,7 +41,7 @@ index ebf561bce1b442f2b3a138d4ba0ed252e4ba3207..a8b21195ca304b3ff68c8bf7e336b4df
- System.err.println("*** Error, this build is outdated ***"); - System.err.println("*** Error, this build is outdated ***");
+ // Paper start - This is some stupid bullshit + // Paper start - This is some stupid bullshit
+ System.err.println("*** Warning, you've not updated in a while! ***"); + 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 ***"); - System.err.println("*** Server will start in 20 seconds ***");
- Thread.sleep(TimeUnit.SECONDS.toMillis(20)); - Thread.sleep(TimeUnit.SECONDS.toMillis(20));
+ //System.err.println("*** Server will start in 20 seconds ***"); + //System.err.println("*** Server will start in 20 seconds ***");

2
settings.gradle.kts
View File

@ -22,7 +22,7 @@ if (!file(".git").exists()) {
zip from GitHub. zip from GitHub.
Built Paper jars are available for download at 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 See https://github.com/PaperMC/Paper/blob/master/CONTRIBUTING.md
for further information on building and modifying Paper. for further information on building and modifying Paper.