mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-17 16:37:43 +01:00
dad13788ad
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@2040c1e Player Flying Fall Damage API (#5357) PaperMC/Paper@fa42c68 Expose pre-collision moving velocity to VehicleBlockCollisionEvent (#8457) PaperMC/Paper@90750a6 Rework filtering spawn egg and tile entity nbt config (#6613)
52 lines
2.9 KiB
Diff
52 lines
2.9 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: William Blake Galbreath <blake.galbreath@gmail.com>
|
|
Date: Thu, 15 Jul 2021 23:43:04 -0500
|
|
Subject: [PATCH] Clean up version command output
|
|
|
|
|
|
diff --git a/src/main/java/com/destroystokyo/paper/util/VersionFetcher.java b/src/main/java/com/destroystokyo/paper/util/VersionFetcher.java
|
|
index a736d7bcdc5861a01b66ba36158db1c716339346..22fc165fd9c95f0f3ae1be7a0857e48cc50fad5b 100644
|
|
--- a/src/main/java/com/destroystokyo/paper/util/VersionFetcher.java
|
|
+++ b/src/main/java/com/destroystokyo/paper/util/VersionFetcher.java
|
|
@@ -26,6 +26,12 @@ public interface VersionFetcher {
|
|
@NotNull
|
|
Component getVersionMessage(@NotNull String serverVersion);
|
|
|
|
+ // Purpur start
|
|
+ default int distance() {
|
|
+ return 0;
|
|
+ }
|
|
+ // Purpur end
|
|
+
|
|
class DummyVersionFetcher implements VersionFetcher {
|
|
|
|
@Override
|
|
diff --git a/src/main/java/org/bukkit/command/defaults/VersionCommand.java b/src/main/java/org/bukkit/command/defaults/VersionCommand.java
|
|
index e40f017f87d6b6b4770501b106c76dc69ec69abb..eac5830986cd0638950bbb1e6f10a30e246e09a7 100644
|
|
--- a/src/main/java/org/bukkit/command/defaults/VersionCommand.java
|
|
+++ b/src/main/java/org/bukkit/command/defaults/VersionCommand.java
|
|
@@ -198,7 +198,7 @@ public class VersionCommand extends BukkitCommand {
|
|
String version = Bukkit.getVersion();
|
|
// Paper start
|
|
if (version.startsWith("null")) { // running from ide?
|
|
- setVersionMessage(net.kyori.adventure.text.Component.text("Unknown version, custom build?", net.kyori.adventure.text.format.NamedTextColor.YELLOW));
|
|
+ setVersionMessage(net.kyori.adventure.text.Component.text("* Unknown version, custom build?", net.kyori.adventure.text.format.NamedTextColor.RED)); // Purpur
|
|
return;
|
|
}
|
|
setVersionMessage(getVersionFetcher().getVersionMessage(version));
|
|
@@ -239,9 +239,11 @@ public class VersionCommand extends BukkitCommand {
|
|
// Paper start
|
|
private void setVersionMessage(final @NotNull net.kyori.adventure.text.Component msg) {
|
|
lastCheck = System.currentTimeMillis();
|
|
- final net.kyori.adventure.text.Component message = net.kyori.adventure.text.TextComponent.ofChildren(
|
|
- net.kyori.adventure.text.Component.text(Bukkit.getVersionMessage(), net.kyori.adventure.text.format.NamedTextColor.WHITE),
|
|
- net.kyori.adventure.text.Component.newline(),
|
|
+ // Purpur start
|
|
+ int distance = getVersionFetcher().distance();
|
|
+ final net.kyori.adventure.text.Component message = net.kyori.adventure.text.Component.join(net.kyori.adventure.text.JoinConfiguration.separator(net.kyori.adventure.text.Component.newline()),
|
|
+ ChatColor.parseMM("<grey>Current: %s%s*", distance == 0 ? "<green>" : distance > 0 ? "<yellow>" : "<red>", Bukkit.getVersion()),
|
|
+ // Purpur end
|
|
msg
|
|
);
|
|
this.versionMessage = net.kyori.adventure.text.Component.text()
|