mirror of
https://github.com/Winds-Studio/Leaf.git
synced 2025-12-31 04:46:38 +00:00
f15d5c5cef
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@e7e1ab5 Finish converting most of the undeprecated api to jspecify PaperMC/Paper@69ffbec Fix hex color check PaperMC/Paper@709f0f2 Use components properly in ProfileWhitelistVerifyEvent (#11456) PaperMC/Paper@fb76840 [ci skip] Add section on nullability annotations (#11461) PaperMC/Paper@7cd4f2c Check if leash tag has a uuid Gale Changes: Dreeam-qwq/Gale@c81a4b5 Updated Upstream (Paper) Dreeam-qwq/Gale@da78f95 Updated Upstream (Paper) Dreeam-qwq/Gale@c8d1f9b Updated Upstream (Paper)
42 lines
1.9 KiB
Diff
42 lines
1.9 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Dreeam <61569423+Dreeam-qwq@users.noreply.github.com>
|
|
Date: Tue, 21 May 2024 11:43:49 +0800
|
|
Subject: [PATCH] Rebrand
|
|
|
|
|
|
diff --git a/src/main/java/io/papermc/paper/ServerBuildInfo.java b/src/main/java/io/papermc/paper/ServerBuildInfo.java
|
|
index b68770f6992b044d13e67d9affa6933c90ca8fb8..cbe3a265e3c3ec2c06c79e5146c52bc6cea5a653 100644
|
|
--- a/src/main/java/io/papermc/paper/ServerBuildInfo.java
|
|
+++ b/src/main/java/io/papermc/paper/ServerBuildInfo.java
|
|
@@ -26,6 +26,17 @@ public interface ServerBuildInfo {
|
|
Key BRAND_GALE_ID = Key.key("galemc", "gale");
|
|
// Gale end - branding changes
|
|
|
|
+ // Leaf start
|
|
+ /**
|
|
+ * The brand id for Pufferfish.
|
|
+ */
|
|
+ Key BRAND_PUFFERFISH_ID = Key.key("pufferfish-gg", "pufferfish");
|
|
+ /**
|
|
+ * The brand id for Leaf.
|
|
+ */
|
|
+ Key BRAND_LEAF_ID = Key.key("winds-studio", "leaf");
|
|
+ // Leaf end
|
|
+
|
|
/**
|
|
* Gets the {@code ServerBuildInfo}.
|
|
*
|
|
diff --git a/src/main/java/org/bukkit/command/defaults/VersionCommand.java b/src/main/java/org/bukkit/command/defaults/VersionCommand.java
|
|
index e64bb57f74e6d6f78927be228825b3e0bdf41f48..5bccca7740dbec750960d96d4d951cff5da688da 100644
|
|
--- a/src/main/java/org/bukkit/command/defaults/VersionCommand.java
|
|
+++ b/src/main/java/org/bukkit/command/defaults/VersionCommand.java
|
|
@@ -215,7 +215,7 @@ public class VersionCommand extends BukkitCommand {
|
|
String version = Bukkit.getVersion();
|
|
// Paper start
|
|
if (version.startsWith("null")) { // running from ide?
|
|
- setVersionMessage(Component.text("Unknown version, custom build?", NamedTextColor.YELLOW));
|
|
+ setVersionMessage(Component.text("* Unknown version, custom build?", NamedTextColor.RED)); // Leaf - Purpur - Clean up version command output
|
|
return;
|
|
}
|
|
setVersionMessage(getVersionFetcher().getVersionMessage(version));
|