From 030c7d02cb82e6d69c78911fb6deaceabd05f7c7 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath 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 81aefdf7..d73f48ae 100644 --- a/pom.xml +++ b/pom.xml @@ -4,18 +4,17 @@ 4.0.0 - com.destroystokyo.paper - paper-parent + net.pl3x.purpur + purpur-parent dev-SNAPSHOT - com.destroystokyo.paper - paper-api + purpur-api 1.14-R0.1-SNAPSHOT jar Paper-API - https://github.com/PaperMC/Paper + https://github.com/pl3xgaming/Purpur An enhanced plugin API for Minecraft servers. 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