diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml index 7f866d3b1..11bb96336 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.yml +++ b/.github/ISSUE_TEMPLATE/bug_report.yml @@ -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 diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml index 16ee9adee..107e533f4 100644 --- a/.github/ISSUE_TEMPLATE/config.yml +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -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! diff --git a/.github/ISSUE_TEMPLATE/performance_problem.yml b/.github/ISSUE_TEMPLATE/performance_problem.yml index 4b9b6fc3b..93acff984 100644 --- a/.github/ISSUE_TEMPLATE/performance_problem.yml +++ b/.github/ISSUE_TEMPLATE/performance_problem.yml @@ -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 diff --git a/.github/ISSUE_TEMPLATE/server_crash.yml b/.github/ISSUE_TEMPLATE/server_crash.yml index bb32df92b..6c9917052 100644 --- a/.github/ISSUE_TEMPLATE/server_crash.yml +++ b/.github/ISSUE_TEMPLATE/server_crash.yml @@ -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 diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index fc4b96d71..3d40f398e 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -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. diff --git a/README.md b/README.md index 4bb9d406f..71aa301d4 100644 --- a/README.md +++ b/README.md @@ -1,17 +1,16 @@
-Purpur +Purpur ## Purpur -[![MIT License](https://img.shields.io/github/license/pl3xgaming/Purpur?&logo=github)](License) -[![Github Actions Build](https://img.shields.io/github/workflow/status/pl3xgaming/purpur/Build?event=push&logo=github)](https://purpur.pl3x.net/downloads/) -[![CodeFactor](https://www.codefactor.io/repository/github/pl3xgaming/purpur/badge)](https://www.codefactor.io/repository/github/pl3xgaming/purpur) -[![Join us on Discord](https://img.shields.io/discord/685683385313919172.svg?label=&logo=discord&logoColor=ffffff&color=7389D8&labelColor=6A7EC2)](https://discord.gg/mtAAnkk) +[![MIT License](https://img.shields.io/github/license/PurpurMC/Purpur?&logo=github)](LICENSE) +[![Github Actions Build](https://img.shields.io/github/workflow/status/PurpurMC/purpur/Build?event=push&logo=github)](https://purpurmc.org/downloads/) +[![CodeFactor](https://www.codefactor.io/repository/github/PurpurMC/purpur/badge)](https://www.codefactor.io/repository/github/PurpurMC/purpur) +[![Join us on Discord](https://img.shields.io/discord/685683385313919172.svg?label=&logo=discord&logoColor=ffffff&color=7389D8&labelColor=6A7EC2)](https://purpurmc.org/discord) -[![Purpur's Stargazers](https://img.shields.io/github/stars/pl3xgaming/Purpur?label=stars&logo=github)](https://github.com/pl3xgaming/Purpur/stargazers) -[![BillyGalbreath's Followers](https://img.shields.io/github/followers/BillyGalbreath?label=followers&logo=github)](https://github.com/BillyGalbreath?tab=followers) -[![Purpur Forks](https://img.shields.io/github/forks/pl3xgaming/Purpur?label=forks&logo=github)](https://github.com/pl3xgaming/Purpur/network/members) -[![Purpur Watchers](https://img.shields.io/github/watchers/pl3xgaming/Purpur?label=watchers&logo=github)](https://github.com/pl3xgaming/Purpur/watchers) +[![Purpur's Stargazers](https://img.shields.io/github/stars/PurpurMC/Purpur?label=stars&logo=github)](https://github.com/PurpurMC/Purpur/stargazers) +[![Purpur Forks](https://img.shields.io/github/forks/PurpurMC/Purpur?label=forks&logo=github)](https://github.com/PurpurMC/Purpur/network/members) +[![Purpur Watchers](https://img.shields.io/github/watchers/PurpurMC/Purpur?label=watchers&logo=github)](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 -[![Downloads](https://img.shields.io/github/workflow/status/pl3xgaming/purpur/Build?event=push&label=Downloads&logo=github)](https://purpur.pl3x.net/downloads) +[![Downloads](https://img.shields.io/github/workflow/status/PurpurMC/purpur/Build?event=push&label=Downloads&logo=github)](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/` + `https://api.purpurmc.org/v1/purpur/` * Download a specific build of a specific version: - `https://api.pl3x.net/v2/purpur///download` + `https://api.purpurmc.org/v1/purpur///download` * Download the latest build for a version of Minecraft: - `https://api.pl3x.net/v2/purpur//latest/download` + `https://api.purpurmc.org/v1/purpur//latest/download` ## License -[![MIT License](https://img.shields.io/github/license/pl3xgaming/Purpur?&logo=github)](LICENSE) +[![MIT License](https://img.shields.io/github/license/PurpurMC/Purpur?&logo=github)](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 purpur - https://repo.pl3x.net/ + https://repo.purpurmc.org/ ``` ```xml - net.pl3x.purpur + org.purpurmc.purpur purpur-api - 1.17.1-R0.1-SNAPSHOT + 1.18-R0.1-SNAPSHOT provided ``` @@ -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: diff --git a/patches/server/0002-Rebrand.patch b/patches/server/0002-Rebrand.patch index 38ddfad52..4d92fec61 100644 --- a/patches/server/0002-Rebrand.patch +++ b/patches/server/0002-Rebrand.patch @@ -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); diff --git a/patches/server/0003-Purpur-config-files.patch b/patches/server/0003-Purpur-config-files.patch index 75095735a..ba7a33e49 100644 --- a/patches/server/0003-Purpur-config-files.patch +++ b/patches/server/0003-Purpur-config-files.patch @@ -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; +