From 3597fc2ef74857fbb88d3ee4b299557566308490 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Tue, 30 Apr 2019 14:08:58 -0600 Subject: [PATCH] Rebrand Purpur --- pom.xml | 18 +++++++++--------- .../paper/console/PaperConsole.java | 2 +- src/main/java/net/minecraft/server/EULA.java | 2 +- .../net/minecraft/server/MinecraftServer.java | 2 +- .../org/bukkit/craftbukkit/CraftServer.java | 2 +- .../bukkit/craftbukkit/util/Versioning.java | 2 +- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/pom.xml b/pom.xml index c3844581..860bd355 100644 --- a/pom.xml +++ b/pom.xml @@ -1,11 +1,11 @@ 4.0.0 - paper + purpur jar 1.13.2-R0.1-SNAPSHOT - Paper - https://papermc.io + Purpur + http://pl3x.net UTF-8 @@ -20,16 +20,16 @@ - com.destroystokyo.paper - paper-parent + net.pl3x.purpur + purpur-parent dev-SNAPSHOT ../pom.xml - com.destroystokyo.paper - paper-api + net.pl3x.purpur + purpur-api ${project.version} compile @@ -135,7 +135,7 @@ - paper-${minecraft.version} + purpur-${minecraft.version} clean install @@ -143,7 +143,7 @@ gitdescribe-maven-plugin 1.3 - git-Paper- + git-Purpur- .. diff --git a/src/main/java/com/destroystokyo/paper/console/PaperConsole.java b/src/main/java/com/destroystokyo/paper/console/PaperConsole.java index 688b4715..e4522e68 100644 --- a/src/main/java/com/destroystokyo/paper/console/PaperConsole.java +++ b/src/main/java/com/destroystokyo/paper/console/PaperConsole.java @@ -17,7 +17,7 @@ public final class PaperConsole extends SimpleTerminalConsole { @Override protected LineReader buildReader(LineReaderBuilder builder) { return super.buildReader(builder - .appName("Paper") + .appName("Purpur") // Purpur .completer(new ConsoleCommandCompleter(this.server)) ); } diff --git a/src/main/java/net/minecraft/server/EULA.java b/src/main/java/net/minecraft/server/EULA.java index 526f3af5..b64cac25 100644 --- a/src/main/java/net/minecraft/server/EULA.java +++ b/src/main/java/net/minecraft/server/EULA.java @@ -49,7 +49,7 @@ public class EULA { Properties properties = new Properties(); fileoutputstream = new FileOutputStream(this.b); properties.setProperty("eula", "false"); - properties.store(fileoutputstream, "By changing the setting below to TRUE you are indicating your agreement to our EULA (https://account.mojang.com/documents/minecraft_eula).\nYou also agree that tacos are tasty, and the best food in the world."); // Paper - fix lag); + properties.store(fileoutputstream, "By changing the setting below to TRUE you are indicating your agreement to our EULA (https://account.mojang.com/documents/minecraft_eula)."); } catch (Exception exception) { a.warn("Failed to save {}", this.b, exception); } finally { diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java index 9c8c3304..570360f5 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -1347,7 +1347,7 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati } public String getServerModName() { - return "Paper"; //Paper - Paper > // Spigot - Spigot > // CraftBukkit - cb > vanilla! + return "Purpur"; // Purpur // Paper - Paper > // Spigot - Spigot > // CraftBukkit - cb > vanilla! } public CrashReport b(CrashReport crashreport) { diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java index 32bf4e58..fc7084ee 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -164,7 +164,7 @@ import javax.annotation.Nonnull; // Paper public final class CraftServer implements Server { - private final String serverName = "Paper"; // Paper + private final String serverName = "Purpur"; // Purpur // Paper private final String serverVersion; private final String bukkitVersion = Versioning.getBukkitVersion(); private final Logger logger = Logger.getLogger("Minecraft"); diff --git a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java index 674096ca..e9aee2d8 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java +++ b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java @@ -11,7 +11,7 @@ public final class Versioning { public static String getBukkitVersion() { String result = "Unknown-Version"; - InputStream stream = Bukkit.class.getClassLoader().getResourceAsStream("META-INF/maven/com.destroystokyo.paper/paper-api/pom.properties"); + InputStream stream = Bukkit.class.getClassLoader().getResourceAsStream("META-INF/maven/net.pl3x.purpur/purpur-api/pom.properties"); // Purpur Properties properties = new Properties(); if (stream != null) { -- 2.20.1