mirror of
https://github.com/PurpurMC/Purpur.git
synced 2025-02-05 12:40:01 +08:00
remove pl3x references
This commit is contained in:
Ben Kerllenevich
parent
2ac87564ab
commit
3b7efdd6f3
2
.github/ISSUE_TEMPLATE/bug_report.yml
vendored
2
.github/ISSUE_TEMPLATE/bug_report.yml
vendored
@ -56,7 +56,7 @@ body:
|
||||
label: Agreements
|
||||
description: Please agree to the following.
|
||||
options:
|
||||
- label: I am running the latest version of Purpur available from https://purpur.pl3x.net/downloads.
|
||||
- label: I am running the latest version of Purpur available from https://purpurmc.org/downloads.
|
||||
required: true
|
||||
- label: I have searched for and ensured there isn't already an open issue regarding this.
|
||||
required: true
|
||||
|
||||
4
.github/ISSUE_TEMPLATE/config.yml
vendored
4
.github/ISSUE_TEMPLATE/config.yml
vendored
@ -1,8 +1,8 @@
|
||||
blank_issues_enabled: false
|
||||
contact_links:
|
||||
- name: Feature Request
|
||||
url: https://github.com/pl3xgaming/Purpur/discussions/new
|
||||
url: https://github.com/PurpurMC/Purpur/discussions/new
|
||||
about: Suggest an idea for Purpur
|
||||
- name: Purpur Discord
|
||||
url: https://purpur.pl3x.net/discord
|
||||
url: https://purpurmc.org/discord
|
||||
about: If you are having issues with timings or have other minor issues, come join our Discord server for help!
|
||||
|
||||
@ -44,7 +44,7 @@ body:
|
||||
label: Agreements
|
||||
description: Please agree to the following.
|
||||
options:
|
||||
- label: I am running the latest version of Purpur available from https://purpur.pl3x.net/downloads.
|
||||
- label: I am running the latest version of Purpur available from https://purpurmc.org/downloads.
|
||||
required: true
|
||||
- label: I have searched for and ensured there isn't already an open issue regarding this.
|
||||
required: true
|
||||
|
||||
2
.github/ISSUE_TEMPLATE/server_crash.yml
vendored
2
.github/ISSUE_TEMPLATE/server_crash.yml
vendored
@ -59,7 +59,7 @@ body:
|
||||
label: Agreements
|
||||
description: Please agree to the following.
|
||||
options:
|
||||
- label: I am running the latest version of Purpur available from https://purpur.pl3x.net/downloads.
|
||||
- label: I am running the latest version of Purpur available from https://purpurmc.org/downloads.
|
||||
required: true
|
||||
- label: I have searched for and ensured there isn't already an open issue regarding this.
|
||||
required: true
|
||||
|
||||
@ -335,7 +335,7 @@ if (!PurpurConfig.saveEmptyScoreboardTeams) {
|
||||
|
||||
It is often preferred that you use the fully qualified name for the
|
||||
configuration class when accessing it, like so:
|
||||
`net.pl3x.purpur.PurpurConfig.valueHere`.
|
||||
`org.purpurmc.purpur.PurpurConfig.valueHere`.
|
||||
If this is not done, a developer for Purpur might fix that for you before
|
||||
merging, but it's always nice if you make it a habit where you only need 1-2
|
||||
lines changed.
|
||||
|
||||
69
README.md
69
README.md
@ -1,17 +1,16 @@
|
||||
<div align="center">
|
||||
<a href="https://purpur.pl3x.net"><img src="https://repository-images.githubusercontent.com/184300222/14b11480-3303-11eb-8ca4-ea5711d942fb" alt="Purpur"></a>
|
||||
<a href="https://purpurmc.org"><img src="https://repository-images.githubusercontent.com/184300222/14b11480-3303-11eb-8ca4-ea5711d942fb" alt="Purpur"></a>
|
||||
|
||||
## Purpur
|
||||
|
||||
[](License)
|
||||
[](https://purpur.pl3x.net/downloads/)
|
||||
[](https://www.codefactor.io/repository/github/pl3xgaming/purpur)
|
||||
[](https://discord.gg/mtAAnkk)
|
||||
[](LICENSE)
|
||||
[](https://purpurmc.org/downloads/)
|
||||
[](https://www.codefactor.io/repository/github/PurpurMC/purpur)
|
||||
[](https://purpurmc.org/discord)
|
||||
|
||||
[](https://github.com/pl3xgaming/Purpur/stargazers)
|
||||
[](https://github.com/BillyGalbreath?tab=followers)
|
||||
[](https://github.com/pl3xgaming/Purpur/network/members)
|
||||
[](https://github.com/pl3xgaming/Purpur/watchers)
|
||||
[](https://github.com/PurpurMC/Purpur/stargazers)
|
||||
[](https://github.com/PurpurMC/Purpur/network/members)
|
||||
[](https://github.com/PurpurMC/Purpur/watchers)
|
||||
|
||||
Purpur is a drop-in replacement for [Paper](https://github.com/PaperMC/Paper) servers designed for configurability, new fun and exciting gameplay features, and performance built on top of [Airplane](https://github.com/TECHNOVE/Airplane/).
|
||||
|
||||
@ -23,40 +22,40 @@ Purpur is a drop-in replacement for [Paper](https://github.com/PaperMC/Paper) se
|
||||
Join us on [Discord](https://discord.gg/mtAAnkk)
|
||||
|
||||
## Downloads
|
||||
[](https://purpur.pl3x.net/downloads)
|
||||
[](https://purpurmc.org/downloads)
|
||||
|
||||
Downloads can be obtained from the [downloads page](https://purpur.pl3x.net/downloads/) or the [downloads API](https://api.pl3x.net).
|
||||
Downloads can be obtained from the [downloads page](https://purpurmc.org/downloads/) or the [downloads API](https://api.purpurmc.org).
|
||||
|
||||
Latest build shortcut links:
|
||||
* [1.17.1](https://api.pl3x.net/v2/purpur/1.17.1/latest/download) builds 1256+
|
||||
* [1.17](https://api.pl3x.net/v2/purpur/1.17/latest/download) builds 1172-1255
|
||||
* [1.16.5](https://api.pl3x.net/v2/purpur/1.16.5/latest/download) builds 957-1171
|
||||
* [1.16.4](https://api.pl3x.net/v2/purpur/1.16.4/latest/download) builds 809-956
|
||||
* [1.16.3](https://api.pl3x.net/v2/purpur/1.16.3/latest/download) builds 751-808
|
||||
* [1.16.2](https://api.pl3x.net/v2/purpur/1.16.2/latest/download) builds 711-750
|
||||
* [1.16.1](https://api.pl3x.net/v2/purpur/1.16.1/latest/download) builds 608-710
|
||||
* [1.15.2](https://api.pl3x.net/v2/purpur/1.15.2/latest/download) builds 398-606
|
||||
* [1.15.1](https://api.pl3x.net/v2/purpur/1.15.1/latest/download) builds 348-397
|
||||
* [1.15](https://api.pl3x.net/v2/purpur/1.15/latest/download) builds 339-346
|
||||
* [1.14.x](https://api.pl3x.net/v2/purpur/1.14.4/latest/download) builds 337 and below
|
||||
* [1.17.1](https://api.purpurmc.org/v1/purpur/1.17.1/latest/download) builds 1256+
|
||||
* [1.17](https://api.purpurmc.org/v1/purpur/1.17/latest/download) builds 1172-1255
|
||||
* [1.16.5](https://api.purpurmc.org/v1/purpur/1.16.5/latest/download) builds 957-1171
|
||||
* [1.16.4](https://api.purpurmc.org/v1/purpur/1.16.4/latest/download) builds 809-956
|
||||
* [1.16.3](https://api.purpurmc.org/v1/purpur/1.16.3/latest/download) builds 751-808
|
||||
* [1.16.2](https://api.purpurmc.org/v1/purpur/1.16.2/latest/download) builds 711-750
|
||||
* [1.16.1](https://api.purpurmc.org/v1/purpur/1.16.1/latest/download) builds 608-710
|
||||
* [1.15.2](https://api.purpurmc.org/v1/purpur/1.15.2/latest/download) builds 398-606
|
||||
* [1.15.1](https://api.purpurmc.org/v1/purpur/1.15.1/latest/download) builds 348-397
|
||||
* [1.15](https://api.purpurmc.org/v1/purpur/1.15/latest/download) builds 339-346
|
||||
* [1.14.x](https://api.purpurmc.org/v1/purpur/1.14.4/latest/download) builds 337 and below
|
||||
|
||||
|
||||
Downloads API endpoints:
|
||||
* List versions of Minecraft with builds available:
|
||||
`https://api.pl3x.net/v2/purpur`
|
||||
`https://api.purpurmc.org/v1/purpur`
|
||||
* List builds for a version of Minecraft:
|
||||
`https://api.pl3x.net/v2/purpur/<version>`
|
||||
`https://api.purpurmc.org/v1/purpur/<version>`
|
||||
* Download a specific build of a specific version:
|
||||
`https://api.pl3x.net/v2/purpur/<version>/<build>/download`
|
||||
`https://api.purpurmc.org/v1/purpur/<version>/<build>/download`
|
||||
* Download the latest build for a version of Minecraft:
|
||||
`https://api.pl3x.net/v2/purpur/<version>/latest/download`
|
||||
`https://api.purpurmc.org/v1/purpur/<version>/latest/download`
|
||||
|
||||
## License
|
||||
[](LICENSE)
|
||||
[](LICENSE)
|
||||
|
||||
All patches are licensed under the MIT license, unless otherwise noted in the patch headers.
|
||||
|
||||
See [PaperMC/Paper](https://github.com/PaperMC/Paper), [TECHNOVE/Airplane](https://github.com/TECHNOVE/Airplane), and [PaperMC/Paperweight](https://github.com/PaperMC/Paperweight) for the license of material used by this project.
|
||||
See [PaperMC/Paper](https://github.com/PaperMC/Paper), and [PaperMC/Paperweight](https://github.com/PaperMC/paperweight) for the license of material used by this project.
|
||||
|
||||
## bStats
|
||||
|
||||
@ -65,21 +64,21 @@ See [PaperMC/Paper](https://github.com/PaperMC/Paper), [TECHNOVE/Airplane](https
|
||||
|
||||
## API
|
||||
|
||||
### [Javadoc](https://purpur.pl3x.net/javadoc)
|
||||
### [Javadoc](https://purpurmc.org/javadoc)
|
||||
|
||||
### Dependency Information
|
||||
Maven
|
||||
```xml
|
||||
<repository>
|
||||
<id>purpur</id>
|
||||
<url>https://repo.pl3x.net/</url>
|
||||
<url>https://repo.purpurmc.org/</url>
|
||||
</repository>
|
||||
```
|
||||
```xml
|
||||
<dependency>
|
||||
<groupId>net.pl3x.purpur</groupId>
|
||||
<groupId>org.purpurmc.purpur</groupId>
|
||||
<artifactId>purpur-api</artifactId>
|
||||
<version>1.17.1-R0.1-SNAPSHOT</version>
|
||||
<version>1.18-R0.1-SNAPSHOT</version>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
```
|
||||
@ -87,12 +86,12 @@ Maven
|
||||
Gradle
|
||||
```kotlin
|
||||
repositories {
|
||||
maven("https://repo.pl3x.net/")
|
||||
maven("https://repo.purpurmc.org/")
|
||||
}
|
||||
```
|
||||
```kotlin
|
||||
dependencies {
|
||||
compileOnly("net.pl3x.purpur", "purpur-api", "1.17.1-R0.1-SNAPSHOT")
|
||||
compileOnly("org.purpurmc.purpur", "purpur-api", "1.18-R0.1-SNAPSHOT")
|
||||
}
|
||||
```
|
||||
|
||||
@ -121,7 +120,7 @@ See [CONTRIBUTING.md](CONTRIBUTING.md) for more detailed information.
|
||||
Use the command `./gradlew build` to build the API and server. Compiled JARs
|
||||
will be placed under `Purpur-API/build/libs` and `Purpur-Server/build/libs`.
|
||||
|
||||
To get a purpurclip jar, run `./gradlew paperclip`.
|
||||
To get a purpurclip jar, run `./gradlew createReobfPaperclipJar`.
|
||||
To install the `purpur-api` and `purpur` dependencies to your local Maven repo, run `./gradlew publishToMavenLocal`
|
||||
|
||||
Special Thanks To:
|
||||
|
||||
@ -51,32 +51,31 @@ index cd74406039704e5a880f00b9b60bb7b1dedc5398..ef00dddbbf432d3f9f06bc6095ab5a82
|
||||
standardInput = System.`in`
|
||||
workingDir = rootProject.layout.projectDirectory
|
||||
diff --git a/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java b/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java
|
||||
index ece77f5ea4b14bbed7c070131b3251ea86764538..aadd6550a5892e403f7b0bbef008461c1566a1bb 100644
|
||||
index ece77f5ea4b14bbed7c070131b3251ea86764538..ff3590ca6c78bc60382d2dab98dc2cb0dd582b35 100644
|
||||
--- a/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java
|
||||
+++ b/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java
|
||||
@@ -19,8 +19,8 @@ import java.util.stream.StreamSupport;
|
||||
@@ -19,8 +19,7 @@ import java.util.stream.StreamSupport;
|
||||
|
||||
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://purpur.pl3x.net/downloads/";
|
||||
+ private static final String JENKINS_URL = "https://ci.pl3x.net/job/Purpur/lastSuccessfulBuild/buildNumber"; // Purpur
|
||||
+ private static final String DOWNLOAD_PAGE = "https://purpurmc.org/downloads/"; // Purpur
|
||||
private static @Nullable String mcVer;
|
||||
|
||||
@Override
|
||||
@@ -31,8 +31,8 @@ public class PaperVersionFetcher implements VersionFetcher {
|
||||
@@ -31,8 +30,8 @@ public class PaperVersionFetcher implements VersionFetcher {
|
||||
@Nonnull
|
||||
@Override
|
||||
public Component getVersionMessage(@Nonnull String serverVersion) {
|
||||
- String[] parts = serverVersion.substring("git-Paper-".length()).split("[-\\s]");
|
||||
- final Component updateMessage = getUpdateStatusMessage("PaperMC/Paper", GITHUB_BRANCH_NAME, parts[0]);
|
||||
+ String[] parts = serverVersion.substring("git-Purpur-".length()).split("[-\\s]"); // Airplane // Purpur
|
||||
+ final Component updateMessage = getUpdateStatusMessage("pl3xgaming/Purpur", "ver/" + getMinecraftVersion(), parts[0]); // Airplane // Purpur
|
||||
+ final Component updateMessage = getUpdateStatusMessage("PurpurMC/Purpur", "ver/" + getMinecraftVersion(), parts[0]); // Airplane // Purpur
|
||||
final Component history = getHistory();
|
||||
|
||||
return history != null ? TextComponent.ofChildren(updateMessage, Component.newline(), history) : updateMessage;
|
||||
@@ -45,7 +45,7 @@ public class PaperVersionFetcher implements VersionFetcher {
|
||||
@@ -45,7 +44,7 @@ public class PaperVersionFetcher implements VersionFetcher {
|
||||
String result = matcher.group();
|
||||
mcVer = result.substring(0, result.length() - 2); // strip 'R' anchor and trailing '-'
|
||||
} else {
|
||||
@ -85,12 +84,12 @@ index ece77f5ea4b14bbed7c070131b3251ea86764538..aadd6550a5892e403f7b0bbef008461c
|
||||
org.bukkit.Bukkit.getLogger().warning("Pattern: " + VER_PATTERN.toString());
|
||||
org.bukkit.Bukkit.getLogger().warning("Version: " + org.bukkit.Bukkit.getBukkitVersion());
|
||||
}
|
||||
@@ -85,15 +85,11 @@ public class PaperVersionFetcher implements VersionFetcher {
|
||||
@@ -85,15 +84,11 @@ public class PaperVersionFetcher implements VersionFetcher {
|
||||
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.pl3x.net/v2/purpur/" + siteApiVersion), // Purpur
|
||||
+ new URL("https://api.purpurmc.org/v1/purpur/" + siteApiVersion), // Purpur
|
||||
Charsets.UTF_8
|
||||
).openBufferedStream()) {
|
||||
JsonObject json = new Gson().fromJson(reader, JsonObject.class);
|
||||
|
||||
@ -173,7 +173,7 @@ index 450518903c0a10301b177d8dd7fe05aca3b8b37e..a10cebac752fdf5186eb86bd314f1931
|
||||
.withRequiredArg()
|
||||
diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
|
||||
new file mode 100644
|
||||
index 0000000000000000000000000000000000000000..45a99a5fc63ee4d4f166cd47b1db4d412170dbe2
|
||||
index 0000000000000000000000000000000000000000..015428a85dc0f3e6cdd3a4aae405db80aa2a12e8
|
||||
--- /dev/null
|
||||
+++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
|
||||
@@ -0,0 +1,159 @@
|
||||
@ -213,8 +213,8 @@ index 0000000000000000000000000000000000000000..45a99a5fc63ee4d4f166cd47b1db4d41
|
||||
+ + "If you need help with the configuration or have any questions related to Purpur,\n"
|
||||
+ + "join us in our Discord guild.\n"
|
||||
+ + "\n"
|
||||
+ + "Website: https://github.com/pl3xgaming/Purpur \n"
|
||||
+ + "Wiki: https://github.com/pl3xgaming/Purpur/wiki \n";
|
||||
+ + "Website: https://purpurmc.org \n"
|
||||
+ + "Docs: https://purpurmc.org/docs \n";
|
||||
+ private static File CONFIG_FILE;
|
||||
+ public static YamlConfiguration config;
|
||||
+
|
||||
|
||||
Loading…
Reference in New Issue
Block a user