mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-17 16:37:43 +01:00
79 lines
3.3 KiB
Diff
79 lines
3.3 KiB
Diff
From 053dd1e014ce1dc92795b080f59a2ac00b2234ef Mon Sep 17 00:00:00 2001
|
|
From: William Blake Galbreath <blake.galbreath@gmail.com>
|
|
Date: Sat, 4 May 2019 00:57:16 -0500
|
|
Subject: [PATCH] Rebrand
|
|
|
|
---
|
|
pom.xml | 9 ++++-----
|
|
.../command/defaults/VersionCommand.java | 20 ++++++++++---------
|
|
2 files changed, 15 insertions(+), 14 deletions(-)
|
|
|
|
diff --git a/pom.xml b/pom.xml
|
|
index dbbb5c72..41743131 100644
|
|
--- a/pom.xml
|
|
+++ b/pom.xml
|
|
@@ -3,18 +3,17 @@
|
|
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
|
<modelVersion>4.0.0</modelVersion>
|
|
<parent>
|
|
- <groupId>com.destroystokyo.paper</groupId>
|
|
- <artifactId>paper-parent</artifactId>
|
|
+ <groupId>net.pl3x.purpur</groupId>
|
|
+ <artifactId>purpur-parent</artifactId>
|
|
<version>dev-SNAPSHOT</version>
|
|
</parent>
|
|
|
|
- <groupId>com.destroystokyo.paper</groupId>
|
|
- <artifactId>paper-api</artifactId>
|
|
+ <artifactId>purpur-api</artifactId>
|
|
<version>1.14.1-R0.1-SNAPSHOT</version>
|
|
<packaging>jar</packaging>
|
|
|
|
<name>Paper-API</name>
|
|
- <url>https://github.com/PaperMC/Paper</url>
|
|
+ <url>https://github.com/pl3xgaming/Purpur</url>
|
|
<description>An enhanced plugin API for Minecraft servers.</description>
|
|
|
|
<properties>
|
|
diff --git a/src/main/java/org/bukkit/command/defaults/VersionCommand.java b/src/main/java/org/bukkit/command/defaults/VersionCommand.java
|
|
index ece8d1c8..0c1b0a61 100644
|
|
--- a/src/main/java/org/bukkit/command/defaults/VersionCommand.java
|
|
+++ b/src/main/java/org/bukkit/command/defaults/VersionCommand.java
|
|
@@ -211,8 +211,8 @@ public class VersionCommand extends BukkitCommand {
|
|
private void obtainVersion() {
|
|
String version = Bukkit.getVersion();
|
|
if (version == null) version = "Custom";
|
|
- if (version.startsWith("git-Paper-")) {
|
|
- String[] parts = version.substring("git-Paper-".length()).split("[-\\s]");
|
|
+ if (version.startsWith("git-Purpur-")) { // Purpur
|
|
+ String[] parts = version.substring("git-Purpur-".length()).split("[-\\s]"); // Purpur
|
|
int distance = getDistance(null, parts[0]);
|
|
switch (distance) {
|
|
case -1:
|
|
@@ -263,13 +263,15 @@ public class VersionCommand extends BukkitCommand {
|
|
|
|
// Paper start
|
|
private static int getDistance(@NotNull String repo, @NotNull String verInfo) {
|
|
- try {
|
|
- int currentVer = Integer.decode(verInfo);
|
|
- return getFromJenkins(currentVer);
|
|
- } catch (NumberFormatException ex) {
|
|
- verInfo = verInfo.replace("\"", "");
|
|
- return getFromRepo("PaperMC/Paper", "ver/1.14", verInfo); // Just for now
|
|
- }
|
|
+ // Purpur start
|
|
+ //try {
|
|
+ // int currentVer = Integer.decode(verInfo);
|
|
+ // return getFromJenkins(currentVer);
|
|
+ //} catch (NumberFormatException ex) {
|
|
+ //verInfo = verInfo.replace("\"", "");
|
|
+ return getFromRepo("pl3xgaming/Purpur", "ver/1.14", verInfo.replace("\"", ""));
|
|
+ //}
|
|
+ // Purpur end
|
|
/*
|
|
BufferedReader reader = Resources.asCharSource(
|
|
new URL("https://hub.spigotmc.org/stash/rest/api/1.0/projects/SPIGOT/repos/" + repo + "/commits?since=" + URLEncoder.encode(hash, "UTF-8") + "&withCounts=true"),
|
|
--
|
|
2.20.1
|
|
|