mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-17 16:37:43 +01:00
84 lines
3.5 KiB
Diff
84 lines
3.5 KiB
Diff
From 85f4ec173933924204aaaa98c5011d248f22ec50 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 | 13 ++++++-------
|
|
.../org/bukkit/command/defaults/VersionCommand.java | 8 ++++----
|
|
2 files changed, 10 insertions(+), 11 deletions(-)
|
|
|
|
diff --git a/pom.xml b/pom.xml
|
|
index dbbb5c72f..ea0ab736d 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>
|
|
+ <name>Purpur-API</name>
|
|
+ <url>https://github.com/pl3xgaming/Purpur</url>
|
|
<description>An enhanced plugin API for Minecraft servers.</description>
|
|
|
|
<properties>
|
|
@@ -150,7 +149,7 @@
|
|
</dependencies>
|
|
|
|
<build>
|
|
- <defaultGoal>clean install</defaultGoal>
|
|
+ <defaultGoal>clean install javadoc:javadoc</defaultGoal>
|
|
<plugins>
|
|
<plugin>
|
|
<groupId>org.apache.maven.plugins</groupId>
|
|
diff --git a/src/main/java/org/bukkit/command/defaults/VersionCommand.java b/src/main/java/org/bukkit/command/defaults/VersionCommand.java
|
|
index ece8d1c8a..2909e9ecf 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:
|
|
@@ -268,7 +268,7 @@ public class VersionCommand extends BukkitCommand {
|
|
return getFromJenkins(currentVer);
|
|
} catch (NumberFormatException ex) {
|
|
verInfo = verInfo.replace("\"", "");
|
|
- return getFromRepo("PaperMC/Paper", "ver/1.14", verInfo); // Just for now
|
|
+ return getFromRepo("pl3xgaming/Purpur", "master", verInfo); // Purpur
|
|
}
|
|
/*
|
|
BufferedReader reader = Resources.asCharSource(
|
|
@@ -290,7 +290,7 @@ public class VersionCommand extends BukkitCommand {
|
|
private static int getFromJenkins(int currentVer) {
|
|
try {
|
|
BufferedReader reader = Resources.asCharSource(
|
|
- new URL("https://ci.destroystokyo.com/job/Paper-1.14/lastSuccessfulBuild/buildNumber"), // Paper
|
|
+ new URL("https://ci.pl3x.net/job/Purpur/lastSuccessfulBuild/buildNumber"), // Purpur // Paper
|
|
Charsets.UTF_8
|
|
).openBufferedStream();
|
|
try {
|
|
--
|
|
2.20.1
|
|
|