mirror of
https://github.com/Samsuik/Sakura.git
synced 2025-12-19 14:59:30 +00:00
86 lines
4.3 KiB
Diff
86 lines
4.3 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Samsuik <40902469+Samsuik@users.noreply.github.com>
|
|
Date: Wed, 2 Aug 2023 18:00:04 +0100
|
|
Subject: [PATCH] Customise Version Command
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
|
|
index f78b5fd3c3347d28da58777bff88903d2eb140f6..5999909827ede80c14becb058cde3189f10fb3ef 100644
|
|
--- a/src/main/java/org/bukkit/Bukkit.java
|
|
+++ b/src/main/java/org/bukkit/Bukkit.java
|
|
@@ -127,6 +127,20 @@ public final class Bukkit {
|
|
// Paper end
|
|
}
|
|
|
|
+ // Sakura start - expose git info
|
|
+ @NotNull
|
|
+ public static String getGitInformation() {
|
|
+ final var manifest = JarManifests.manifest(Bukkit.getServer().getClass());
|
|
+ final String gitBranch = manifest == null ? null : manifest.getMainAttributes().getValue("Git-Branch");
|
|
+ final String gitCommit = manifest == null ? null : manifest.getMainAttributes().getValue("Git-Commit");
|
|
+ String branchMsg = " on " + gitBranch;
|
|
+ if ("master".equals(gitBranch) || "main".equals(gitBranch)) {
|
|
+ branchMsg = ""; // Don't show branch on main/master
|
|
+ }
|
|
+ return "(Git: " + gitCommit + branchMsg + ")";
|
|
+ }
|
|
+ // Sakura end
|
|
+
|
|
/**
|
|
* Gets the name of this server implementation.
|
|
*
|
|
diff --git a/src/main/java/org/bukkit/command/defaults/VersionCommand.java b/src/main/java/org/bukkit/command/defaults/VersionCommand.java
|
|
index fd5d9881abfd930bb883120f018f76dc78b62b14..0cf55a5a4afc8d2eccd781a613b407c857cfe13d 100644
|
|
--- a/src/main/java/org/bukkit/command/defaults/VersionCommand.java
|
|
+++ b/src/main/java/org/bukkit/command/defaults/VersionCommand.java
|
|
@@ -17,6 +17,15 @@ import java.util.HashSet;
|
|
import java.util.List;
|
|
import java.util.Set;
|
|
import java.util.concurrent.locks.ReentrantLock;
|
|
+
|
|
+import io.papermc.paper.util.JarManifests;
|
|
+import net.kyori.adventure.text.Component;
|
|
+import net.kyori.adventure.text.event.ClickEvent;
|
|
+import net.kyori.adventure.text.event.HoverEvent;
|
|
+import net.kyori.adventure.text.format.NamedTextColor;
|
|
+import net.kyori.adventure.text.minimessage.MiniMessage;
|
|
+import net.kyori.adventure.text.minimessage.tag.Tag;
|
|
+import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
|
|
import org.bukkit.Bukkit;
|
|
import org.bukkit.ChatColor;
|
|
import org.bukkit.command.CommandSender;
|
|
@@ -49,17 +58,29 @@ public class VersionCommand extends BukkitCommand {
|
|
this.description = "Gets the version of this server including any plugins in use";
|
|
this.usageMessage = "/version [plugin name]";
|
|
this.setPermission("bukkit.command.version");
|
|
- this.setAliases(Arrays.asList("ver", "about"));
|
|
+ this.setAliases(Arrays.asList("ver", "about", "sver")); // Sakura
|
|
}
|
|
|
|
@Override
|
|
public boolean execute(@NotNull CommandSender sender, @NotNull String currentAlias, @NotNull String[] args) {
|
|
- if (!testPermission(sender)) return true;
|
|
+ // Sakura - move down into else
|
|
|
|
if (args.length == 0) {
|
|
//sender.sendMessage("This server is running " + Bukkit.getName() + " version " + Bukkit.getVersion() + " (Implementing API version " + Bukkit.getBukkitVersion() + ")"); // Paper - moved to setVersionMessage
|
|
- sendVersion(sender);
|
|
- } else {
|
|
+ // Sakura start
|
|
+ sender.sendMessage(MiniMessage.miniMessage().deserialize("""
|
|
+ <dark_purple>.
|
|
+ | <white>This server is running <phase>Sakura</white>
|
|
+ | <white>Commit<dark_gray>: \\<<commit>> <gray>targeting </gray>(<yellow>MC</yellow>: <gray><version></gray>)</white>
|
|
+ | <white>Github<dark_gray>: \\<<yellow><click:open_url:'https://github.com/Samsuik/Sakura'>link</click></yellow>></white>
|
|
+ '""",
|
|
+ TagResolver.resolver("phase", Tag.preProcessParsed("<gradient:light_purple:red:0.5>")),
|
|
+ TagResolver.resolver("commit", Tag.selfClosingInserting(Component.text("hover", NamedTextColor.YELLOW)
|
|
+ .hoverEvent(HoverEvent.showText(Component.text(Bukkit.getGitInformation()))))),
|
|
+ TagResolver.resolver("version", Tag.preProcessParsed(Bukkit.getMinecraftVersion()))
|
|
+ ));
|
|
+ } else if (testPermission(sender)) {
|
|
+ // Sakura end
|
|
StringBuilder name = new StringBuilder();
|
|
|
|
for (String arg : args) {
|