Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-17 16:37:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

always output bukkit/paper plugin header in plugin command

Browse Source
This commit is contained in:
granny
2024-07-20 16:43:54 -07:00
parent 032697e7ac
commit b2d1fea9be
1 changed files with 20 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
patches/server/0277-Improve-output-of-plugins-command.patch
View File

@@ -7,7 +7,7 @@ Co-authored-by: Oharass <oharass@bk.ru>
Co-authored-by: granny <granny@purpurmc.org> Co-authored-by: granny <granny@purpurmc.org>
diff --git a/src/main/java/io/papermc/paper/command/PaperPluginsCommand.java b/src/main/java/io/papermc/paper/command/PaperPluginsCommand.java diff --git a/src/main/java/io/papermc/paper/command/PaperPluginsCommand.java b/src/main/java/io/papermc/paper/command/PaperPluginsCommand.java
index f0fce4113fb07c64adbec029d177c236cbdcbae8..e94224ed280247ee69dfdff8dc960f2b8729be33 100644 index f0fce4113fb07c64adbec029d177c236cbdcbae8..865dc183276720d54d31d2a54d1bb5c845e80598 100644
--- a/src/main/java/io/papermc/paper/command/PaperPluginsCommand.java --- a/src/main/java/io/papermc/paper/command/PaperPluginsCommand.java
+++ b/src/main/java/io/papermc/paper/command/PaperPluginsCommand.java +++ b/src/main/java/io/papermc/paper/command/PaperPluginsCommand.java
@@ -78,10 +78,10 @@ public class PaperPluginsCommand extends BukkitCommand { @@ -78,10 +78,10 @@ public class PaperPluginsCommand extends BukkitCommand {
@@ -32,7 +32,7 @@ index f0fce4113fb07c64adbec029d177c236cbdcbae8..e94224ed280247ee69dfdff8dc960f2b
TextComponent.Builder builder = Component.text(); TextComponent.Builder builder = Component.text();
if (provider instanceof SpigotPluginProvider spigotPluginProvider && CraftMagicNumbers.isLegacy(spigotPluginProvider.getMeta())) { if (provider instanceof SpigotPluginProvider spigotPluginProvider && CraftMagicNumbers.isLegacy(spigotPluginProvider.getMeta())) {
builder.append(LEGACY_PLUGIN_STAR); builder.append(LEGACY_PLUGIN_STAR);
@@ -117,12 +117,64 @@ public class PaperPluginsCommand extends BukkitCommand { @@ -117,13 +117,65 @@ public class PaperPluginsCommand extends BukkitCommand {
String name = provider.getMeta().getName(); String name = provider.getMeta().getName();
Component pluginName = Component.text(name, fromStatus(provider)) Component pluginName = Component.text(name, fromStatus(provider))
@@ -71,13 +71,13 @@ index f0fce4113fb07c64adbec029d177c236cbdcbae8..e94224ed280247ee69dfdff8dc960f2b
+ +
+ pluginName.hoverEvent(hover.build()); + pluginName.hoverEvent(hover.build());
+ } + }
+ // Purpur end
builder.append(pluginName); builder.append(pluginName);
+ // Purpur end
+ return builder.build();
+ return builder.build(); }
+ }
+
+ // Purpur start + // Purpur start
+ @NotNull + @NotNull
+ private static TextComponent getAuthors(@NotNull final PluginMeta pluginMeta) { + private static TextComponent getAuthors(@NotNull final PluginMeta pluginMeta) {
@@ -91,13 +91,14 @@ index f0fce4113fb07c64adbec029d177c236cbdcbae8..e94224ed280247ee69dfdff8dc960f2b
+ +
+ builder.append(Component.text(authors.get(i), NamedTextColor.GREEN)); + builder.append(Component.text(authors.get(i), NamedTextColor.GREEN));
+ } + }
+
return builder.build(); + return builder.build();
} + }
+ // Purpur end + // Purpur end
+
private static Component asPlainComponents(String strings) { private static Component asPlainComponents(String strings) {
net.kyori.adventure.text.TextComponent.Builder builder = Component.text(); net.kyori.adventure.text.TextComponent.Builder builder = Component.text();
for (String string : strings.split("\n")) {
@@ -182,24 +234,24 @@ public class PaperPluginsCommand extends BukkitCommand { @@ -182,24 +234,24 @@ public class PaperPluginsCommand extends BukkitCommand {
} }
} }
@@ -109,20 +110,24 @@ index f0fce4113fb07c64adbec029d177c236cbdcbae8..e94224ed280247ee69dfdff8dc960f2b
- sender.sendMessage(infoMessage); - sender.sendMessage(infoMessage);
+ //sender.sendMessage(infoMessage); // Purpur + //sender.sendMessage(infoMessage); // Purpur
if (!paperPlugins.isEmpty()) { - if (!paperPlugins.isEmpty()) {
- sender.sendMessage(PAPER_HEADER); - sender.sendMessage(PAPER_HEADER);
- }
+ //if (!paperPlugins.isEmpty()) { // Purpur
+ sender.sendMessage(PAPER_HEADER.append(Component.text(" (%s):".formatted(paperPlugins.size())))); // Purpur + sender.sendMessage(PAPER_HEADER.append(Component.text(" (%s):".formatted(paperPlugins.size())))); // Purpur
} + //} // Purpur
- for (Component component : formatProviders(paperPlugins)) { - for (Component component : formatProviders(paperPlugins)) {
+ for (Component component : formatProviders(paperPlugins, sender)) { // Purpur + for (Component component : formatProviders(paperPlugins, sender)) { // Purpur
sender.sendMessage(component); sender.sendMessage(component);
} }
if (!spigotPlugins.isEmpty()) { - if (!spigotPlugins.isEmpty()) {
- sender.sendMessage(BUKKIT_HEADER); - sender.sendMessage(BUKKIT_HEADER);
- }
+ //if (!spigotPlugins.isEmpty()) { // Purpur
+ sender.sendMessage(BUKKIT_HEADER.append(Component.text(" (%s):".formatted(spigotPlugins.size())))); // Purpur + sender.sendMessage(BUKKIT_HEADER.append(Component.text(" (%s):".formatted(spigotPlugins.size())))); // Purpur
} + //} // Purpur
- for (Component component : formatProviders(spigotPlugins)) { - for (Component component : formatProviders(spigotPlugins)) {
+ for (Component component : formatProviders(spigotPlugins, sender)) { // Purpur + for (Component component : formatProviders(spigotPlugins, sender)) { // Purpur