mirror of
https://github.com/PaperMC/Paper.git
synced 2025-01-10 02:07:37 +01:00
977543c545
== AT == public net.minecraft.commands.arguments.blocks.BlockInput tag public net.minecraft.commands.arguments.DimensionArgument ERROR_INVALID_VALUE public net.minecraft.server.ReloadableServerResources registryLookup public net.minecraft.server.ReloadableServerResources Co-authored-by: Jake Potrebic <jake.m.potrebic@gmail.com> Co-authored-by: Marc Baloup <marc.baloup@laposte.net>
42 lines
3.1 KiB
Diff
42 lines
3.1 KiB
Diff
--- a/net/minecraft/commands/arguments/MessageArgument.java
|
|
+++ b/net/minecraft/commands/arguments/MessageArgument.java
|
|
@@ -40,6 +40,11 @@
|
|
|
|
public static void resolveChatMessage(CommandContext<CommandSourceStack> context, String name, Consumer<PlayerChatMessage> callback) throws CommandSyntaxException {
|
|
MessageArgument.Message message = context.getArgument(name, MessageArgument.Message.class);
|
|
+ // Paper start
|
|
+ resolveChatMessage(message, context, name, callback);
|
|
+ }
|
|
+ public static void resolveChatMessage(MessageArgument.Message message, CommandContext<CommandSourceStack> context, String name, Consumer<PlayerChatMessage> callback) throws CommandSyntaxException {
|
|
+ // Paper end
|
|
CommandSourceStack commandSourceStack = context.getSource();
|
|
Component component = message.resolveComponent(commandSourceStack);
|
|
CommandSigningContext commandSigningContext = commandSourceStack.getSigningContext();
|
|
@@ -54,17 +59,21 @@
|
|
private static void resolveSignedMessage(Consumer<PlayerChatMessage> callback, CommandSourceStack source, PlayerChatMessage message) {
|
|
MinecraftServer minecraftServer = source.getServer();
|
|
CompletableFuture<FilteredText> completableFuture = filterPlainText(source, message);
|
|
- Component component = minecraftServer.getChatDecorator().decorate(source.getPlayer(), message.decoratedContent());
|
|
- source.getChatMessageChainer().append(completableFuture, filtered -> {
|
|
- PlayerChatMessage playerChatMessage2 = message.withUnsignedContent(component).filter(filtered.mask());
|
|
+ // Paper start - support asynchronous chat decoration
|
|
+ CompletableFuture<Component> componentFuture = minecraftServer.getChatDecorator().decorate(source.getPlayer(), source, message.decoratedContent());
|
|
+ source.getChatMessageChainer().append(CompletableFuture.allOf(completableFuture, componentFuture), filtered -> {
|
|
+ PlayerChatMessage playerChatMessage2 = message.withUnsignedContent(componentFuture.join()).filter(completableFuture.join().mask());
|
|
+ // Paper end - support asynchronous chat decoration
|
|
callback.accept(playerChatMessage2);
|
|
});
|
|
}
|
|
|
|
private static void resolveDisguisedMessage(Consumer<PlayerChatMessage> callback, CommandSourceStack source, PlayerChatMessage message) {
|
|
ChatDecorator chatDecorator = source.getServer().getChatDecorator();
|
|
- Component component = chatDecorator.decorate(source.getPlayer(), message.decoratedContent());
|
|
- callback.accept(message.withUnsignedContent(component));
|
|
+ // Paper start - support asynchronous chat decoration
|
|
+ CompletableFuture<Component> componentFuture = chatDecorator.decorate(source.getPlayer(), source, message.decoratedContent());
|
|
+ source.getChatMessageChainer().append(componentFuture, (result) -> callback.accept(message.withUnsignedContent(result)));
|
|
+ // Paper end - support asynchronous chat decoration
|
|
}
|
|
|
|
private static CompletableFuture<FilteredText> filterPlainText(CommandSourceStack source, PlayerChatMessage message) {
|