use component directly for player list name

fixes #1316
2026-02-17 16:37:43 +01:00 · 2023-05-14 03:17:11 -07:00
parent 3325421436
commit 2ae3be3f5c
6 changed files with 19 additions and 19 deletions
--- a/patches/server/0004-Purpur-config-files.patch
+++ b/patches/server/0004-Purpur-config-files.patch
@@ -179,17 +179,17 @@ index c103f10dbb6c06e14bb7b5df73a797f456803301..c5f208dbeb55627bc2917314cc8a0da2
                         .withRequiredArg()
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..43884d28fe27962a5ca895315849318975cb3011
+index 0000000000000000000000000000000000000000..9fe1cdafdafc3f718ef4eb4fd4150971e2832738
 --- /dev/null
 +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
@@ -0,0 +1,175 @@
 +package org.purpurmc.purpur;
 +
-+import co.aikar.timings.TimingsManager;
 +import com.google.common.base.Throwables;
 +import com.google.common.collect.ImmutableMap;
 +import com.mojang.datafixers.util.Pair;
 +import net.kyori.adventure.bossbar.BossBar;
+import net.kyori.adventure.text.minimessage.MiniMessage;
 +import net.minecraft.core.registries.BuiltInRegistries;
 +import net.minecraft.resources.ResourceLocation;
 +import net.minecraft.server.MinecraftServer;
--- a/patches/server/0012-AFK-API.patch
+++ b/patches/server/0012-AFK-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] AFK API


 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 055915f609d1181bbcfa2ce72e1282ace71cb45c..e16e2c7c802c387cc278542d6f013fc7441063e1 100644
+index 055915f609d1181bbcfa2ce72e1282ace71cb45c..4e68585de7601f87297977c426a8f4621c8c0860 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -2071,8 +2071,63 @@ public class ServerPlayer extends Player {
@@ -44,7 +44,7 @@ index 055915f609d1181bbcfa2ce72e1282ace71cb45c..e16e2c7c802c387cc278542d6f013fc7
 +
 +        if (this.level.purpurConfig.idleTimeoutUpdateTabList) {
 +            String scoreboardName = getScoreboardName();
-+            String playerListName = getBukkitEntity().getPlayerListName();
+            String playerListName = net.kyori.adventure.text.minimessage.MiniMessage.miniMessage().serialize(getBukkitEntity().playerListName());
 +            String[] split = playerListName.split(scoreboardName);
 +            String prefix = (split.length > 0 ? split[0] : "").replace(org.purpurmc.purpur.PurpurConfig.afkTabListPrefix, "");
 +            String suffix = (split.length > 1 ? split[1] : "").replace(org.purpurmc.purpur.PurpurConfig.afkTabListSuffix, "");
@@ -260,7 +260,7 @@ index 9986b89ceabc065d96c889bf9a50a4aa093e7300..2506882191e83a3cc03666a56e63c18f
     // Purpur end
 }
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-index 6b0e6f3c93092dcabe53048a9260941c095ef996..66892e16e6c5cd505422e685045f243606aecdb0 100644
+index e6a720f25266d793bec5f644dadacbf45aef23f5..594d041c63f86dbafca756f6f7012b9ab5e385ef 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
@@ -174,8 +174,16 @@ public class PurpurConfig {
@@ -275,8 +275,8 @@ index 6b0e6f3c93092dcabe53048a9260941c095ef996..66892e16e6c5cd505422e685045f2436
         cannotRideMob = getString("settings.messages.cannot-ride-mob", cannotRideMob);
 +        afkBroadcastAway = getString("settings.messages.afk-broadcast-away", afkBroadcastAway);
 +        afkBroadcastBack = getString("settings.messages.afk-broadcast-back", afkBroadcastBack);
-+        afkTabListPrefix = getString("settings.messages.afk-tab-list-prefix", afkTabListPrefix);
-+        afkTabListSuffix = getString("settings.messages.afk-tab-list-suffix", afkTabListSuffix);
+        afkTabListPrefix = MiniMessage.miniMessage().serialize(MiniMessage.miniMessage().deserialize(getString("settings.messages.afk-tab-list-prefix", afkTabListPrefix)));
+        afkTabListSuffix = MiniMessage.miniMessage().serialize(MiniMessage.miniMessage().deserialize(getString("settings.messages.afk-tab-list-suffix", afkTabListSuffix)));
     }
 
     public static int barrelRows = 3;
--- a/patches/server/0014-Configurable-server-mod-name.patch
+++ b/patches/server/0014-Configurable-server-mod-name.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Configurable server mod name


 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index a6e6dff37efd7b54a3f17c22ba4b45436bc8884d..d728e115c57ecf26c960e5130135c8875007dd48 100644
+index 7f37231b33d6cfbd3d10c6c5d0b3e0b96ba0ceb3..57f6de7872bfa80cf7668524975946cbd7fcda56 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1685,7 +1685,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -18,11 +18,11 @@ index a6e6dff37efd7b54a3f17c22ba4b45436bc8884d..d728e115c57ecf26c960e5130135c887
 
     public SystemReport fillSystemReport(SystemReport details) {
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-index c517873abdcb1e5334ba9e7a1c2f06bbbc411f87..16ed8266bbc08963aa3973f2e48a8f76b640ed18 100644
+index 594d041c63f86dbafca756f6f7012b9ab5e385ef..c01dd22d131a0048ff1d4dd86bb48fec6965494e 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
@@ -186,6 +186,11 @@ public class PurpurConfig {
-         afkTabListSuffix = getString("settings.messages.afk-tab-list-suffix", afkTabListSuffix);
+         afkTabListSuffix = MiniMessage.miniMessage().serialize(MiniMessage.miniMessage().deserialize(getString("settings.messages.afk-tab-list-suffix", afkTabListSuffix)));
     }
 
 +    public static String serverModName = "Purpur";
--- a/patches/server/0064-Add-ping-command.patch
+++ b/patches/server/0064-Add-ping-command.patch
@@ -17,7 +17,7 @@ index 34d1fad0ad4adfcb0372ab16ecd7af0b92b5bedc..dc34d1a2fe967d94eb6ea16b51f1b8da
 
         if (environment.includeIntegrated) {
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-index 01ac09bda83703c16aed64133096377d7113693e..27b35e12eafd3ee735fcea201c9d371c2480e4da 100644
+index 22b9e1b944bf5d771c3d60d460134b3274dac108..28c525a387d6636670a594c7fdf75a6c2d5466a9 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
@@ -178,12 +178,14 @@ public class PurpurConfig {
@@ -29,8 +29,8 @@ index 01ac09bda83703c16aed64133096377d7113693e..27b35e12eafd3ee735fcea201c9d371c
         cannotRideMob = getString("settings.messages.cannot-ride-mob", cannotRideMob);
         afkBroadcastAway = getString("settings.messages.afk-broadcast-away", afkBroadcastAway);
         afkBroadcastBack = getString("settings.messages.afk-broadcast-back", afkBroadcastBack);
-         afkTabListPrefix = getString("settings.messages.afk-tab-list-prefix", afkTabListPrefix);
-         afkTabListSuffix = getString("settings.messages.afk-tab-list-suffix", afkTabListSuffix);
+         afkTabListPrefix = MiniMessage.miniMessage().serialize(MiniMessage.miniMessage().deserialize(getString("settings.messages.afk-tab-list-prefix", afkTabListPrefix)));
+         afkTabListSuffix = MiniMessage.miniMessage().serialize(MiniMessage.miniMessage().deserialize(getString("settings.messages.afk-tab-list-suffix", afkTabListSuffix)));
 +        pingCommandOutput = getString("settings.messages.ping-command-output", pingCommandOutput);
     }
 
--- a/patches/server/0065-Add-demo-command.patch
+++ b/patches/server/0065-Add-demo-command.patch
@@ -17,7 +17,7 @@ index dc34d1a2fe967d94eb6ea16b51f1b8da205f95b5..a7c26527eb282d2f80fa14d265b748f7
         }
 
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-index 27b35e12eafd3ee735fcea201c9d371c2480e4da..fdcffdc618fcbc2413f6e6949d82ed1f138086b1 100644
+index 28c525a387d6636670a594c7fdf75a6c2d5466a9..63095ddc7ea342a985b528441fdc658332e77f87 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
@@ -178,6 +178,7 @@ public class PurpurConfig {
@@ -30,8 +30,8 @@ index 27b35e12eafd3ee735fcea201c9d371c2480e4da..fdcffdc618fcbc2413f6e6949d82ed1f
         cannotRideMob = getString("settings.messages.cannot-ride-mob", cannotRideMob);
@@ -185,6 +186,7 @@ public class PurpurConfig {
         afkBroadcastBack = getString("settings.messages.afk-broadcast-back", afkBroadcastBack);
-         afkTabListPrefix = getString("settings.messages.afk-tab-list-prefix", afkTabListPrefix);
-         afkTabListSuffix = getString("settings.messages.afk-tab-list-suffix", afkTabListSuffix);
+         afkTabListPrefix = MiniMessage.miniMessage().serialize(MiniMessage.miniMessage().deserialize(getString("settings.messages.afk-tab-list-prefix", afkTabListPrefix)));
+         afkTabListSuffix = MiniMessage.miniMessage().serialize(MiniMessage.miniMessage().deserialize(getString("settings.messages.afk-tab-list-suffix", afkTabListSuffix)));
 +        demoCommandOutput = getString("settings.messages.demo-command-output", demoCommandOutput);
         pingCommandOutput = getString("settings.messages.ping-command-output", pingCommandOutput);
     }
--- a/patches/server/0066-Add-credits-command.patch
+++ b/patches/server/0066-Add-credits-command.patch
@@ -17,7 +17,7 @@ index a7c26527eb282d2f80fa14d265b748f7a41a7ebe..277fb799d898ca726205519b15168619
             org.purpurmc.purpur.command.PingCommand.register(this.dispatcher); // Purpur
         }
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-index fdcffdc618fcbc2413f6e6949d82ed1f138086b1..28711abdabec6894faefb3a5bcff503ce5125e2f 100644
+index 63095ddc7ea342a985b528441fdc658332e77f87..92a489d2a7e1f9001f7a66fbf1104280aa1af67b 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
@@ -178,6 +178,7 @@ public class PurpurConfig {
@@ -30,8 +30,8 @@ index fdcffdc618fcbc2413f6e6949d82ed1f138086b1..28711abdabec6894faefb3a5bcff503c
     private static void messages() {
@@ -186,6 +187,7 @@ public class PurpurConfig {
         afkBroadcastBack = getString("settings.messages.afk-broadcast-back", afkBroadcastBack);
-         afkTabListPrefix = getString("settings.messages.afk-tab-list-prefix", afkTabListPrefix);
-         afkTabListSuffix = getString("settings.messages.afk-tab-list-suffix", afkTabListSuffix);
+         afkTabListPrefix = MiniMessage.miniMessage().serialize(MiniMessage.miniMessage().deserialize(getString("settings.messages.afk-tab-list-prefix", afkTabListPrefix)));
+         afkTabListSuffix = MiniMessage.miniMessage().serialize(MiniMessage.miniMessage().deserialize(getString("settings.messages.afk-tab-list-suffix", afkTabListSuffix)));
 +        creditsCommandOutput = getString("settings.messages.credits-command-output", creditsCommandOutput);
         demoCommandOutput = getString("settings.messages.demo-command-output", demoCommandOutput);
         pingCommandOutput = getString("settings.messages.ping-command-output", pingCommandOutput);